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

Fix critical crash on Multiplayer.

Browse Source
This commit is contained in:
tom lee
2022-01-12 18:01:15 +08:00
parent 0b2be5580f
commit bb22ad58bc
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/seibel/lod/core/api/ClientApi.java
+13 -5
View File
@@ -81,6 +81,7 @@ public class ClientApi
public void clientChunkLoadEvent(IChunkWrapper chunk, IWorldWrapper world)
{
//ClientApi.LOGGER.info("Lod Generating add: "+chunk.getLongChunkPos());
toBeLoaded.add(chunk.getLongChunkPos());
}
@@ -104,9 +105,16 @@ public class ClientApi
return;
IWorldWrapper world = MC.getWrappedClientWorld();
LodDimension lodDim = ApiShared.lodWorld.getLodDimension(MC.getCurrentDimension());
if (world == null) return;
LodDimension lodDim = ApiShared.lodWorld.getLodDimension(world.getDimensionType());
// Make the LodDim if it does not exist
if (lodDim == null)
return;
{
lodDim = new LodDimension(world.getDimensionType(), ApiShared.lodWorld,
ApiShared.lodBuilder.defaultDimensionWidthInRegions);
ApiShared.lodWorld.addLodDimension(lodDim);
}
for (long pos : toBeLoaded) {
if (generating.size() >= 8) {
@@ -118,13 +126,13 @@ public class ClientApi
toBeLoaded.remove(pos);
continue;
}
if (!chunk.isLightCorrect()) continue;
//if (!chunk.isLightCorrect()) continue;
toBeLoaded.remove(pos);
generating.add(pos);
ClientApi.LOGGER.info("Lod Generation trying "+pos+". Remining: " +toBeLoaded.size());
//ClientApi.LOGGER.info("Lod Generation trying "+pos+". Remining: " +toBeLoaded.size());
ApiShared.lodBuilder.generateLodNodeAsync(chunk, ApiShared.lodWorld,
world.getDimensionType(), DistanceGenerationMode.FULL, true, () -> {
ClientApi.LOGGER.info("Lod Generation for "+pos+" done. Remining: " +toBeLoaded.size());
//ClientApi.LOGGER.info("Lod Generation for "+pos+" done. Remining: " +toBeLoaded.size());
generating.remove(pos);
}, () -> {
generating.remove(pos);
src/main/java/com/seibel/lod/core/api/EventApi.java
-7
View File
@@ -116,13 +116,6 @@ public class EventApi
// the player just loaded a new world/dimension
ApiShared.lodWorld.selectWorld(LodUtil.getWorldID(world));
// Make the LodDim if it does not exist
if (ApiShared.lodWorld.getLodDimension(world.getDimensionType()) == null)
{
LodDimension lodDim = new LodDimension(world.getDimensionType(), ApiShared.lodWorld,
ApiShared.lodBuilder.defaultDimensionWidthInRegions);
ApiShared.lodWorld.addLodDimension(lodDim);
}
// make sure the correct LODs are being rendered
// (if this isn't done the previous world's LODs may be drawn)