diff --git a/src/main/java/client/inventory/Item.java b/src/main/java/client/inventory/Item.java index 7df866905d..0775bafa3c 100644 --- a/src/main/java/client/inventory/Item.java +++ b/src/main/java/client/inventory/Item.java @@ -21,7 +21,7 @@ along with this program. If not, see . */ package client.inventory; -import client.inventory.manipulator.MapleKarmaManipulator; +import client.inventory.manipulator.KarmaManipulator; import constants.inventory.ItemConstants; import server.MapleItemInformationProvider; @@ -189,6 +189,6 @@ public class Item implements Comparable { } public boolean isUntradeable() { - return ((this.getFlag() & ItemConstants.UNTRADEABLE) == ItemConstants.UNTRADEABLE) || (MapleItemInformationProvider.getInstance().isDropRestricted(this.getItemId()) && !MapleKarmaManipulator.hasKarmaFlag(this)); + return ((this.getFlag() & ItemConstants.UNTRADEABLE) == ItemConstants.UNTRADEABLE) || (MapleItemInformationProvider.getInstance().isDropRestricted(this.getItemId()) && !KarmaManipulator.hasKarmaFlag(this)); } } diff --git a/src/main/java/client/inventory/manipulator/MapleKarmaManipulator.java b/src/main/java/client/inventory/manipulator/KarmaManipulator.java similarity index 96% rename from src/main/java/client/inventory/manipulator/MapleKarmaManipulator.java rename to src/main/java/client/inventory/manipulator/KarmaManipulator.java index c0cb0838d3..68cc77b5c5 100644 --- a/src/main/java/client/inventory/manipulator/MapleKarmaManipulator.java +++ b/src/main/java/client/inventory/manipulator/KarmaManipulator.java @@ -19,18 +19,17 @@ */ package client.inventory.manipulator; -import constants.inventory.ItemConstants; import client.inventory.Item; +import constants.inventory.ItemConstants; /** - * * @author RonanLana */ -public class MapleKarmaManipulator { +public class KarmaManipulator { private static short getKarmaFlag(Item item) { return item.getItemType() == 1 ? ItemConstants.KARMA_EQP : ItemConstants.KARMA_USE; } - + public static boolean hasKarmaFlag(Item item) { short karmaFlag = getKarmaFlag(item); return (item.getFlag() & karmaFlag) == karmaFlag; @@ -39,7 +38,7 @@ public class MapleKarmaManipulator { public static void toggleKarmaFlagToUntradeable(Item item) { short karmaFlag = getKarmaFlag(item); short flag = item.getFlag(); - + if ((flag & karmaFlag) == karmaFlag) { flag ^= karmaFlag; flag |= ItemConstants.UNTRADEABLE; @@ -47,11 +46,11 @@ public class MapleKarmaManipulator { item.setFlag((byte) flag); } } - + public static void setKarmaFlag(Item item) { short karmaFlag = getKarmaFlag(item); short flag = item.getFlag(); - + flag |= karmaFlag; flag &= (0xFFFFFFFF ^ ItemConstants.UNTRADEABLE); item.setFlag((byte) flag); diff --git a/src/main/java/client/processor/npc/DueyProcessor.java b/src/main/java/client/processor/npc/DueyProcessor.java index d153288b8b..ac7e2a8f90 100644 --- a/src/main/java/client/processor/npc/DueyProcessor.java +++ b/src/main/java/client/processor/npc/DueyProcessor.java @@ -31,7 +31,7 @@ import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.ItemFactory; import client.inventory.manipulator.InventoryManipulator; -import client.inventory.manipulator.MapleKarmaManipulator; +import client.inventory.manipulator.KarmaManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; import net.server.channel.Channel; @@ -267,7 +267,7 @@ public class DueyProcessor { inv.unlockInventory(); } - MapleKarmaManipulator.toggleKarmaFlagToUntradeable(item); + KarmaManipulator.toggleKarmaFlagToUntradeable(item); item.setQuantity(amount); if (!insertPackageItem(packageId, item)) { diff --git a/src/main/java/client/processor/npc/StorageProcessor.java b/src/main/java/client/processor/npc/StorageProcessor.java index 234c71d7b8..ddc3b01454 100644 --- a/src/main/java/client/processor/npc/StorageProcessor.java +++ b/src/main/java/client/processor/npc/StorageProcessor.java @@ -28,7 +28,7 @@ import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.manipulator.InventoryManipulator; -import client.inventory.manipulator.MapleKarmaManipulator; +import client.inventory.manipulator.KarmaManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; import net.packet.InPacket; @@ -87,7 +87,7 @@ public class StorageProcessor { if (storage.takeOut(item)) { chr.setUsedStorage(); - MapleKarmaManipulator.toggleKarmaFlagToUntradeable(item); + KarmaManipulator.toggleKarmaFlagToUntradeable(item); InventoryManipulator.addFromDrop(c, item, false); String itemName = ii.getName(item.getItemId()); @@ -155,7 +155,7 @@ public class StorageProcessor { chr.gainMeso(-storeFee, false, true, false); - MapleKarmaManipulator.toggleKarmaFlagToUntradeable(item); + KarmaManipulator.toggleKarmaFlagToUntradeable(item); item.setQuantity(quantity); storage.store(item); // inside a critical section, "!(storage.isFull())" is still in effect... diff --git a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java b/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java index a4e7c3e045..d360407810 100644 --- a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java @@ -28,7 +28,7 @@ import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.manipulator.InventoryManipulator; -import client.inventory.manipulator.MapleKarmaManipulator; +import client.inventory.manipulator.KarmaManipulator; import config.YamlConfig; import constants.game.GameConstants; import constants.inventory.ItemConstants; @@ -511,7 +511,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler { if (trade != null) { if ((quantity <= item.getQuantity() && quantity >= 0) || ItemConstants.isRechargeable(item.getItemId())) { if (ii.isDropRestricted(item.getItemId())) { // ensure that undroppable items do not make it to the trade window - if (!MapleKarmaManipulator.hasKarmaFlag(item)) { + if (!KarmaManipulator.hasKarmaFlag(item)) { c.sendPacket(PacketCreator.serverNotice(1, "That item is untradeable.")); c.sendPacket(PacketCreator.enableActions()); return; diff --git a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java index 0a86643459..1b34518f38 100644 --- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java @@ -26,7 +26,7 @@ import client.creator.veteran.*; import client.inventory.*; import client.inventory.Equip.ScrollResult; import client.inventory.manipulator.InventoryManipulator; -import client.inventory.manipulator.MapleKarmaManipulator; +import client.inventory.manipulator.KarmaManipulator; import client.processor.npc.DueyProcessor; import client.processor.stat.AssignAPProcessor; import client.processor.stat.AssignSPProcessor; @@ -507,12 +507,12 @@ public final class UseCashItemHandler extends AbstractPacketHandler { InventoryType type = InventoryType.getByType((byte) p.readInt()); short slot = (short) p.readInt(); Item item = player.getInventory(type).getItem(slot); - if (item == null || item.getQuantity() <= 0 || MapleKarmaManipulator.hasKarmaFlag(item) || !ii.isKarmaAble(item.getItemId())) { + if (item == null || item.getQuantity() <= 0 || KarmaManipulator.hasKarmaFlag(item) || !ii.isKarmaAble(item.getItemId())) { c.sendPacket(PacketCreator.enableActions()); return; } - MapleKarmaManipulator.setKarmaFlag(item); + KarmaManipulator.setKarmaFlag(item); player.forceUpdateItem(item); remove(c, position, itemId); c.sendPacket(PacketCreator.enableActions()); diff --git a/src/main/java/net/server/channel/handlers/WeddingHandler.java b/src/main/java/net/server/channel/handlers/WeddingHandler.java index 105226d07f..65f8a31e06 100644 --- a/src/main/java/net/server/channel/handlers/WeddingHandler.java +++ b/src/main/java/net/server/channel/handlers/WeddingHandler.java @@ -13,7 +13,7 @@ import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.manipulator.InventoryManipulator; -import client.inventory.manipulator.MapleKarmaManipulator; +import client.inventory.manipulator.KarmaManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; @@ -71,7 +71,7 @@ public final class WeddingHandler extends AbstractPacketHandler { marriage.addGiftItem(groomWishlist, newItem); InventoryManipulator.removeFromSlot(c, type, slot, quantity, false, false); - MapleKarmaManipulator.toggleKarmaFlagToUntradeable(newItem); + KarmaManipulator.toggleKarmaFlagToUntradeable(newItem); marriage.setIntProperty(groomWishlistProp, giftCount + 1); c.sendPacket(WeddingPackets.onWeddingGiftResult((byte) 0xB, marriage.getWishlistItems(groomWishlist), Collections.singletonList(newItem))); diff --git a/src/main/java/server/MapleTrade.java b/src/main/java/server/MapleTrade.java index 7ba3b1e4f5..89acd41a63 100644 --- a/src/main/java/server/MapleTrade.java +++ b/src/main/java/server/MapleTrade.java @@ -26,7 +26,7 @@ import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.manipulator.InventoryManipulator; -import client.inventory.manipulator.MapleKarmaManipulator; +import client.inventory.manipulator.KarmaManipulator; import config.YamlConfig; import constants.game.GameConstants; import net.server.coordinator.world.MapleInviteCoordinator; @@ -119,7 +119,7 @@ public class MapleTrade { meso = 0; for (Item item : exchangeItems) { - MapleKarmaManipulator.toggleKarmaFlagToUntradeable(item); + KarmaManipulator.toggleKarmaFlagToUntradeable(item); InventoryManipulator.addFromDrop(chr.getClient(), item, show); } diff --git a/src/main/java/server/maps/MapleHiredMerchant.java b/src/main/java/server/maps/MapleHiredMerchant.java index 8686ebee17..230670fa16 100644 --- a/src/main/java/server/maps/MapleHiredMerchant.java +++ b/src/main/java/server/maps/MapleHiredMerchant.java @@ -28,7 +28,7 @@ import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.ItemFactory; import client.inventory.manipulator.InventoryManipulator; -import client.inventory.manipulator.MapleKarmaManipulator; +import client.inventory.manipulator.KarmaManipulator; import client.processor.npc.FredrickProcessor; import config.YamlConfig; import net.packet.Packet; @@ -271,7 +271,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { return; } - MapleKarmaManipulator.toggleKarmaFlagToUntradeable(newItem); + KarmaManipulator.toggleKarmaFlagToUntradeable(newItem); int price = (int) Math.min((float) pItem.getPrice() * quantity, Integer.MAX_VALUE); if (c.getPlayer().getMeso() >= price) { diff --git a/src/main/java/server/maps/MaplePlayerShop.java b/src/main/java/server/maps/MaplePlayerShop.java index 4392633c8e..b27f8e517e 100644 --- a/src/main/java/server/maps/MaplePlayerShop.java +++ b/src/main/java/server/maps/MaplePlayerShop.java @@ -27,7 +27,7 @@ import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.manipulator.InventoryManipulator; -import client.inventory.manipulator.MapleKarmaManipulator; +import client.inventory.manipulator.KarmaManipulator; import net.packet.Packet; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; @@ -260,7 +260,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { return false; } - MapleKarmaManipulator.toggleKarmaFlagToUntradeable(newItem); + KarmaManipulator.toggleKarmaFlagToUntradeable(newItem); visitorLock.lock(); try {