wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DhApiWorldProxy.getSinglePlayerLevel()

Browse Source
This commit is contained in:
James Seibel
2023-06-17 12:01:23 -05:00
parent fb77c766a6
commit f5a0789321
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/lod/core/api/internal/SharedApi.java
-1
View File
@@ -11,7 +11,6 @@ import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
/** Contains code and variables used by both {@link ClientApi} and {@link ServerApi} */
public class SharedApi
{
public static IMinecraftSharedWrapper MC; // TODO remove if possible, it is only used in one odd spot
private static AbstractDhWorld currentWorld;
core/src/main/java/com/seibel/lod/core/world/DhApiWorldProxy.java
+5 -7
View File
@@ -6,14 +6,11 @@ import com.seibel.lod.api.interfaces.world.IDhApiWorldProxy;
import com.seibel.lod.core.api.internal.SharedApi;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper;
import org.apache.logging.log4j.Logger;
import java.io.Closeable;
import java.util.ArrayList;
import java.util.concurrent.CompletableFuture;
/**
* Used to interact with the currently loaded world.
@@ -28,7 +25,8 @@ public class DhApiWorldProxy implements IDhApiWorldProxy
{
public static DhApiWorldProxy INSTANCE = new DhApiWorldProxy();
private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
private static final String NO_WORLD_EXCEPTION_STRING = "No world loaded";
@@ -49,9 +47,9 @@ public class DhApiWorldProxy implements IDhApiWorldProxy
}
if (!SharedApi.MC.isDedicatedServer()) // TODO why isn't this thrown a null pointer? when is SharedApi.MC being set?
if (!MC_SHARED.isDedicatedServer())
{
return MC.getWrappedClientWorld();
return MC_CLIENT.getWrappedClientWorld();
}
else
{