From 5e12bd9c8dc76a815b2c83be25f0ce2dd1e98197 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:53:51 -0400 Subject: Use null invalid mapId --- .../java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/main') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java index 577cdb13..a4f5cc78 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMap.java @@ -17,7 +17,7 @@ import net.minecraft.item.map.MapState; public class DungeonMap { private static final int DEFAULT_MAP_ID = 1024; - private static int cachedMapId = -1; + private static Integer cachedMapId = null; public static void init() { ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("skyblocker") @@ -59,14 +59,10 @@ public class DungeonMap { int mapId = FilledMapItem.getMapId(stack); cachedMapId = mapId; return mapId; - } else if (cachedMapId != -1) { - return cachedMapId; - } else { - return DEFAULT_MAP_ID; - } + } else return cachedMapId != null ? cachedMapId : DEFAULT_MAP_ID; } private static void reset() { - cachedMapId = -1; + cachedMapId = null; } } -- cgit