MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

refactored out dependency

Browse Source
This commit is contained in:
MagicBot
2024-04-05 08:57:00 -04:00
parent 8424aa557f
commit 52865d7cfd
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/mbEnums.java
+1 -2
View File
@@ -8,7 +8,6 @@
package engine; package engine;
import ch.claude_martin.enumbitset.EnumBitSetHelper;
import engine.gameManager.ConfigManager; import engine.gameManager.ConfigManager;
import engine.gameManager.PowersManager; import engine.gameManager.PowersManager;
import engine.gameManager.ZoneManager; import engine.gameManager.ZoneManager;
@@ -2744,7 +2743,7 @@ public class mbEnums {
} }
} }
public enum ResourceType implements EnumBitSetHelper<ResourceType> { public enum ResourceType {
GOLD(7, 2308551, 100000000, 10), GOLD(7, 2308551, 100000000, 10),
ADAMANT(1580003, -1741189964, 1000, 10), ADAMANT(1580003, -1741189964, 1000, 10),
src/engine/objects/Warehouse.java
+2 -2
View File
@@ -9,9 +9,9 @@
package engine.objects; package engine.objects;
import engine.mbEnums;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.net.Dispatch; import engine.net.Dispatch;
import engine.net.DispatchMessage; import engine.net.DispatchMessage;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
@@ -637,7 +637,7 @@ public class Warehouse {
} }
public static boolean isResourceLocked(Warehouse warehouse, mbEnums.ResourceType resourceType) { public static boolean isResourceLocked(Warehouse warehouse, mbEnums.ResourceType resourceType) {
return resourceType.elementOf(warehouse.locked); return warehouse.locked.contains(resourceType);
} }
} }