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

Rename and clean up MapleInventoryType

Browse Source
This commit is contained in:
P0nk
2021-09-09 20:49:05 +02:00
parent ba647db6cf
commit 5ed7cf73d1
97 changed files with 556 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/server/CashShop.java
View File

@@ -90,7 +90,7 @@ public class CashShop {
petid = MaplePet.createPet(itemId);
}
if (ItemConstants.getInventoryType(itemId).equals(MapleInventoryType.EQUIP)) {
if (ItemConstants.getInventoryType(itemId).equals(InventoryType.EQUIP)) {
item = MapleItemInformationProvider.getInstance().getEquipById(itemId);
} else {
item = new Item(itemId, (byte) 0, count, petid);
@@ -277,7 +277,7 @@ public class CashShop {
}
}
for (Pair<Item, MapleInventoryType> item : factory.loadItems(accountId, false)) {
for (Pair<Item, InventoryType> item : factory.loadItems(accountId, false)) {
inventory.add(item.getLeft());
}
@@ -348,7 +348,7 @@ public class CashShop {
boolean isRing;
Equip equip = null;
for (Item item : getInventory()) {
if (item.getInventoryType().equals(MapleInventoryType.EQUIP)) {
if (item.getInventoryType().equals(InventoryType.EQUIP)) {
equip = (Equip) item;
isRing = equip.getRingId() > -1;
} else {
@@ -426,7 +426,7 @@ public class CashShop {
Item item = cItem.toItem();
Equip equip = null;
item.setGiftFrom(rs.getString("from"));
if (item.getInventoryType().equals(MapleInventoryType.EQUIP)) {
if (item.getInventoryType().equals(InventoryType.EQUIP)) {
equip = (Equip) item;
equip.setRingId(rs.getInt("ringid"));
gifts.add(new Pair<>(equip, rs.getString("message")));
@@ -474,7 +474,7 @@ public class CashShop {
ps.executeUpdate();
}
List<Pair<Item, MapleInventoryType>> itemsWithType = new ArrayList<>();
List<Pair<Item, InventoryType>> itemsWithType = new ArrayList<>();
List<Item> inv = getInventory();
for (Item item : inv) {