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

Warehosue cleanup

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-01-24 20:03:27 -06:00
parent 92d8ed9e3f
commit cc1e0d8986
20 changed files with 1038 additions and 1425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/msg/ArcViewAssetTransactionsMsg.java
+6 -6
View File
@@ -61,13 +61,13 @@ public class ArcViewAssetTransactionsMsg extends ClientNetMsg {
public void configure() {
warehouseBuilding = BuildingManager.getBuilding(this.warehouse.getBuildingUID());
warehouseBuilding = BuildingManager.getBuilding(this.warehouse.buildingUID);
transactions = new ArrayList<>(50);
if (this.warehouse.getTransactions().size() > 150) {
transactions.addAll(this.warehouse.getTransactions().subList(this.warehouse.getTransactions().size() - 150, this.warehouse.getTransactions().size()));
if (this.warehouse.transactions.size() > 150) {
transactions.addAll(this.warehouse.transactions.subList(this.warehouse.transactions.size() - 150, this.warehouse.transactions.size()));
} else
transactions = this.warehouse.getTransactions();
transactions = this.warehouse.transactions;
}
@@ -78,7 +78,7 @@ public class ArcViewAssetTransactionsMsg extends ClientNetMsg {
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
writer.putInt(this.transactionID);
writer.putInt(this.warehouse.getBuildingUID());
writer.putInt(this.warehouse.buildingUID);
writer.putInt(transactions.size()); //list Size
for (Transaction transaction : transactions) {
@@ -124,7 +124,7 @@ public class ArcViewAssetTransactionsMsg extends ClientNetMsg {
writer.putInt(transaction.getTargetUUID()); //ID
writer.putString(name); //Name of depositer/withdrawler or mine name
writer.putInt(GameObjectType.Building.ordinal()); //Type
writer.putInt(warehouse.getBuildingUID()); //ID
writer.putInt(warehouse.buildingUID); //ID
writer.putString(warehouseBuilding.getName()); //warehouse
writer.putInt(transaction.getTransactionType().getID()); //79,80 withdrew, 81 mine produced, 82 deposit
writer.putInt(transaction.getAmount()); //amount
src/engine/net/client/msg/ViewResourcesMessage.java
+8 -7
View File
@@ -11,6 +11,7 @@ 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;
@@ -89,26 +90,26 @@ public class ViewResourcesMessage extends ClientNetMsg {
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(warehouseObject.getResources().size());
writer.putInt(warehouseObject.resources.size());
for (ItemBase ib : (warehouseObject.getResources().keySet())) {
for (ItemBase ib : (warehouseObject.resources.keySet())) {
writer.putInt(ib.getHashID());
writer.putInt((warehouseObject.getResources().get(ib)));
writer.putInt((warehouseObject.resources.get(ib)));
if (warehouseObject.isResourceLocked(ib) == true)
if (WarehouseManager.isResourceLocked(warehouseObject, ib) == true)
writer.put((byte) 1);
else
writer.put((byte) 0);
}
writer.putInt(warehouseObject.getResources().size());
writer.putInt(warehouseObject.resources.size());
for (ItemBase ib : warehouseObject.getResources().keySet()) {
for (ItemBase ib : warehouseObject.resources.keySet()) {
writer.putInt(ib.getHashID());
writer.putInt(0); //available?
writer.putInt(Warehouse.getMaxResources().get(ib.getUUID())); //max?
writer.putInt(WarehouseManager.getMaxResources().get(ib.getUUID())); //max?
}
GuildTag._serializeForDisplay(guild.getGuildTag(), writer);