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

8
src/main/java/net/server/channel/handlers/WeddingHandler.java
View File

@@ -9,8 +9,8 @@ package net.server.channel.handlers;
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;
@@ -57,7 +57,7 @@ public final class WeddingHandler extends AbstractPacketHandler {
MapleCharacter spouse = marriage.getPlayerById(cid);
if (spouse != null) {
MapleInventoryType type = ItemConstants.getInventoryType(itemid);
MapleInventory chrInv = chr.getInventory(type);
Inventory chrInv = chr.getInventory(type);
Item newItem = null;
chrInv.lockInventory();
@@ -111,7 +111,7 @@ public final class WeddingHandler extends AbstractPacketHandler {
if (groomWishlist != null) {
Item item = marriage.getGiftItem(c, groomWishlist, itemPos);
if (item != null) {
if (MapleInventory.checkSpot(chr, item)) {
if (Inventory.checkSpot(chr, item)) {
marriage.removeGiftItem(groomWishlist, item);
marriage.saveGiftItemsToDb(c, groomWishlist, chr.getId());
@@ -131,7 +131,7 @@ public final class WeddingHandler extends AbstractPacketHandler {
List<Item> items = c.getAbstractPlayerInteraction().getUnclaimedMarriageGifts();
try {
Item item = items.get(itemPos);
if (MapleInventory.checkSpot(chr, item)) {
if (Inventory.checkSpot(chr, item)) {
items.remove(itemPos);
MapleMarriage.saveGiftItemsToDb(c, items, chr.getId());