diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/MapleCharacter.java index 94a2e7b047..7e611338af 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/MapleCharacter.java @@ -313,7 +313,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } inventory[type.ordinal()] = new Inventory(this, type, (byte) b); } - inventory[MapleInventoryType.CANHOLD.ordinal()] = new MapleInventoryProof(this); + inventory[MapleInventoryType.CANHOLD.ordinal()] = new InventoryProof(this); for (int i = 0; i < SavedLocationType.values().length; i++) { savedLocations[i] = null; diff --git a/src/main/java/client/inventory/MapleInventoryProof.java b/src/main/java/client/inventory/InventoryProof.java similarity index 90% rename from src/main/java/client/inventory/MapleInventoryProof.java rename to src/main/java/client/inventory/InventoryProof.java index 12bbd73219..1482728d24 100644 --- a/src/main/java/client/inventory/MapleInventoryProof.java +++ b/src/main/java/client/inventory/InventoryProof.java @@ -22,23 +22,22 @@ package client.inventory; import client.MapleCharacter; /** - * * @author Ronan */ -public class MapleInventoryProof extends Inventory { - - public MapleInventoryProof(MapleCharacter mc) { +public class InventoryProof extends Inventory { + + public InventoryProof(MapleCharacter mc) { super(mc, MapleInventoryType.CANHOLD, (byte) 0); } - + public void cloneContents(Inventory inv) { inv.lockInventory(); lock.lock(); try { inventory.clear(); this.setSlotLimit(inv.getSlotLimit()); - - for(Item it : inv.list()) { + + for (Item it : inv.list()) { Item item = new Item(it.getItemId(), it.getPosition(), it.getQuantity()); inventory.put(item.getPosition(), item); } @@ -47,7 +46,7 @@ public class MapleInventoryProof extends Inventory { inv.unlockInventory(); } } - + public void flushContents() { lock.lock(); try { @@ -56,13 +55,13 @@ public class MapleInventoryProof extends Inventory { lock.unlock(); } } - + @Override protected short addSlot(Item item) { - if(item == null) { + if (item == null) { return -1; } - + lock.lock(); try { short slotId = getNextFreeSlot(); @@ -70,13 +69,13 @@ public class MapleInventoryProof extends Inventory { return -1; } inventory.put(slotId, item); - + return slotId; } finally { lock.unlock(); } } - + @Override protected void addSlotFromDB(short slot, Item item) { lock.lock(); @@ -86,7 +85,7 @@ public class MapleInventoryProof extends Inventory { lock.unlock(); } } - + @Override public void removeSlot(short slot) { lock.lock(); diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index 24214ebd43..3b8d0cc68c 100644 --- a/src/main/java/scripting/AbstractPlayerInteraction.java +++ b/src/main/java/scripting/AbstractPlayerInteraction.java @@ -284,7 +284,7 @@ public class AbstractPlayerInteraction { List>> toAddItemList = prepareInventoryItemList(toAddItemids, toAddQuantity); List>> toRemoveItemList = prepareInventoryItemList(toRemoveItemids, toRemoveQuantity); - MapleInventoryProof prfInv = (MapleInventoryProof) this.getInventory(MapleInventoryType.CANHOLD); + InventoryProof prfInv = (InventoryProof) this.getInventory(MapleInventoryType.CANHOLD); prfInv.lockInventory(); try { for(int i = MapleInventoryType.EQUIP.getType(); i < MapleInventoryType.CASH.getType(); i++) {