From 2d445b69020ede20c59ab67af2e80cbaade95ace Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:53:47 -0400 Subject: Fix WebSocket bugs (#964) --- .../hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java | 4 ++-- src/main/java/de/hysky/skyblocker/utils/ws/WsStateManager.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java index 3ce4cfe0..0a05b771 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java @@ -322,12 +322,12 @@ public class CrystalsLocationsManager { } public static void addCustomWaypointFromSocket(MiningLocationLabel.CrystalHollowsLocationsCategory category, BlockPos pos) { - if (activeWaypoints.containsKey(category.name())) return; + if (activeWaypoints.containsKey(category.getName())) return; removeUnknownNear(pos); MiningLocationLabel waypoint = new MiningLocationLabel(category, pos); waypointsSent2Socket.add(category); - activeWaypoints.put(category.name(), waypoint); + activeWaypoints.put(category.getName(), waypoint); CLIENT.player.sendMessage(Constants.PREFIX.get().append(Text.translatable("skyblocker.webSocket.receivedCrystalsWaypoint", Text.literal(category.getName()).withColor(category.getColor())))); } diff --git a/src/main/java/de/hysky/skyblocker/utils/ws/WsStateManager.java b/src/main/java/de/hysky/skyblocker/utils/ws/WsStateManager.java index e3d7bec5..939f945e 100644 --- a/src/main/java/de/hysky/skyblocker/utils/ws/WsStateManager.java +++ b/src/main/java/de/hysky/skyblocker/utils/ws/WsStateManager.java @@ -7,6 +7,7 @@ import de.hysky.skyblocker.utils.Utils; import de.hysky.skyblocker.utils.ws.message.Message; import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; import it.unimi.dsi.fastutil.objects.ReferenceSet; +import net.azureaaron.hmapi.data.server.Environment; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; public class WsStateManager { @@ -33,6 +34,8 @@ public class WsStateManager { * place is inside of the {@link SkyblockEvents#LOCATION_CHANGE} event. */ public static void subscribe(Service service, Optional>> message) { + if (Utils.getEnvironment() != Environment.PRODUCTION) return; + SUBSCRIBED_SERVICES.add(service); WsMessageHandler.sendSimple(Type.SUBSCRIBE, service, Utils.getServer(), message); -- cgit