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

Refactored out duplicate resource type.

Browse Source
This commit is contained in:
MagicBot
2024-03-14 14:47:20 -04:00
parent b6eb587a82
commit 4646d03bdd
10 changed files with 96 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Warehouse.java
+22 -22
View File
@@ -302,12 +302,12 @@ public class Warehouse extends AbstractWorldObject {
warehouse.resources.put(ib, newAmount);
Resource resourceType;
Enum.ResourceType resourceType;
if (resource.template.item_type.equals(Enum.ItemType.GOLD))
resourceType = Resource.GOLD;
resourceType = Enum.ResourceType.GOLD;
else
resourceType = Resource.valueOf(ItemTemplate.itemTemplates.get(resource.getTemplsteID()).item_base_name.toUpperCase());
resourceType = Enum.ResourceType.valueOf(ItemTemplate.itemTemplates.get(resource.getTemplsteID()).item_base_name.toUpperCase());
if (transaction)
AddTransactionToWarehouse(warehouse, pc.getObjectType(), pc.getObjectUUID(), Enum.TransactionType.DEPOSIT, resourceType, amount);
@@ -327,14 +327,14 @@ public class Warehouse extends AbstractWorldObject {
return false;
warehouse.resources.put(resource, newAmount);
Resource resourceType;
Enum.ResourceType resourceType;
ItemTemplate template = ItemTemplate.itemTemplates.get(resource.getUUID());
if (resource.getUUID() == 7)
resourceType = Resource.GOLD;
resourceType = Enum.ResourceType.GOLD;
else
resourceType = Resource.valueOf(template.item_base_name.toUpperCase());
resourceType = Enum.ResourceType.valueOf(template.item_base_name.toUpperCase());
if (mine != null)
AddTransactionToWarehouse(warehouse, Enum.GameObjectType.Building, mine.getBuildingID(), Enum.TransactionType.MINE, resourceType, amount);
@@ -440,14 +440,14 @@ public class Warehouse extends AbstractWorldObject {
int oldAmount = warehouse.resources.get(ib);
int newAmount = oldAmount + amount;
warehouse.resources.put(ib, newAmount);
Resource resourceType;
Enum.ResourceType resourceType;
ItemTemplate template = ItemTemplate.itemTemplates.get(ib.getUUID());
if (ib.getUUID() == 7)
resourceType = Resource.GOLD;
resourceType = Enum.ResourceType.GOLD;
else
resourceType = Resource.valueOf(template.item_base_name.toUpperCase());
resourceType = Enum.ResourceType.valueOf(template.item_base_name.toUpperCase());
AddTransactionToWarehouse(warehouse, taxer.getObjectType(), taxer.getObjectUUID(), Enum.TransactionType.TAXRESOURCEDEPOSIT, resourceType, amount);
@@ -473,12 +473,12 @@ public class Warehouse extends AbstractWorldObject {
return;
warehouse.resources.put(ib, newAmount);
Resource resourceType;
Enum.ResourceType resourceType;
if (ib.getUUID() == 7)
resourceType = Resource.GOLD;
resourceType = Enum.ResourceType.GOLD;
else
resourceType = Resource.valueOf(template.item_base_name.toUpperCase());
resourceType = Enum.ResourceType.valueOf(template.item_base_name.toUpperCase());
if (building != null)
AddTransactionToWarehouse(warehouse, Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.DEPOSIT, resourceType, amount);
@@ -592,12 +592,12 @@ public class Warehouse extends AbstractWorldObject {
ItemTemplate template = ItemTemplate.itemTemplates.get(ib.getUUID());
warehouse.resources.put(ib, newAmount);
Resource resourceType;
Enum.ResourceType resourceType;
if (ib.getUUID() == 7)
resourceType = Resource.GOLD;
resourceType = Enum.ResourceType.GOLD;
else
resourceType = Resource.valueOf(template.item_base_name.toUpperCase());
resourceType = Enum.ResourceType.valueOf(template.item_base_name.toUpperCase());
if (transaction)
AddTransactionToWarehouse(warehouse, npc.getObjectType(), npc.getObjectUUID(), Enum.TransactionType.WITHDRAWL, resourceType, amount);
@@ -648,12 +648,12 @@ public class Warehouse extends AbstractWorldObject {
warehouse.resources.put(ib, newAmount);
depositRealmTaxes(taxer, ib, amount, warehouse);
Resource resource;
Enum.ResourceType resource;
if (resourceType.equals(Enum.ResourceType.GOLD))
resource = Resource.GOLD;
resource = Enum.ResourceType.GOLD;
else
resource = Resource.valueOf(template.item_base_name.toUpperCase());
resource = Enum.ResourceType.valueOf(template.item_base_name.toUpperCase());
AddTransactionToWarehouse(warehouse, taxer.getObjectType(), taxer.getObjectUUID(), Enum.TransactionType.TAXRESOURCE, resource, amount);
@@ -739,12 +739,12 @@ public class Warehouse extends AbstractWorldObject {
}
}
}
Resource resourceType;
Enum.ResourceType resourceType;
if (ib.getUUID() == 7)
resourceType = Resource.GOLD;
resourceType = Enum.ResourceType.GOLD;
else
resourceType = Resource.valueOf(template.item_base_name.toUpperCase());
resourceType = Enum.ResourceType.valueOf(template.item_base_name.toUpperCase());
if (transaction)
AddTransactionToWarehouse(warehouse, pc.getObjectType(), pc.getObjectUUID(), Enum.TransactionType.WITHDRAWL, resourceType, amount);
@@ -835,7 +835,7 @@ public class Warehouse extends AbstractWorldObject {
warehouse.transactions = DbManager.WarehouseQueries.GET_TRANSACTIONS_FOR_WAREHOUSE(warehouse.buildingUID);
}
public static void AddTransactionToWarehouse(Warehouse warehouse, Enum.GameObjectType targetType, int targetUUID, Enum.TransactionType transactionType, Resource resource, int amount) {
public static void AddTransactionToWarehouse(Warehouse warehouse, Enum.GameObjectType targetType, int targetUUID, Enum.TransactionType transactionType, Enum.ResourceType resource, int amount) {
if (!DbManager.WarehouseQueries.CREATE_TRANSACTION(warehouse.buildingUID, targetType, targetUUID, transactionType, resource, amount, DateTime.now()))