Sweetgum/sweetgum-server
1
0
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-07 08:00:14 +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

6
src/main/java/server/maps/MapleHiredMerchant.java
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() {

4
src/main/java/server/maps/MaplePlayerShop.java
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;