Browse Source

refactored out dependency

combat-2
MagicBot 7 months ago
parent
commit
52865d7cfd
  1. 3
      src/engine/mbEnums.java
  2. 4
      src/engine/objects/Warehouse.java

3
src/engine/mbEnums.java

@ -8,7 +8,6 @@ @@ -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 { @@ -2744,7 +2743,7 @@ public class mbEnums {
}
}
public enum ResourceType implements EnumBitSetHelper<ResourceType> {
public enum ResourceType {
GOLD(7, 2308551, 100000000, 10),
ADAMANT(1580003, -1741189964, 1000, 10),

4
src/engine/objects/Warehouse.java

@ -9,9 +9,9 @@ @@ -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 { @@ -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);
}
}
Loading…
Cancel
Save