Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleInventoryProof

Browse Source
This commit is contained in:
P0nk
2021-09-09 20:46:15 +02:00
parent dd916a96eb
commit ba647db6cf
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/client/MapleCharacter.java
View File

@@ -313,7 +313,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
} }
inventory[type.ordinal()] = new Inventory(this, type, (byte) b); 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++) { for (int i = 0; i < SavedLocationType.values().length; i++) {
savedLocations[i] = null; savedLocations[i] = null;

27
src/main/java/client/inventory/MapleInventoryProof.java → src/main/java/client/inventory/InventoryProof.java
View File

@@ -22,23 +22,22 @@ package client.inventory;
import client.MapleCharacter; import client.MapleCharacter;
/** /**
*
* @author Ronan * @author Ronan
*/ */
public class MapleInventoryProof extends Inventory { public class InventoryProof extends Inventory {
public MapleInventoryProof(MapleCharacter mc) { public InventoryProof(MapleCharacter mc) {
super(mc, MapleInventoryType.CANHOLD, (byte) 0); super(mc, MapleInventoryType.CANHOLD, (byte) 0);
} }
public void cloneContents(Inventory inv) { public void cloneContents(Inventory inv) {
inv.lockInventory(); inv.lockInventory();
lock.lock(); lock.lock();
try { try {
inventory.clear(); inventory.clear();
this.setSlotLimit(inv.getSlotLimit()); this.setSlotLimit(inv.getSlotLimit());
for(Item it : inv.list()) { for (Item it : inv.list()) {
Item item = new Item(it.getItemId(), it.getPosition(), it.getQuantity()); Item item = new Item(it.getItemId(), it.getPosition(), it.getQuantity());
inventory.put(item.getPosition(), item); inventory.put(item.getPosition(), item);
} }
@@ -47,7 +46,7 @@ public class MapleInventoryProof extends Inventory {
inv.unlockInventory(); inv.unlockInventory();
} }
} }
public void flushContents() { public void flushContents() {
lock.lock(); lock.lock();
try { try {
@@ -56,13 +55,13 @@ public class MapleInventoryProof extends Inventory {
lock.unlock(); lock.unlock();
} }
} }
@Override @Override
protected short addSlot(Item item) { protected short addSlot(Item item) {
if(item == null) { if (item == null) {
return -1; return -1;
} }
lock.lock(); lock.lock();
try { try {
short slotId = getNextFreeSlot(); short slotId = getNextFreeSlot();
@@ -70,13 +69,13 @@ public class MapleInventoryProof extends Inventory {
return -1; return -1;
} }
inventory.put(slotId, item); inventory.put(slotId, item);
return slotId; return slotId;
} finally { } finally {
lock.unlock(); lock.unlock();
} }
} }
@Override @Override
protected void addSlotFromDB(short slot, Item item) { protected void addSlotFromDB(short slot, Item item) {
lock.lock(); lock.lock();
@@ -86,7 +85,7 @@ public class MapleInventoryProof extends Inventory {
lock.unlock(); lock.unlock();
} }
} }
@Override @Override
public void removeSlot(short slot) { public void removeSlot(short slot) {
lock.lock(); lock.lock();

2
src/main/java/scripting/AbstractPlayerInteraction.java
View File

@@ -284,7 +284,7 @@ public class AbstractPlayerInteraction {
List<List<Pair<Integer, Integer>>> toAddItemList = prepareInventoryItemList(toAddItemids, toAddQuantity); List<List<Pair<Integer, Integer>>> toAddItemList = prepareInventoryItemList(toAddItemids, toAddQuantity);
List<List<Pair<Integer, Integer>>> toRemoveItemList = prepareInventoryItemList(toRemoveItemids, toRemoveQuantity); List<List<Pair<Integer, Integer>>> toRemoveItemList = prepareInventoryItemList(toRemoveItemids, toRemoveQuantity);
MapleInventoryProof prfInv = (MapleInventoryProof) this.getInventory(MapleInventoryType.CANHOLD); InventoryProof prfInv = (InventoryProof) this.getInventory(MapleInventoryType.CANHOLD);
prfInv.lockInventory(); prfInv.lockInventory();
try { try {
for(int i = MapleInventoryType.EQUIP.getType(); i < MapleInventoryType.CASH.getType(); i++) { for(int i = MapleInventoryType.EQUIP.getType(); i < MapleInventoryType.CASH.getType(); i++) {