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

templateHash used in this context.

Browse Source
This commit is contained in:
MagicBot
2024-06-11 13:09:40 -04:00
parent cdc4717033
commit 31292785a5
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/mbEnums.java
+2 -2
View File
@@ -2740,7 +2740,7 @@ public class mbEnums {
WORMWOOD(1580018, 1204785075, 1532478436, 500, 5); WORMWOOD(1580018, 1204785075, 1532478436, 500, 5);
public static HashMap<Integer, ResourceType> templateLookup = new HashMap<>(); public static HashMap<Integer, ResourceType> templateLookup = new HashMap<>();
public static HashMap<Integer, ResourceType> hashLookup = new HashMap<>(); public static HashMap<Integer, ResourceType> templateHashLookup = new HashMap<>();
public int templateID; public int templateID;
public ItemTemplate template; public ItemTemplate template;
public int resourceHash; public int resourceHash;
@@ -2761,7 +2761,7 @@ public class mbEnums {
for (ResourceType resourceType : ResourceType.values()) { for (ResourceType resourceType : ResourceType.values()) {
templateLookup.put(resourceType.templateID, resourceType); templateLookup.put(resourceType.templateID, resourceType);
hashLookup.put(resourceType.resourceHash, resourceType); templateHashLookup.put(resourceType.templateHash, resourceType);
} }
} }
src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class ArcMineChangeProductionMsgHandler extends AbstractClientMsgHandler
//make sure valid resource //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) if (resource == null)
return true; return true;
src/engine/objects/City.java
+1 -1
View File
@@ -1399,7 +1399,7 @@ public class City extends AbstractWorldObject {
taxPercent = .20f; taxPercent = .20f;
for (int resourceHash : msg.getResources().keySet()) for (int resourceHash : msg.getResources().keySet())
resources.add(ResourceType.hashLookup.get(resourceHash)); resources.add(ResourceType.templateHashLookup.get(resourceHash));
for (ResourceType resourceType : resources) { for (ResourceType resourceType : resources) {
if (Warehouse.isAboveCap(ruledWarehouse, resourceType, (int) (city.warehouse.resources.get(resourceType) * taxPercent))) { if (Warehouse.isAboveCap(ruledWarehouse, resourceType, (int) (city.warehouse.resources.get(resourceType) * taxPercent))) {
src/engine/objects/Warehouse.java
+2 -2
View File
@@ -140,7 +140,7 @@ public class Warehouse {
if (warehouse == null) if (warehouse == null)
return; return;
mbEnums.ResourceType resourceType = mbEnums.ResourceType.hashLookup.get(msg.getHashID()); mbEnums.ResourceType resourceType = mbEnums.ResourceType.templateHashLookup.get(msg.getHashID());
if (isResourceLocked(warehouse, resourceType)) { if (isResourceLocked(warehouse, resourceType)) {
ChatManager.chatSystemInfo(playerCharacter, "You cannot withdrawl a locked resource."); ChatManager.chatSystemInfo(playerCharacter, "You cannot withdrawl a locked resource.");
@@ -182,7 +182,7 @@ public class Warehouse {
warehouse = city.warehouse; warehouse = city.warehouse;
mbEnums.ResourceType resourceType = mbEnums.ResourceType.hashLookup.get(hashID); mbEnums.ResourceType resourceType = mbEnums.ResourceType.templateHashLookup.get(hashID);
// toggle lock // toggle lock