From 52865d7cfdd71b827d91d5ff0016b2d062c78129 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Fri, 5 Apr 2024 08:57:00 -0400 Subject: [PATCH] refactored out dependency --- src/engine/mbEnums.java | 3 +-- src/engine/objects/Warehouse.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/engine/mbEnums.java b/src/engine/mbEnums.java index 6f6e27a4..cebc0eb0 100644 --- a/src/engine/mbEnums.java +++ b/src/engine/mbEnums.java @@ -8,7 +8,6 @@ package engine; -import ch.claude_martin.enumbitset.EnumBitSetHelper; import engine.gameManager.ConfigManager; import engine.gameManager.PowersManager; import engine.gameManager.ZoneManager; @@ -2744,7 +2743,7 @@ public class mbEnums { } } - public enum ResourceType implements EnumBitSetHelper { + public enum ResourceType { GOLD(7, 2308551, 100000000, 10), ADAMANT(1580003, -1741189964, 1000, 10), diff --git a/src/engine/objects/Warehouse.java b/src/engine/objects/Warehouse.java index 1ae97564..0f30940d 100644 --- a/src/engine/objects/Warehouse.java +++ b/src/engine/objects/Warehouse.java @@ -9,9 +9,9 @@ package engine.objects; -import engine.mbEnums; import engine.gameManager.ChatManager; import engine.gameManager.DbManager; +import engine.mbEnums; import engine.net.Dispatch; import engine.net.DispatchMessage; import engine.net.client.ClientConnection; @@ -637,7 +637,7 @@ public class Warehouse { } public static boolean isResourceLocked(Warehouse warehouse, mbEnums.ResourceType resourceType) { - return resourceType.elementOf(warehouse.locked); + return warehouse.locked.contains(resourceType); } } \ No newline at end of file