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

Merge branch 'distant-horizons-core-refactor/client-world-close'

Browse Source
This commit is contained in:
James Seibel
2023-10-29 16:09:54 -05:00
parent 446c274094 5e2accadca
commit 645567c474
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java
+15 -18
View File
@@ -134,27 +134,24 @@ public class ClientApi
public void onClientOnlyDisconnected()
{
if (MC.clientConnectedToDedicatedServer())
AbstractDhWorld world = SharedApi.getAbstractDhWorld();
if (world != null)
{
AbstractDhWorld world = SharedApi.getAbstractDhWorld();
if (world != null)
{
LOGGER.info("Client on ClientOnly mode disconnecting.");
world.close();
SharedApi.setDhWorld(null);
}
LOGGER.info("Client on ClientOnly mode disconnecting.");
// clear the previous server's information
this.isServerCommunicationEnabled = false;
this.serverNetworkingIsMalformed = false;
KEYED_CLIENT_LEVEL_MANAGER.setUseOverrideWrapper(false);
KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(null);
// remove any waiting items
this.waitingChunkByClientLevelAndPos.clear();
this.waitingClientLevels.clear();
world.close();
SharedApi.setDhWorld(null);
}
// clear the previous server's information
this.isServerCommunicationEnabled = false;
this.serverNetworkingIsMalformed = false;
KEYED_CLIENT_LEVEL_MANAGER.setUseOverrideWrapper(false);
KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(null);
// remove any waiting items
this.waitingChunkByClientLevelAndPos.clear();
this.waitingClientLevels.clear();
}