Initial warehouse refactor
This commit is contained in:
@@ -91,14 +91,13 @@ public class ViewResourcesMessage extends ClientNetMsg {
|
||||
|
||||
writer.putInt(warehouseObject.resources.size());
|
||||
|
||||
for (ItemBase ib : (warehouseObject.resources.keySet())) {
|
||||
for (Enum.ResourceType resourceType : (warehouseObject.resources.keySet())) {
|
||||
|
||||
Enum.ResourceType resourceType = Enum.ResourceType.resourceLookup.get(ib.getUUID());
|
||||
writer.putInt(resourceType.hash);
|
||||
writer.putInt((warehouseObject.resources.get(ib)));
|
||||
writer.putInt((warehouseObject.resources.get(resourceType)));
|
||||
|
||||
|
||||
if (Warehouse.isResourceLocked(warehouseObject, ib) == true)
|
||||
if (Warehouse.isResourceLocked(warehouseObject, resourceType) == true)
|
||||
writer.put((byte) 1);
|
||||
else
|
||||
writer.put((byte) 0);
|
||||
@@ -106,11 +105,11 @@ public class ViewResourcesMessage extends ClientNetMsg {
|
||||
|
||||
writer.putInt(warehouseObject.resources.size());
|
||||
|
||||
for (ItemBase ib : warehouseObject.resources.keySet()) {
|
||||
Enum.ResourceType resourceType = Enum.ResourceType.resourceLookup.get(ib.getUUID());
|
||||
for (Enum.ResourceType resourceType : warehouseObject.resources.keySet()) {
|
||||
|
||||
writer.putInt(resourceType.hash);
|
||||
writer.putInt(0); //available?
|
||||
writer.putInt(Enum.ResourceType.resourceLookup.get(ib.getUUID()).deposit_limit); //max?
|
||||
writer.putInt(resourceType.deposit_limit); //max?
|
||||
}
|
||||
GuildTag._serializeForDisplay(guild.getGuildTag(), writer);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user