BadBird/BattleBane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Warehosue cleanup

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-01-24 20:21:41 -06:00
parent cc1e0d8986
commit c0ee8b82f8
18 changed files with 931 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/ArcViewAssetTransactionsMsgHandler.java
+1 -2
View File
@@ -3,7 +3,6 @@ package engine.net.client.handlers;
import engine.Enum;
import engine.exception.MsgSendException;
import engine.gameManager.SessionManager;
import engine.gameManager.WarehouseManager;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
@@ -38,7 +37,7 @@ public class ArcViewAssetTransactionsMsgHandler extends AbstractClientMsgHandler
msg = (ArcViewAssetTransactionsMsg) baseMsg;
Warehouse warehouse = WarehouseManager.warehouseByBuildingUUID.get(msg.getWarehouseID());
Warehouse warehouse = Warehouse.warehouseByBuildingUUID.get(msg.getWarehouseID());
if (warehouse == null)
return true;
src/engine/net/client/handlers/ManageCityAssetMsgHandler.java
+2 -3
View File
@@ -6,7 +6,6 @@ import engine.Enum.GameObjectType;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager;
import engine.gameManager.SessionManager;
import engine.gameManager.WarehouseManager;
import engine.gameManager.ZoneManager;
import engine.math.Bounds;
import engine.net.Dispatch;
@@ -167,12 +166,12 @@ public class ManageCityAssetMsgHandler extends AbstractClientMsgHandler {
return true;
}
Warehouse warehouse = WarehouseManager.warehouseByBuildingUUID.get(building.getObjectUUID());
Warehouse warehouse = Warehouse.warehouseByBuildingUUID.get(building.getObjectUUID());
if (warehouse == null)
return true;
if (WarehouseManager.isEmpty(warehouse)) {
if (Warehouse.isEmpty(warehouse)) {
ErrorPopupMsg.sendErrorPopup(player, 167); // no more resources.
return true;
}
src/engine/net/client/handlers/MerchantMsgHandler.java
+3 -3
View File
@@ -437,13 +437,13 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
break;
case 17:
WarehouseManager.warehouseWithdraw(msg, player, npc);
Warehouse.warehouseWithdraw(msg, player, npc);
break;
case 18:
WarehouseManager.warehouseDeposit(msg, player, npc);
Warehouse.warehouseDeposit(msg, player, npc);
break;
case 19:
WarehouseManager.warehouseLock(msg, player, npc);
Warehouse.warehouseLock(msg, player, npc);
break;
}
src/engine/net/client/handlers/ObjectActionMsgHandler.java
+20 -20
View File
@@ -98,27 +98,27 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
return false;
}
resourceValue = warehouse.resources.get(WarehouseManager.goldIB);
resourceValue = warehouse.resources.get(ItemBase.getItemBase(7));
if (resourceValue < 5000000)
hasResources = false;
resourceValue = warehouse.resources.get(WarehouseManager.stoneIB);
resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580000));
if (resourceValue < 8000)
hasResources = false;
resourceValue = warehouse.resources.get(WarehouseManager.lumberIB);
resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580004));
if (resourceValue < 8000)
hasResources = false;
resourceValue = warehouse.resources.get(WarehouseManager.galvorIB);
resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580017));
if (resourceValue < 15)
hasResources = false;
resourceValue = warehouse.resources.get(WarehouseManager.wormwoodIB);
resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580018));
if (resourceValue < 15)
hasResources = false;
@@ -130,51 +130,51 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
// Remove resources from warehouse before claiming realm
resourceValue = warehouse.resources.get(WarehouseManager.goldIB);
resourceValue = warehouse.resources.get(ItemBase.getItemBase(7));
if (DbManager.WarehouseQueries.updateGold(warehouse, resourceValue - 5000000) == true) {
warehouse.resources.put(WarehouseManager.goldIB, resourceValue - 5000000);
WarehouseManager.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GOLD, 5000000);
warehouse.resources.put(ItemBase.getItemBase(7), resourceValue - 5000000);
Warehouse.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GOLD, 5000000);
} else {
Logger.error("gold update failed for warehouse of UUID:" + warehouse.getObjectUUID());
return false;
}
resourceValue = warehouse.resources.get(WarehouseManager.stoneIB);
resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580000));
if (DbManager.WarehouseQueries.updateStone(warehouse, resourceValue - 8000) == true) {
warehouse.resources.put(WarehouseManager.stoneIB, resourceValue - 8000);
WarehouseManager.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.STONE, 8000);
warehouse.resources.put(ItemBase.getItemBase(1580000), resourceValue - 8000);
Warehouse.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.STONE, 8000);
} else {
Logger.error("stone update failed for warehouse of UUID:" + warehouse.getObjectUUID());
return false;
}
resourceValue = warehouse.resources.get(WarehouseManager.lumberIB);
resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580004));
if (DbManager.WarehouseQueries.updateLumber(warehouse, resourceValue - 8000) == true) {
warehouse.resources.put(WarehouseManager.lumberIB, resourceValue - 8000);
WarehouseManager.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.LUMBER, 8000);
warehouse.resources.put(ItemBase.getItemBase(1580004), resourceValue - 8000);
Warehouse.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.LUMBER, 8000);
} else {
Logger.error("lumber update failed for warehouse of UUID:" + warehouse.getObjectUUID());
return false;
}
resourceValue = warehouse.resources.get(WarehouseManager.galvorIB);
resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580017));
if (DbManager.WarehouseQueries.updateGalvor(warehouse, resourceValue - 15) == true) {
warehouse.resources.put(WarehouseManager.galvorIB, resourceValue - 15);
WarehouseManager.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GALVOR, 15);
warehouse.resources.put(ItemBase.getItemBase(1580017), resourceValue - 15);
Warehouse.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GALVOR, 15);
} else {
Logger.error("galvor update failed for warehouse of UUID:" + warehouse.getObjectUUID());
return false;
}
resourceValue = warehouse.resources.get(WarehouseManager.wormwoodIB);
resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580018));
if (DbManager.WarehouseQueries.updateWormwood(warehouse, resourceValue - 15) == true) {
warehouse.resources.put(WarehouseManager.wormwoodIB, resourceValue - 15);
WarehouseManager.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.WORMWOOD, 15);
warehouse.resources.put(ItemBase.getItemBase(1580018), resourceValue - 15);
Warehouse.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.WORMWOOD, 15);
} else {
Logger.error("wormwood update failed for warehouse of UUID:" + warehouse.getObjectUUID());
return false;
src/engine/net/client/handlers/PlaceAssetMsgHandler.java
+1 -1
View File
@@ -1359,7 +1359,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
return true;
city.setWarehouseBuildingID(newMesh.getObjectUUID());
WarehouseManager.warehouseByBuildingUUID.put(newMesh.getObjectUUID(), warehouse);
Warehouse.warehouseByBuildingUUID.put(newMesh.getObjectUUID(), warehouse);
}
}
src/engine/net/client/msg/ViewResourcesMessage.java
+2 -3
View File
@@ -11,7 +11,6 @@ package engine.net.client.msg;
import engine.Enum;
import engine.gameManager.DbManager;
import engine.gameManager.WarehouseManager;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@@ -98,7 +97,7 @@ public class ViewResourcesMessage extends ClientNetMsg {
writer.putInt((warehouseObject.resources.get(ib)));
if (WarehouseManager.isResourceLocked(warehouseObject, ib) == true)
if (Warehouse.isResourceLocked(warehouseObject, ib) == true)
writer.put((byte) 1);
else
writer.put((byte) 0);
@@ -109,7 +108,7 @@ public class ViewResourcesMessage extends ClientNetMsg {
for (ItemBase ib : warehouseObject.resources.keySet()) {
writer.putInt(ib.getHashID());
writer.putInt(0); //available?
writer.putInt(WarehouseManager.getMaxResources().get(ib.getUUID())); //max?
writer.putInt(Warehouse.getMaxResources().get(ib.getUUID())); //max?
}
GuildTag._serializeForDisplay(guild.getGuildTag(), writer);