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

Rename and clean up MapleItemInformationProvider

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:45:55 +02:00
parent 8f54b3e5de
commit 9c8abf6f62
81 changed files with 545 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java
View File

@@ -34,7 +34,7 @@ import constants.game.GameConstants;
import constants.inventory.ItemConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleTrade;
import server.maps.*;
import server.maps.MiniGame.MiniGameType;
@@ -471,7 +471,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
} else if (mode == Action.SET_MESO.getCode()) {
chr.getTrade().setMeso(p.readInt());
} else if (mode == Action.SET_ITEMS.getCode()) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
InventoryType ivType = InventoryType.getByType(p.readByte());
short pos = p.readShort();
Item item = chr.getInventory(ivType).getItem(pos);
@@ -565,7 +565,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.serverNotice(1, "Could not perform shop operation with that item."));
c.sendPacket(PacketCreator.enableActions());
return;
} else if (MapleItemInformationProvider.getInstance().isUnmerchable(ivItem.getItemId())) {
} else if (ItemInformationProvider.getInstance().isUnmerchable(ivItem.getItemId())) {
if (ItemConstants.isPet(ivItem.getItemId())) {
c.sendPacket(PacketCreator.serverNotice(1, "Pets are not allowed to be sold on the Player Store."));
} else {