From 31292785a5b3fd42624baec0358f94e2888d4fae Mon Sep 17 00:00:00 2001 From: MagicBot Date: Tue, 11 Jun 2024 13:09:40 -0400 Subject: [PATCH] templateHash used in this context. --- src/engine/mbEnums.java | 4 ++-- .../client/handlers/ArcMineChangeProductionMsgHandler.java | 2 +- src/engine/objects/City.java | 2 +- src/engine/objects/Warehouse.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/engine/mbEnums.java b/src/engine/mbEnums.java index b662d1a2..fa8d81e5 100644 --- a/src/engine/mbEnums.java +++ b/src/engine/mbEnums.java @@ -2740,7 +2740,7 @@ public class mbEnums { WORMWOOD(1580018, 1204785075, 1532478436, 500, 5); public static HashMap templateLookup = new HashMap<>(); - public static HashMap hashLookup = new HashMap<>(); + public static HashMap templateHashLookup = new HashMap<>(); public int templateID; public ItemTemplate template; public int resourceHash; @@ -2761,7 +2761,7 @@ public class mbEnums { for (ResourceType resourceType : ResourceType.values()) { templateLookup.put(resourceType.templateID, resourceType); - hashLookup.put(resourceType.resourceHash, resourceType); + templateHashLookup.put(resourceType.templateHash, resourceType); } } diff --git a/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java b/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java index a232593d..4488c083 100644 --- a/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java +++ b/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java @@ -50,7 +50,7 @@ public class ArcMineChangeProductionMsgHandler extends AbstractClientMsgHandler //make sure valid resource - mbEnums.ResourceType resource = mbEnums.ResourceType.hashLookup.get(changeProductionMsg.getResourceHash()); + mbEnums.ResourceType resource = mbEnums.ResourceType.templateHashLookup.get(changeProductionMsg.getResourceHash()); if (resource == null) return true; diff --git a/src/engine/objects/City.java b/src/engine/objects/City.java index ac75ee9d..42f3cb4d 100644 --- a/src/engine/objects/City.java +++ b/src/engine/objects/City.java @@ -1399,7 +1399,7 @@ public class City extends AbstractWorldObject { taxPercent = .20f; for (int resourceHash : msg.getResources().keySet()) - resources.add(ResourceType.hashLookup.get(resourceHash)); + resources.add(ResourceType.templateHashLookup.get(resourceHash)); for (ResourceType resourceType : resources) { if (Warehouse.isAboveCap(ruledWarehouse, resourceType, (int) (city.warehouse.resources.get(resourceType) * taxPercent))) { diff --git a/src/engine/objects/Warehouse.java b/src/engine/objects/Warehouse.java index fada5d47..7b1987a1 100644 --- a/src/engine/objects/Warehouse.java +++ b/src/engine/objects/Warehouse.java @@ -140,7 +140,7 @@ public class Warehouse { if (warehouse == null) return; - mbEnums.ResourceType resourceType = mbEnums.ResourceType.hashLookup.get(msg.getHashID()); + mbEnums.ResourceType resourceType = mbEnums.ResourceType.templateHashLookup.get(msg.getHashID()); if (isResourceLocked(warehouse, resourceType)) { ChatManager.chatSystemInfo(playerCharacter, "You cannot withdrawl a locked resource."); @@ -182,7 +182,7 @@ public class Warehouse { warehouse = city.warehouse; - mbEnums.ResourceType resourceType = mbEnums.ResourceType.hashLookup.get(hashID); + mbEnums.ResourceType resourceType = mbEnums.ResourceType.templateHashLookup.get(hashID); // toggle lock