From e97e16e7d10ecf40044a4b64b70953e393fa892c Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Tue, 8 Oct 2024 09:04:13 +0500 Subject: [PATCH] Fix keyed levels not changing --- .../core/api/internal/ClientPluginChannelApi.java | 6 +++--- .../core/level/IKeyedClientLevelManager.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java index 4035ab5ee..5e6904e02 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java @@ -54,8 +54,8 @@ public class ClientPluginChannelApi /** @return true if the level loading is handled by the server */ public boolean allowLevelLoading(IClientLevelWrapper level) { - return (KEYED_CLIENT_LEVEL_MANAGER.hasLevelSet() && level instanceof IServerKeyedClientLevel) - || !KEYED_CLIENT_LEVEL_MANAGER.hasLevelSet(); + return (KEYED_CLIENT_LEVEL_MANAGER.isEnabled() && level instanceof IServerKeyedClientLevel) + || !KEYED_CLIENT_LEVEL_MANAGER.isEnabled(); } @@ -126,7 +126,7 @@ public class ClientPluginChannelApi public void reset() { this.networkSession = null; - KEYED_CLIENT_LEVEL_MANAGER.clearKeyedLevel(); + KEYED_CLIENT_LEVEL_MANAGER.disable(); } } \ No newline at end of file diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/IKeyedClientLevelManager.java b/core/src/main/java/com/seibel/distanthorizons/core/level/IKeyedClientLevelManager.java index c8544d71e..c14405445 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/IKeyedClientLevelManager.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/IKeyedClientLevelManager.java @@ -33,6 +33,7 @@ public interface IKeyedClientLevelManager extends IBindable IServerKeyedClientLevel setServerKeyedLevel(IClientLevelWrapper clientLevel, String levelKey); void clearKeyedLevel(); - boolean hasLevelSet(); + boolean isEnabled(); + void disable(); }