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

Rename and clean up MapleInventory

Browse Source
This commit is contained in:
P0nk
2021-09-09 08:34:01 +02:00
parent 8e0ab2f9f9
commit 1b945bca10
34 changed files with 260 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/server/MapleItemInformationProvider.java
+1 -1
View File
@@ -1581,7 +1581,7 @@ public class MapleItemInformationProvider {
}
public Collection<Item> canWearEquipment(MapleCharacter chr, Collection<Item> items) {
MapleInventory inv = chr.getInventory(MapleInventoryType.EQUIPPED);
Inventory inv = chr.getInventory(MapleInventoryType.EQUIPPED);
if (inv.checked()) {
return items;
}
src/main/java/server/MapleMarriage.java
+2 -2
View File
@@ -21,9 +21,9 @@ package server;
import client.MapleCharacter;
import client.MapleClient;
import client.inventory.Inventory;
import client.inventory.Item;
import client.inventory.ItemFactory;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import scripting.event.EventInstanceManager;
@@ -118,7 +118,7 @@ public class MapleMarriage extends EventInstanceManager {
public static boolean claimGiftItems(MapleClient c, MapleCharacter chr) {
List<Item> gifts = loadGiftItemsFromDb(c, chr.getId());
if (MapleInventory.checkSpot(chr, gifts)) {
if (Inventory.checkSpot(chr, gifts)) {
try (Connection con = DatabaseConnection.getConnection()) {
ItemFactory.MARRIAGE_GIFTS.saveItems(new LinkedList<>(), chr.getId(), con);
} catch (SQLException sqle) {
src/main/java/server/MapleStatEffect.java
+2 -2
View File
@@ -22,8 +22,8 @@
package server;
import client.*;
import client.inventory.Inventory;
import client.inventory.Item;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import client.status.MonsterStatus;
@@ -940,7 +940,7 @@ public class MapleStatEffect {
if (isShadowClaw()) {
short projectileConsume = this.getBulletConsume(); // noticed by shavit
MapleInventory use = applyto.getInventory(MapleInventoryType.USE);
Inventory use = applyto.getInventory(MapleInventoryType.USE);
use.lockInventory();
try {
Item projectile = null;
src/main/java/server/MapleTrade.java
+2 -2
View File
@@ -22,8 +22,8 @@
package server;
import client.MapleCharacter;
import client.inventory.Inventory;
import client.inventory.Item;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import client.inventory.manipulator.MapleKarmaManipulator;
@@ -251,7 +251,7 @@ public class MapleTrade {
tradeItems.add(new Pair<>(item, item.getInventoryType()));
}
return MapleInventory.checkSpotsAndOwnership(chr, tradeItems);
return Inventory.checkSpotsAndOwnership(chr, tradeItems);
}
private boolean fitsUniquesInInventory() {
src/main/java/server/maps/MapleHiredMerchant.java
+3 -3
View File
@@ -23,9 +23,9 @@ package server.maps;
import client.MapleCharacter;
import client.MapleClient;
import client.inventory.Inventory;
import client.inventory.Item;
import client.inventory.ItemFactory;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import client.inventory.manipulator.MapleKarmaManipulator;
@@ -220,7 +220,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
Item iitem = shopItem.getItem().copy();
iitem.setQuantity((short) (shopItem.getItem().getQuantity() * shopItem.getBundles()));
if (!MapleInventory.checkSpot(chr, iitem)) {
if (!Inventory.checkSpot(chr, iitem)) {
chr.sendPacket(PacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item."));
chr.sendPacket(PacketCreator.enableActions());
return;
@@ -656,7 +656,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
li.add(new Pair<>(it, it.getInventoryType()));
}
return MapleInventory.checkSpotsAndOwnership(chr, li);
return Inventory.checkSpotsAndOwnership(chr, li);
}
public int getChannel() {
src/main/java/server/maps/MaplePlayerShop.java
+2 -2
View File
@@ -23,8 +23,8 @@ package server.maps;
import client.MapleCharacter;
import client.MapleClient;
import client.inventory.Inventory;
import client.inventory.Item;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import client.inventory.manipulator.MapleKarmaManipulator;
@@ -224,7 +224,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
Item iitem = shopItem.getItem().copy();
iitem.setQuantity((short) (shopItem.getItem().getQuantity() * shopItem.getBundles()));
if (!MapleInventory.checkSpot(chr, iitem)) {
if (!Inventory.checkSpot(chr, iitem)) {
chr.sendPacket(PacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item."));
chr.sendPacket(PacketCreator.enableActions());
return;