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

refactor and prevent a potential null pointer in DhClientWorld

Browse Source
This commit is contained in:
James Seibel
2023-02-25 21:27:35 -06:00
parent ea41fbc664
commit be0ce75ceb
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java
+13 -6
View File
@@ -4,6 +4,7 @@ import com.seibel.lod.core.level.DhClientLevel;
import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.file.structure.ClientOnlySaveStructure;
import com.seibel.lod.core.config.Config;
import com.seibel.lod.core.level.states.ClientRenderState;
import com.seibel.lod.core.util.DetailDistanceUtil;
import com.seibel.lod.core.util.objects.EventLoop;
import com.seibel.lod.core.util.LodUtil;
@@ -96,10 +97,16 @@ public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld
while (iterator.hasNext())
{
DhClientLevel level = iterator.next();
if (level.ClientRenderStateRef.get().quadtree.blockRenderDistance != newBlockRenderDistance)
ClientRenderState clientRenderState = level.ClientRenderStateRef.get();
if (clientRenderState != null && clientRenderState.quadtree != null)
{
level.close();
iterator.remove();
if (clientRenderState.quadtree.blockRenderDistance != newBlockRenderDistance)
{
// TODO is this the best way to handle changing the render distance?
level.close();
iterator.remove();
}
}
}
@@ -119,10 +126,10 @@ public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld
public void close()
{
this.saveAndFlush().join();
for (DhClientLevel level : this.levels.values())
for (DhClientLevel dhClientLevel : this.levels.values())
{
LOGGER.info("Unloading level " + level.clientLevelWrapper.getDimensionType().getDimensionName());
level.close();
LOGGER.info("Unloading level " + dhClientLevel.getLevelWrapper().getDimensionType().getDimensionName());
dhClientLevel.close();
}
this.levels.clear();