From ba647db6cf47559696245b77c79d781587a0e2b3 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 20:46:15 +0200 Subject: [PATCH 001/125] Rename and clean up MapleInventoryProof --- src/main/java/client/MapleCharacter.java | 2 +- ...nventoryProof.java => InventoryProof.java} | 27 +++++++++---------- .../scripting/AbstractPlayerInteraction.java | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) rename src/main/java/client/inventory/{MapleInventoryProof.java => InventoryProof.java} (90%) diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/MapleCharacter.java index 94a2e7b047..7e611338af 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/MapleCharacter.java @@ -313,7 +313,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } inventory[type.ordinal()] = new Inventory(this, type, (byte) b); } - inventory[MapleInventoryType.CANHOLD.ordinal()] = new MapleInventoryProof(this); + inventory[MapleInventoryType.CANHOLD.ordinal()] = new InventoryProof(this); for (int i = 0; i < SavedLocationType.values().length; i++) { savedLocations[i] = null; diff --git a/src/main/java/client/inventory/MapleInventoryProof.java b/src/main/java/client/inventory/InventoryProof.java similarity index 90% rename from src/main/java/client/inventory/MapleInventoryProof.java rename to src/main/java/client/inventory/InventoryProof.java index 12bbd73219..1482728d24 100644 --- a/src/main/java/client/inventory/MapleInventoryProof.java +++ b/src/main/java/client/inventory/InventoryProof.java @@ -22,23 +22,22 @@ package client.inventory; import client.MapleCharacter; /** - * * @author Ronan */ -public class MapleInventoryProof extends Inventory { - - public MapleInventoryProof(MapleCharacter mc) { +public class InventoryProof extends Inventory { + + public InventoryProof(MapleCharacter mc) { super(mc, MapleInventoryType.CANHOLD, (byte) 0); } - + public void cloneContents(Inventory inv) { inv.lockInventory(); lock.lock(); try { inventory.clear(); this.setSlotLimit(inv.getSlotLimit()); - - for(Item it : inv.list()) { + + for (Item it : inv.list()) { Item item = new Item(it.getItemId(), it.getPosition(), it.getQuantity()); inventory.put(item.getPosition(), item); } @@ -47,7 +46,7 @@ public class MapleInventoryProof extends Inventory { inv.unlockInventory(); } } - + public void flushContents() { lock.lock(); try { @@ -56,13 +55,13 @@ public class MapleInventoryProof extends Inventory { lock.unlock(); } } - + @Override protected short addSlot(Item item) { - if(item == null) { + if (item == null) { return -1; } - + lock.lock(); try { short slotId = getNextFreeSlot(); @@ -70,13 +69,13 @@ public class MapleInventoryProof extends Inventory { return -1; } inventory.put(slotId, item); - + return slotId; } finally { lock.unlock(); } } - + @Override protected void addSlotFromDB(short slot, Item item) { lock.lock(); @@ -86,7 +85,7 @@ public class MapleInventoryProof extends Inventory { lock.unlock(); } } - + @Override public void removeSlot(short slot) { lock.lock(); diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index 24214ebd43..3b8d0cc68c 100644 --- a/src/main/java/scripting/AbstractPlayerInteraction.java +++ b/src/main/java/scripting/AbstractPlayerInteraction.java @@ -284,7 +284,7 @@ public class AbstractPlayerInteraction { List>> toAddItemList = prepareInventoryItemList(toAddItemids, toAddQuantity); List>> toRemoveItemList = prepareInventoryItemList(toRemoveItemids, toRemoveQuantity); - MapleInventoryProof prfInv = (MapleInventoryProof) this.getInventory(MapleInventoryType.CANHOLD); + InventoryProof prfInv = (InventoryProof) this.getInventory(MapleInventoryType.CANHOLD); prfInv.lockInventory(); try { for(int i = MapleInventoryType.EQUIP.getType(); i < MapleInventoryType.CASH.getType(); i++) { From 5ed7cf73d1418bd96c9fe19642edec8ab1df0b78 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 20:49:05 +0200 Subject: [PATCH 002/125] Rename and clean up MapleInventoryType --- scripts/npc/1022101_old.js | 10 +- scripts/npc/1032102.js | 4 +- scripts/npc/1063000.js | 4 +- scripts/npc/1063001.js | 4 +- scripts/npc/1063002.js | 4 +- scripts/npc/1091003.js | 4 +- scripts/npc/2042000.js | 8 +- scripts/npc/2042001.js | 8 +- scripts/npc/2042002.js | 8 +- scripts/npc/9000019.js | 4 +- scripts/npc/scroll_generator.js | 4 +- scripts/npc/waterOfLife.js | 4 +- scripts/quest/2001.js | 4 +- scripts/quest/2034.js | 4 +- scripts/quest/3239.js | 4 +- scripts/quest/3414.js | 4 +- scripts/quest/3437.js | 4 +- scripts/quest/3452.js | 4 +- scripts/quest/3454.js | 4 +- scripts/quest/3833.js | 4 +- src/main/java/client/MapleCharacter.java | 112 +++++++++--------- src/main/java/client/MapleClient.java | 4 +- .../commands/gm2/ClearSlotCommand.java | 42 +++---- .../command/commands/gm2/ItemDropCommand.java | 4 +- .../command/commands/gm2/RechargeCommand.java | 4 +- .../command/commands/gm4/ProItemCommand.java | 6 +- .../commands/gm4/SetEqStatCommand.java | 4 +- .../java/client/creator/CharacterFactory.java | 4 +- .../creator/CharacterFactoryRecipe.java | 17 +-- .../creator/novice/BeginnerCreator.java | 6 +- .../client/creator/novice/LegendCreator.java | 6 +- .../creator/novice/NoblesseCreator.java | 6 +- .../client/creator/veteran/BowmanCreator.java | 10 +- .../creator/veteran/MagicianCreator.java | 10 +- .../client/creator/veteran/PirateCreator.java | 12 +- .../client/creator/veteran/ThiefCreator.java | 12 +- .../creator/veteran/WarriorCreator.java | 10 +- src/main/java/client/inventory/Inventory.java | 40 +++---- .../java/client/inventory/InventoryProof.java | 2 +- ...eInventoryType.java => InventoryType.java} | 31 +++-- src/main/java/client/inventory/Item.java | 7 +- .../java/client/inventory/ItemFactory.java | 44 +++---- src/main/java/client/inventory/MaplePet.java | 6 +- .../MapleInventoryManipulator.java | 60 +++++----- .../processor/action/MakerProcessor.java | 6 +- .../processor/action/PetAutopotProcessor.java | 8 +- .../processor/action/SpawnPetProcessor.java | 8 +- .../client/processor/npc/DueyProcessor.java | 10 +- .../processor/npc/FredrickProcessor.java | 10 +- .../processor/npc/StorageProcessor.java | 6 +- .../processor/stat/AssignAPProcessor.java | 4 +- .../constants/inventory/ItemConstants.java | 14 +-- .../channel/handlers/AdminCommandHandler.java | 6 +- .../handlers/CashOperationHandler.java | 4 +- .../channel/handlers/ChangeMapHandler.java | 4 +- .../handlers/InventoryMergeHandler.java | 4 +- .../handlers/InventorySortHandler.java | 6 +- .../channel/handlers/ItemMoveHandler.java | 4 +- .../channel/handlers/ItemRewardHandler.java | 10 +- .../channel/handlers/KeymapChangeHandler.java | 6 +- .../server/channel/handlers/MTSHandler.java | 6 +- .../channel/handlers/PetFoodHandler.java | 6 +- .../handlers/PlayerInteractionHandler.java | 12 +- .../handlers/PlayerLoggedinHandler.java | 2 +- .../channel/handlers/RaiseIncExpHandler.java | 6 +- .../channel/handlers/RangedAttackHandler.java | 10 +- .../channel/handlers/RingActionHandler.java | 20 ++-- .../channel/handlers/ScrollHandler.java | 14 +-- .../channel/handlers/SkillBookHandler.java | 6 +- .../channel/handlers/SummonDamageHandler.java | 4 +- .../channel/handlers/TakeDamageHandler.java | 4 +- .../channel/handlers/UseCashItemHandler.java | 34 +++--- .../channel/handlers/UseCatchItemHandler.java | 22 ++-- .../channel/handlers/UseChairHandler.java | 4 +- .../handlers/UseItemEffectHandler.java | 6 +- .../channel/handlers/UseItemHandler.java | 6 +- .../channel/handlers/UseMountFoodHandler.java | 6 +- .../channel/handlers/UseSolomonHandler.java | 6 +- .../channel/handlers/UseSummonBagHandler.java | 6 +- .../channel/handlers/WeddingHandler.java | 4 +- .../scripting/AbstractPlayerInteraction.java | 50 ++++---- .../reactor/ReactorActionManager.java | 6 +- src/main/java/server/CashShop.java | 10 +- .../server/MapleItemInformationProvider.java | 12 +- src/main/java/server/MapleMarriage.java | 6 +- src/main/java/server/MapleShop.java | 16 +-- src/main/java/server/MapleStatEffect.java | 8 +- src/main/java/server/MapleStorage.java | 24 ++-- src/main/java/server/MapleTrade.java | 4 +- src/main/java/server/life/MaplePlayerNPC.java | 4 +- .../java/server/loot/MapleLootInventory.java | 7 +- .../java/server/maps/MapleHiredMerchant.java | 10 +- src/main/java/server/maps/MapleMap.java | 8 +- .../java/server/maps/MaplePlayerShop.java | 4 +- .../java/server/quest/actions/ItemAction.java | 30 ++--- .../quest/requirements/ItemRequirement.java | 24 ++-- src/main/java/tools/PacketCreator.java | 38 +++--- 97 files changed, 556 insertions(+), 556 deletions(-) rename src/main/java/client/inventory/{MapleInventoryType.java => InventoryType.java} (71%) diff --git a/scripts/npc/1022101_old.js b/scripts/npc/1022101_old.js index aaf881afbf..aeb35fb4de 100644 --- a/scripts/npc/1022101_old.js +++ b/scripts/npc/1022101_old.js @@ -116,7 +116,7 @@ function action(mode, type, selection) { if(!cm.hasItem(itemToUse) && vp > 0) useVP = true; - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); + const InventoryType = Java.type('client.inventory.InventoryType'); if(choice == 0) { // VP Exchange if(!cm.canHold(itemToUse)) { @@ -141,7 +141,7 @@ function action(mode, type, selection) { cm.logLeaf(nxAmount + " NX"); cm.dispose(); } else if(choice == 2) { - if(!cm.getPlayer().getInventory(MapleInventoryType.SETUP).isFull(chairAmount)) { + if(!cm.getPlayer().getInventory(InventoryType.SETUP).isFull(chairAmount)) { var chairStr = ""; for(var i = 0; i < chairAmount; i++) { @@ -161,7 +161,7 @@ function action(mode, type, selection) { cm.sendOk("Please make sure you have enough space to hold the items!"); } } else if(choice == 3) { - if(!cm.getPlayer().getInventory(MapleInventoryType.EQUIP).isFull(weaponAmount)) { + if(!cm.getPlayer().getInventory(InventoryType.EQUIP).isFull(weaponAmount)) { var weaponStr = ""; for(var i = 0; i < weaponAmount; i++) { @@ -181,7 +181,7 @@ function action(mode, type, selection) { cm.sendOk("Please make sure you have enough space to hold the items!"); } } else if(choice == 4) { - if(!cm.getPlayer().getInventory(MapleInventoryType.USE).isFull(2)) { + if(!cm.getPlayer().getInventory(InventoryType.USE).isFull(2)) { cm.gainItem(buff1ID, buffAmount, true); cm.gainItem(buff2ID, buffAmount, true); cm.gainItem(itemToUse, -1); @@ -192,7 +192,7 @@ function action(mode, type, selection) { } } else if(choice == 5) { if(!cm.haveItem(5030000, 1)) { - if(!cm.getPlayer().getInventory(MapleInventoryType.CASH).isFull(1)){ + if(!cm.getPlayer().getInventory(InventoryType.CASH).isFull(1)){ cm.gainItem(5030000, 1, false, true, 1000 * 60 * 60 * 24 * hiredMerchantLength); if(useVP) diff --git a/scripts/npc/1032102.js b/scripts/npc/1032102.js index d63a19f77e..9a02418ab0 100644 --- a/scripts/npc/1032102.js +++ b/scripts/npc/1032102.js @@ -102,8 +102,8 @@ function action(mode, type, selection) { } else if (status == 2) { if (selection == 0) { const MapleInventoryManipulator = Java.type('client.inventory.manipulator.MapleInventoryManipulator'); - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - MapleInventoryManipulator.removeFromSlot(cm.getClient(), MapleInventoryType.CASH, 1, 1, true); + const InventoryType = Java.type('client.inventory.InventoryType'); + MapleInventoryManipulator.removeFromSlot(cm.getClient(), InventoryType.CASH, 1, 1, true); cm.sendOk("Your cash first slot is removed."); } else if (selection == 1) { if (cm.haveItem(5000029, 2)) { diff --git a/scripts/npc/1063000.js b/scripts/npc/1063000.js index 8fe5582c07..f33c77595b 100644 --- a/scripts/npc/1063000.js +++ b/scripts/npc/1063000.js @@ -34,8 +34,8 @@ function start() { cm.gainItem(4031025,10); } else { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if(cm.getPlayer().getInventory(MapleInventoryType.ETC).getNumFreeSlot() < 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if(cm.getPlayer().getInventory(InventoryType.ETC).getNumFreeSlot() < 1) { cm.sendNext("Check for a available slot on your ETC inventory."); cm.dispose(); return; diff --git a/scripts/npc/1063001.js b/scripts/npc/1063001.js index f5b3d1ca3f..a73df68fe2 100644 --- a/scripts/npc/1063001.js +++ b/scripts/npc/1063001.js @@ -34,8 +34,8 @@ function start() { cm.gainItem(4031026,20); } else { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if(cm.getPlayer().getInventory(MapleInventoryType.ETC).getNumFreeSlot() < 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if(cm.getPlayer().getInventory(InventoryType.ETC).getNumFreeSlot() < 1) { cm.sendNext("Check for a available slot on your ETC inventory."); cm.dispose(); return; diff --git a/scripts/npc/1063002.js b/scripts/npc/1063002.js index 18aaf916ce..858f9e6faa 100644 --- a/scripts/npc/1063002.js +++ b/scripts/npc/1063002.js @@ -34,8 +34,8 @@ function start() { cm.gainItem(4031028,30); } else { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if(cm.getPlayer().getInventory(MapleInventoryType.ETC).getNumFreeSlot() < 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if(cm.getPlayer().getInventory(InventoryType.ETC).getNumFreeSlot() < 1) { cm.sendNext("Check for a available slot on your ETC inventory."); cm.dispose(); return; diff --git a/scripts/npc/1091003.js b/scripts/npc/1091003.js index c3dcd1f73f..6d18bc1430 100644 --- a/scripts/npc/1091003.js +++ b/scripts/npc/1091003.js @@ -155,7 +155,7 @@ function action(mode, type, selection) { } else { var count = 0; - var iter = cm.getChar().getInventory(MapleInventoryType.ETC).listById(mats[i]).iterator(); + var iter = cm.getChar().getInventory(InventoryType.ETC).listById(mats[i]).iterator(); while (iter.hasNext()) { count += iter.next().getQuantity(); } @@ -166,7 +166,7 @@ function action(mode, type, selection) { } else { var count = 0; - var iter = cm.getChar().getInventory(MapleInventoryType.ETC).listById(mats).iterator(); + var iter = cm.getChar().getInventory(InventoryType.ETC).listById(mats).iterator(); while (iter.hasNext()) { count += iter.next().getQuantity(); } diff --git a/scripts/npc/2042000.js b/scripts/npc/2042000.js index 7d0bc50950..72217204bd 100644 --- a/scripts/npc/2042000.js +++ b/scripts/npc/2042000.js @@ -500,8 +500,8 @@ function refineItems(refineType) { var refineFees = [[300,300,300,500,500,500,800,270],[500,500,500,500,500,500,500,1000,3000],[5000,5000,5000,5000,1000000]]; var itemCount = {}; - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - var iter = cm.getPlayer().getInventory(MapleInventoryType.ETC).iterator(); + const InventoryType = Java.type('client.inventory.InventoryType'); + var iter = cm.getPlayer().getInventory(InventoryType.ETC).iterator(); while (iter.hasNext()) { var it = iter.next(); var itemid = it.getItemId(); @@ -554,8 +554,8 @@ function refineRockItems() { var rockItems = [4011007, 4021009]; var rockFees = [10000, 15000]; - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - var iter = cm.getPlayer().getInventory(MapleInventoryType.ETC).iterator(); + const InventoryType = Java.type('client.inventory.InventoryType'); + var iter = cm.getPlayer().getInventory(InventoryType.ETC).iterator(); while (iter.hasNext()) { var it = iter.next(); var itemid = it.getItemId(); diff --git a/scripts/npc/2042001.js b/scripts/npc/2042001.js index c2b850a181..009f62b8fa 100644 --- a/scripts/npc/2042001.js +++ b/scripts/npc/2042001.js @@ -499,8 +499,8 @@ function refineItems(refineType) { var refineFees = [[300,300,300,500,500,500,800,270],[500,500,500,500,500,500,500,1000,3000],[5000,5000,5000,5000,1000000]]; var itemCount = {}; - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - var iter = cm.getPlayer().getInventory(MapleInventoryType.ETC).iterator(); + const InventoryType = Java.type('client.inventory.InventoryType'); + var iter = cm.getPlayer().getInventory(InventoryType.ETC).iterator(); while (iter.hasNext()) { var it = iter.next(); var itemid = it.getItemId(); @@ -553,8 +553,8 @@ function refineRockItems() { var rockItems = [4011007, 4021009]; var rockFees = [10000, 15000]; - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - var iter = cm.getPlayer().getInventory(MapleInventoryType.ETC).iterator(); + const InventoryType = Java.type('client.inventory.InventoryType'); + var iter = cm.getPlayer().getInventory(InventoryType.ETC).iterator(); while (iter.hasNext()) { var it = iter.next(); var itemid = it.getItemId(); diff --git a/scripts/npc/2042002.js b/scripts/npc/2042002.js index 64416da13d..54df3fe8fc 100644 --- a/scripts/npc/2042002.js +++ b/scripts/npc/2042002.js @@ -500,8 +500,8 @@ function refineItems(refineType) { var refineFees = [[300,300,300,500,500,500,800,270],[500,500,500,500,500,500,500,1000,3000],[5000,5000,5000,5000,1000000]]; var itemCount = {}; - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - var iter = cm.getPlayer().getInventory(MapleInventoryType.ETC).iterator(); + const InventoryType = Java.type('client.inventory.InventoryType'); + var iter = cm.getPlayer().getInventory(InventoryType.ETC).iterator(); while (iter.hasNext()) { var it = iter.next(); var itemid = it.getItemId(); @@ -554,8 +554,8 @@ function refineRockItems() { var rockItems = [4011007, 4021009]; var rockFees = [10000, 15000]; - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - var iter = cm.getPlayer().getInventory(MapleInventoryType.ETC).iterator(); + const InventoryType = Java.type('client.inventory.InventoryType'); + var iter = cm.getPlayer().getInventory(InventoryType.ETC).iterator(); while (iter.hasNext()) { var it = iter.next(); var itemid = it.getItemId(); diff --git a/scripts/npc/9000019.js b/scripts/npc/9000019.js index 07f0e8658b..ffc677a148 100644 --- a/scripts/npc/9000019.js +++ b/scripts/npc/9000019.js @@ -19,8 +19,8 @@ function action(mode, type, selection) { status--; if(status == 0) { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if(cm.getPlayer().getInventory(MapleInventoryType.ETC).getNumFreeSlot() < 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if(cm.getPlayer().getInventory(InventoryType.ETC).getNumFreeSlot() < 1) { cm.sendNext("Check for a available slot on your ETC inventory."); cm.dispose(); return; diff --git a/scripts/npc/scroll_generator.js b/scripts/npc/scroll_generator.js index eeeaa5014b..d82de3489f 100644 --- a/scripts/npc/scroll_generator.js +++ b/scripts/npc/scroll_generator.js @@ -421,8 +421,8 @@ function performExchange(sgItemid, sgCount) { } function generateRandomScroll() { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if (cm.getPlayer().getInventory(MapleInventoryType.USE).getNumFreeSlot() >= 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if (cm.getPlayer().getInventory(InventoryType.USE).getNumFreeSlot() >= 1) { var itemid = getRandomScroll(calculateScrollTiers()); if (itemid != -1) { if (performExchange(itemid, 1)) { diff --git a/scripts/npc/waterOfLife.js b/scripts/npc/waterOfLife.js index 42209c9206..fbeb877ec4 100644 --- a/scripts/npc/waterOfLife.js +++ b/scripts/npc/waterOfLife.js @@ -77,8 +77,8 @@ function action(mode, type, selection) { if(sPet != null) { cm.sendNext("Your doll has now reawaken as your pet! However, my magic isn't perfect, so I can't promise an eternal life for your pet... Please take care of that pet before the Water of Life dries. Well then, good bye..."); - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - var it = cm.getPlayer().getInventory(MapleInventoryType.CASH).getItem(sPet.getPosition()); + const InventoryType = Java.type('client.inventory.InventoryType'); + var it = cm.getPlayer().getInventory(InventoryType.CASH).getItem(sPet.getPosition()); it.setExpiration(Date.now() + (1000 * 60 * 60 * 24 * 90)); cm.getPlayer().forceUpdateItem(it); diff --git a/scripts/quest/2001.js b/scripts/quest/2001.js index 1eaf42574a..27a1bf7be9 100644 --- a/scripts/quest/2001.js +++ b/scripts/quest/2001.js @@ -15,8 +15,8 @@ function end(mode, type, selection) { } else if(status == 1) { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if(qm.getPlayer().getInventory(MapleInventoryType.USE).getNumFreeSlot() < 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if(qm.getPlayer().getInventory(InventoryType.USE).getNumFreeSlot() < 1) { qm.getPlayer().dropMessage(1, "USE inventory full."); qm.dispose(); return; diff --git a/scripts/quest/2034.js b/scripts/quest/2034.js index 49d013c6b0..c542182c69 100644 --- a/scripts/quest/2034.js +++ b/scripts/quest/2034.js @@ -14,8 +14,8 @@ function end(mode, type, selection) { } else if(status == 1) { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if(qm.getPlayer().getInventory(MapleInventoryType.EQUIP).getNumFreeSlot() < 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if(qm.getPlayer().getInventory(InventoryType.EQUIP).getNumFreeSlot() < 1) { qm.sendOk("Please free a EQUIP inventory slot to receive the reward."); qm.dispose(); return; diff --git a/scripts/quest/3239.js b/scripts/quest/3239.js index 2ba8548747..6abc08e0d1 100644 --- a/scripts/quest/3239.js +++ b/scripts/quest/3239.js @@ -17,8 +17,8 @@ function end(mode, type, selection) { if (status == 0) { if (qm.haveItem(4031092, 10)) { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if (qm.getPlayer().getInventory(MapleInventoryType.USE).getNumFreeSlot() >= 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if (qm.getPlayer().getInventory(InventoryType.USE).getNumFreeSlot() >= 1) { qm.sendOk("Well done! You brought back all the #t4031092# that were missing. Here, take this scroll as a token of my gratitude..."); } else { qm.sendOk("Free a space on your USE inventory before receiving your prize."); diff --git a/scripts/quest/3414.js b/scripts/quest/3414.js index a39808d21b..36cf470832 100644 --- a/scripts/quest/3414.js +++ b/scripts/quest/3414.js @@ -15,8 +15,8 @@ function end(mode, type, selection) { } else if(status == 1) { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if(qm.getPlayer().getInventory(MapleInventoryType.USE).getNumFreeSlot() < 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if(qm.getPlayer().getInventory(InventoryType.USE).getNumFreeSlot() < 1) { qm.getPlayer().dropMessage(1, "USE inventory full."); qm.dispose(); return; diff --git a/scripts/quest/3437.js b/scripts/quest/3437.js index da1ddd9077..e81efaaaff 100644 --- a/scripts/quest/3437.js +++ b/scripts/quest/3437.js @@ -13,8 +13,8 @@ function end(mode, type, selection) { if(status == 0) { qm.sendNext("What the? Are you telling me you've already taken out 150 #o4230120#s? And these ... yes, these really are 120 #t4000122#s. I was wondering how you were going to complete this mission all by yourself, but you took care of it just fine. Alright, here ... this is a very important item for me, but please take it."); } else if(status == 1) { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if(qm.getPlayer().getInventory(MapleInventoryType.EQUIP).getNumFreeSlot() < 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if(qm.getPlayer().getInventory(InventoryType.EQUIP).getNumFreeSlot() < 1) { qm.sendOk("Please free a EQUIP inventory slot to receive the reward."); qm.dispose(); return; diff --git a/scripts/quest/3452.js b/scripts/quest/3452.js index 709f74d959..1f4f818002 100644 --- a/scripts/quest/3452.js +++ b/scripts/quest/3452.js @@ -10,8 +10,8 @@ function end(mode, type, selection) { qm.sendNext("Take these #bMana Elixir Pills#k as a token of my gratitude."); } else if (status == 1) { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if(qm.getPlayer().getInventory(MapleInventoryType.USE).getNumFreeSlot() >= 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if(qm.getPlayer().getInventory(InventoryType.USE).getNumFreeSlot() >= 1) { qm.gainItem(4000099, -1); qm.gainItem(2000011, 50); qm.gainExp(8000); diff --git a/scripts/quest/3454.js b/scripts/quest/3454.js index b6d0ebb721..967e713af4 100644 --- a/scripts/quest/3454.js +++ b/scripts/quest/3454.js @@ -44,8 +44,8 @@ function end(mode, type, selection) { status--; if (status == 0) { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if(qm.getPlayer().getInventory(MapleInventoryType.ETC).getNumFreeSlot() < 1) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if(qm.getPlayer().getInventory(InventoryType.ETC).getNumFreeSlot() < 1) { qm.sendOk("Make room on your ETC inventory first."); qm.dispose(); return; diff --git a/scripts/quest/3833.js b/scripts/quest/3833.js index 05ac8aa67a..873f9084bd 100644 --- a/scripts/quest/3833.js +++ b/scripts/quest/3833.js @@ -8,8 +8,8 @@ function end(mode, type, selection) { if (status == 0) { qm.sendOk("Great! You managed to get the herb I need. As a #btoken of gratitude#k, take this item to help on your journey."); } else if (status == 1) { - const MapleInventoryType = Java.type('client.inventory.MapleInventoryType'); - if (qm.getPlayer().getInventory(MapleInventoryType.USE).getNumFreeSlot() >= 2) { + const InventoryType = Java.type('client.inventory.InventoryType'); + if (qm.getPlayer().getInventory(InventoryType.USE).getNumFreeSlot() >= 2) { if (qm.haveItem(4000294, 1000)) { qm.gainItem(4000294, -1000); qm.gainItem(2040501, 1); diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/MapleCharacter.java index 7e611338af..b81420ce35 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/MapleCharacter.java @@ -303,17 +303,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject { useCS = false; setStance(0); - inventory = new Inventory[MapleInventoryType.values().length]; + inventory = new Inventory[InventoryType.values().length]; savedLocations = new SavedLocation[SavedLocationType.values().length]; - for (MapleInventoryType type : MapleInventoryType.values()) { + for (InventoryType type : InventoryType.values()) { byte b = 24; - if (type == MapleInventoryType.CASH) { + if (type == InventoryType.CASH) { b = 96; } inventory[type.ordinal()] = new Inventory(this, type, (byte) b); } - inventory[MapleInventoryType.CANHOLD.ordinal()] = new InventoryProof(this); + inventory[InventoryType.CANHOLD.ordinal()] = new InventoryProof(this); for (int i = 0; i < SavedLocationType.values().length; i++) { savedLocations[i] = null; @@ -374,10 +374,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.accountid = c.getAccID(); ret.buddylist = new BuddyList(20); ret.maplemount = null; - ret.getInventory(MapleInventoryType.EQUIP).setSlotLimit(24); - ret.getInventory(MapleInventoryType.USE).setSlotLimit(24); - ret.getInventory(MapleInventoryType.SETUP).setSlotLimit(24); - ret.getInventory(MapleInventoryType.ETC).setSlotLimit(24); + ret.getInventory(InventoryType.EQUIP).setSlotLimit(24); + ret.getInventory(InventoryType.USE).setSlotLimit(24); + ret.getInventory(InventoryType.SETUP).setSlotLimit(24); + ret.getInventory(InventoryType.ETC).setSlotLimit(24); // Select a keybinding method int[] selectedKey; @@ -714,7 +714,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int calculateMaxBaseDamage(int watk) { int maxbasedamage; - Item weapon_item = getInventory(MapleInventoryType.EQUIPPED).getItem((short) -11); + Item weapon_item = getInventory(InventoryType.EQUIPPED).getItem((short) -11); if (weapon_item != null) { maxbasedamage = calculateMaxBaseDamage(watk, ii.getWeaponType(weapon_item.getItemId())); } else { @@ -814,7 +814,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public String getMedalText() { String medal = ""; - final Item medalItem = getInventory(MapleInventoryType.EQUIPPED).getItem((short) -49); + final Item medalItem = getInventory(InventoryType.EQUIPPED).getItem((short) -49); if (medalItem != null) { medal = "<" + ii.getName(medalItem.getItemId()) + "> "; } @@ -905,7 +905,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - for(MapleInventoryType invType : MapleInventoryType.values()) { + for(InventoryType invType : InventoryType.values()) { Inventory inv = this.getInventory(invType); inv.lockInventory(); @@ -1278,7 +1278,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void changeMapBanish(int mapid, String portal, String msg) { if(YamlConfig.config.server.USE_SPIKES_AVOID_BANISH) { - for(Item it: this.getInventory(MapleInventoryType.EQUIPPED).list()) { + for(Item it: this.getInventory(InventoryType.EQUIPPED).list()) { if((it.getFlag() & ItemConstants.SPIKES) == ItemConstants.SPIKES) { return; } @@ -1455,7 +1455,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } - for(Item it: this.getInventory(MapleInventoryType.EQUIPPED).list()) { + for(Item it: this.getInventory(InventoryType.EQUIPPED).list()) { if((it.getFlag() & ItemConstants.COLD) == ItemConstants.COLD && ((returnMapid == 211000000 && thisMapid != 200082300) || returnMapid == 193000000)) { return true; //protection from cold } @@ -2762,7 +2762,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } private void doHurtHp() { - if (!(this.getInventory(MapleInventoryType.EQUIPPED).findById(getMap().getHPDecProtect()) != null || buffMapProtection())) { + if (!(this.getInventory(InventoryType.EQUIPPED).findById(getMap().getHPDecProtect()) != null || buffMapProtection())) { addHP(-getMap().getHPDec()); lastHpDec = Server.getInstance().getCurrentTime(); } @@ -5096,7 +5096,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return initialSpawnPoint; } - public Inventory getInventory(MapleInventoryType type) { + public Inventory getInventory(InventoryType type) { return inventory[type.ordinal()]; } @@ -5106,11 +5106,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public boolean haveItemWithId(int itemid, boolean checkEquipped) { return (inventory[ItemConstants.getInventoryType(itemid).ordinal()].findById(itemid) != null) - || (checkEquipped && inventory[MapleInventoryType.EQUIPPED.ordinal()].findById(itemid) != null); + || (checkEquipped && inventory[InventoryType.EQUIPPED.ordinal()].findById(itemid) != null); } public boolean haveItemEquipped(int itemid) { - return (inventory[MapleInventoryType.EQUIPPED.ordinal()].findById(itemid) != null); + return (inventory[InventoryType.EQUIPPED.ordinal()].findById(itemid) != null); } public boolean haveWeddingRing() { @@ -5128,7 +5128,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int getItemQuantity(int itemid, boolean checkEquipped) { int count = inventory[ItemConstants.getInventoryType(itemid).ordinal()].countById(itemid); if (checkEquipped) { - count += inventory[MapleInventoryType.EQUIPPED.ordinal()].countById(itemid); + count += inventory[InventoryType.EQUIPPED.ordinal()].countById(itemid); } return count; } @@ -5136,7 +5136,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int getCleanItemQuantity(int itemid, boolean checkEquipped) { int count = inventory[ItemConstants.getInventoryType(itemid).ordinal()].countNotOwnedById(itemid); if (checkEquipped) { - count += inventory[MapleInventoryType.EQUIPPED.ordinal()].countNotOwnedById(itemid); + count += inventory[InventoryType.EQUIPPED.ordinal()].countNotOwnedById(itemid); } return count; } @@ -6030,7 +6030,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public boolean hasEmptySlot(byte invType) { - return getInventory(MapleInventoryType.getByType(invType)).getNextFreeSlot() > -1; + return getInventory(InventoryType.getByType(invType)).getNextFreeSlot() > -1; } public void increaseGuildCapacity() { @@ -6648,7 +6648,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private void setCouponRates() { List couponEffects; - Collection cashItems = this.getInventory(MapleInventoryType.CASH).list(); + Collection cashItems = this.getInventory(InventoryType.CASH).list(); chrLock.lock(); try { setActiveCoupons(cashItems); @@ -6667,7 +6667,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void updateCouponRates() { - Inventory cashInv = this.getInventory(MapleInventoryType.CASH); + Inventory cashInv = this.getInventory(InventoryType.CASH); if (cashInv == null) return; effLock.lock(); @@ -6872,7 +6872,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.jobRankMove = rs.getInt("jobRankMove"); if(equipped != null) { // players can have no equipped items at all, ofc - Inventory inv = ret.inventory[MapleInventoryType.EQUIPPED.ordinal()]; + Inventory inv = ret.inventory[InventoryType.EQUIPPED.ordinal()]; for (Item item : equipped) { inv.addItemFromDB(item); } @@ -6915,7 +6915,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.mapid = this.getMapId(); ret.initialSpawnPoint = this.getInitialSpawnpoint(); - ret.inventory[MapleInventoryType.EQUIPPED.ordinal()] = this.getInventory(MapleInventoryType.EQUIPPED); + ret.inventory[InventoryType.EQUIPPED.ordinal()] = this.getInventory(InventoryType.EQUIPPED); ret.setGMLevel(this.gmLevel()); ret.world = this.getWorld(); @@ -7030,13 +7030,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { wserv = Server.getInstance().getWorld(ret.world); - ret.getInventory(MapleInventoryType.EQUIP).setSlotLimit(rs.getByte("equipslots")); - ret.getInventory(MapleInventoryType.USE).setSlotLimit(rs.getByte("useslots")); - ret.getInventory(MapleInventoryType.SETUP).setSlotLimit(rs.getByte("setupslots")); - ret.getInventory(MapleInventoryType.ETC).setSlotLimit(rs.getByte("etcslots")); + ret.getInventory(InventoryType.EQUIP).setSlotLimit(rs.getByte("equipslots")); + ret.getInventory(InventoryType.USE).setSlotLimit(rs.getByte("useslots")); + ret.getInventory(InventoryType.SETUP).setSlotLimit(rs.getByte("setupslots")); + ret.getInventory(InventoryType.ETC).setSlotLimit(rs.getByte("etcslots")); short sandboxCheck = 0x0; - for (Pair item : ItemFactory.INVENTORY.loadItems(ret.id, !channelserver)) { + for (Pair item : ItemFactory.INVENTORY.loadItems(ret.id, !channelserver)) { sandboxCheck |= item.getLeft().getFlag(); ret.getInventory(item.getRight()).addItemFromDB(item.getLeft()); @@ -7049,12 +7049,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { continue; } - MapleInventoryType mit = item.getRight(); - if (mit.equals(MapleInventoryType.EQUIP) || mit.equals(MapleInventoryType.EQUIPPED)) { + InventoryType mit = item.getRight(); + if (mit.equals(InventoryType.EQUIP) || mit.equals(InventoryType.EQUIPPED)) { Equip equip = (Equip) item.getLeft(); if (equip.getRingId() > -1) { MapleRing ring = MapleRing.loadFromDb(equip.getRingId()); - if (item.getRight().equals(MapleInventoryType.EQUIPPED)) { + if (item.getRight().equals(InventoryType.EQUIPPED)) { ring.equip(); } @@ -7416,8 +7416,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } final int mountid = ret.getJobType() * 10000000 + 1004; - if (ret.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -18) != null) { - ret.maplemount = new MapleMount(ret, ret.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -18).getItemId(), mountid); + if (ret.getInventory(InventoryType.EQUIPPED).getItem((short) -18) != null) { + ret.maplemount = new MapleMount(ret, ret.getInventory(InventoryType.EQUIPPED).getItem((short) -18).getItemId(), mountid); } else { ret.maplemount = new MapleMount(ret, 0, mountid); } @@ -7704,7 +7704,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { //equipspeed = 0; //equipjump = 0; - for (Item item : getInventory(MapleInventoryType.EQUIPPED)) { + for (Item item : getInventory(InventoryType.EQUIPPED)) { Equip equip = (Equip) item; equipmaxhp += equip.getHp(); equipmaxmp += equip.getMp(); @@ -7822,7 +7822,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (job.isA(MapleJob.THIEF) || job.isA(MapleJob.BOWMAN) || job.isA(MapleJob.PIRATE) || job.isA(MapleJob.NIGHTWALKER1) || job.isA(MapleJob.WINDARCHER1)) { - Item weapon_item = getInventory(MapleInventoryType.EQUIPPED).getItem((short) -11); + Item weapon_item = getInventory(InventoryType.EQUIPPED).getItem((short) -11); if (weapon_item != null) { MapleWeaponType weapon = ii.getWeaponType(weapon_item.getItemId()); boolean bow = weapon == MapleWeaponType.BOW; @@ -7831,7 +7831,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { boolean gun = weapon == MapleWeaponType.GUN; if (bow || crossbow || claw || gun) { // Also calc stars into this. - Inventory inv = getInventory(MapleInventoryType.USE); + Inventory inv = getInventory(InventoryType.USE); for (short i = 1; i <= inv.getSlotLimit(); i++) { Item item = inv.getItem(i); if (item != null) { @@ -8176,8 +8176,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { this.changeSkillLevel(skill, skEntry.getRight().byteValue(), skill.getMaxLevel(), -1); } - List> itemsWithType = recipe.getStartingItems(); - for (Pair itEntry : itemsWithType) { + List> itemsWithType = recipe.getStartingItems(); + for (Pair itEntry : itemsWithType) { this.getInventory(itEntry.getRight()).addItem(itEntry.getLeft()); } @@ -8556,7 +8556,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { psMacro.executeBatch(); } - List> itemsWithType = new ArrayList<>(); + List> itemsWithType = new ArrayList<>(); for (Inventory iv : inventory) { for (Item item : iv.list()) { itemsWithType.add(new Pair<>(item, iv.getType())); @@ -9112,7 +9112,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { int autohpItemid = autohpPot.getAction(); float autohpAlert = this.getAutopotHpAlert(); if (((float) this.getHp()) / this.getCurrentMaxHp() <= autohpAlert) { // try within user settings... thanks Lame, Optimist, Stealth2800 - Item autohpItem = this.getInventory(MapleInventoryType.USE).findById(autohpItemid); + Item autohpItem = this.getInventory(InventoryType.USE).findById(autohpItemid); if (autohpItem != null) { this.setAutopotHpAlert(0.9f * autohpAlert); PetAutopotProcessor.runAutopotAction(client, autohpItem.getPosition(), autohpItemid); @@ -9127,7 +9127,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { int autompItemid = autompPot.getAction(); float autompAlert = this.getAutopotMpAlert(); if (((float) this.getMp()) / this.getCurrentMaxMp() <= autompAlert) { - Item autompItem = this.getInventory(MapleInventoryType.USE).findById(autompItemid); + Item autompItem = this.getInventory(InventoryType.USE).findById(autompItemid); if (autompItem != null) { this.setAutopotMpAlert(0.9f * autompAlert); // autoMP would stick to using pots at every depletion in some cases... thanks Rohenn PetAutopotProcessor.runAutopotAction(client, autompItem.getPosition(), autompItemid); @@ -9139,7 +9139,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return true; } - public void setInventory(MapleInventoryType type, Inventory inv) { + public void setInventory(InventoryType type, Inventory inv) { inventory[type.ordinal()] = inv; } @@ -9285,7 +9285,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public byte getSlots(int type) { - return type == MapleInventoryType.CASH.getType() ? 96 : inventory[type].getSlotLimit(); + return type == InventoryType.CASH.getType() ? 96 : inventory[type].getSlotLimit(); } public boolean canGainSlots(int type, int slots) { @@ -9327,7 +9327,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int sellAllItemsFromName(byte invTypeId, String name) { //player decides from which inventory items should be sold. - MapleInventoryType type = MapleInventoryType.getByType(invTypeId); + InventoryType type = InventoryType.getByType(invTypeId); Inventory inv = getInventory(type); inv.lockInventory(); @@ -9343,7 +9343,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - public int sellAllItemsFromPosition(MapleItemInformationProvider ii, MapleInventoryType type, short pos) { + public int sellAllItemsFromPosition(MapleItemInformationProvider ii, InventoryType type, short pos) { int mesoGain = 0; Inventory inv = getInventory(type); @@ -9362,7 +9362,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return(mesoGain); } - private int standaloneSell(MapleClient c, MapleItemInformationProvider ii, MapleInventoryType type, short slot, short quantity) { + private int standaloneSell(MapleClient c, MapleItemInformationProvider ii, InventoryType type, short slot, short quantity) { if (quantity == 0xFFFF || quantity == 0) { quantity = 1; } @@ -9419,7 +9419,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private List getUpgradeableEquipped() { List list = new LinkedList<>(); - for (Item item : getInventory(MapleInventoryType.EQUIPPED)) { + for (Item item : getInventory(InventoryType.EQUIPPED)) { if (ii.isUpgradeable(item.getItemId())) { list.add((Equip) item); } @@ -9441,7 +9441,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public boolean mergeAllItemsFromName(String name) { - MapleInventoryType type = MapleInventoryType.EQUIP; + InventoryType type = InventoryType.EQUIP; Inventory inv = getInventory(type); inv.lockInventory(); @@ -9518,18 +9518,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void mergeAllItemsFromPosition(Map statups, short pos) { - Inventory inv = getInventory(MapleInventoryType.EQUIP); + Inventory inv = getInventory(InventoryType.EQUIP); inv.lockInventory(); try { for(short i = pos; i <= inv.getSlotLimit(); i++) { - standaloneMerge(statups, getClient(), MapleInventoryType.EQUIP, i, inv.getItem(i)); + standaloneMerge(statups, getClient(), InventoryType.EQUIP, i, inv.getItem(i)); } } finally { inv.unlockInventory(); } } - private void standaloneMerge(Map statups, MapleClient c, MapleInventoryType type, short slot, Item item) { + private void standaloneMerge(Map statups, MapleClient c, InventoryType type, short slot, Item item) { short quantity; if (item == null || (quantity = item.getQuantity()) < 1 || ii.isCash(item.getItemId()) || !ii.isUpgradeable(item.getItemId()) || hasMergeFlag(item)){ return; @@ -9623,7 +9623,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { nextWarningTime = curTime + (60 * 1000); // show underlevel info again after 1 minute String medal = ""; - Item medalItem = mapOwner.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -49); + Item medalItem = mapOwner.getInventory(InventoryType.EQUIPPED).getItem((short) -49); if (medalItem != null) { medal = "<" + ii.getName(medalItem.getItemId()) + "> "; } @@ -9722,7 +9722,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else { pet.setFullness(newFullness); pet.saveToDb(); - Item petz = getInventory(MapleInventoryType.CASH).getItem(pet.getPosition()); + Item petz = getInventory(InventoryType.CASH).getItem(pet.getPosition()); if (petz != null) { forceUpdateItem(petz); } @@ -10365,7 +10365,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } private Collection getUpgradeableEquipList() { - Collection fullList = getInventory(MapleInventoryType.EQUIPPED).list(); + Collection fullList = getInventory(InventoryType.EQUIPPED).list(); if (YamlConfig.config.server.USE_EQUIPMNT_LVLUP_CASH) { return fullList; } @@ -10401,7 +10401,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void showAllEquipFeatures() { String showMsg = ""; - for (Item item : getInventory(MapleInventoryType.EQUIPPED).list()) { + for (Item item : getInventory(InventoryType.EQUIPPED).list()) { Equip nEquip = (Equip) item; String itemName = ii.getName(nEquip.getItemId()); if (itemName == null) { diff --git a/src/main/java/client/MapleClient.java b/src/main/java/client/MapleClient.java index 6c2842fbd2..a6846a955e 100644 --- a/src/main/java/client/MapleClient.java +++ b/src/main/java/client/MapleClient.java @@ -21,7 +21,7 @@ along with this program. If not, see . */ package client; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; import config.YamlConfig; import constants.game.GameConstants; import io.netty.channel.ChannelHandlerContext; @@ -1491,7 +1491,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { //Cancelling magicdoor? Nope //Cancelling mounts? Noty - player.getInventory(MapleInventoryType.EQUIPPED).checked(false); //test + player.getInventory(InventoryType.EQUIPPED).checked(false); //test player.getMap().removePlayer(player); player.clearBanishPlayerData(); player.getClient().getChannelServer().removePlayer(player); diff --git a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java b/src/main/java/client/command/commands/gm2/ClearSlotCommand.java index a8e1e87ed7..aa3644c0b5 100644 --- a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java +++ b/src/main/java/client/command/commands/gm2/ClearSlotCommand.java @@ -26,8 +26,8 @@ package client.command.commands.gm2; import client.MapleCharacter; import client.MapleClient; import client.command.Command; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; public class ClearSlotCommand extends Command { @@ -46,79 +46,79 @@ public class ClearSlotCommand extends Command { switch (type) { case "all": for (int i = 0; i < 101; i++) { - Item tempItem = c.getPlayer().getInventory(MapleInventoryType.EQUIP).getItem((byte) i); + Item tempItem = c.getPlayer().getInventory(InventoryType.EQUIP).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false); } for (int i = 0; i < 101; i++) { - Item tempItem = c.getPlayer().getInventory(MapleInventoryType.USE).getItem((byte) i); + Item tempItem = c.getPlayer().getInventory(InventoryType.USE).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, (byte) i, tempItem.getQuantity(), false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, (byte) i, tempItem.getQuantity(), false, false); } for (int i = 0; i < 101; i++) { - Item tempItem = c.getPlayer().getInventory(MapleInventoryType.ETC).getItem((byte) i); + Item tempItem = c.getPlayer().getInventory(InventoryType.ETC).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false); } for (int i = 0; i < 101; i++) { - Item tempItem = c.getPlayer().getInventory(MapleInventoryType.SETUP).getItem((byte) i); + Item tempItem = c.getPlayer().getInventory(InventoryType.SETUP).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false); } for (int i = 0; i < 101; i++) { - Item tempItem = c.getPlayer().getInventory(MapleInventoryType.CASH).getItem((byte) i); + Item tempItem = c.getPlayer().getInventory(InventoryType.CASH).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("All Slots Cleared."); break; case "equip": for (int i = 0; i < 101; i++) { - Item tempItem = c.getPlayer().getInventory(MapleInventoryType.EQUIP).getItem((byte) i); + Item tempItem = c.getPlayer().getInventory(InventoryType.EQUIP).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Equipment Slot Cleared."); break; case "use": for (int i = 0; i < 101; i++) { - Item tempItem = c.getPlayer().getInventory(MapleInventoryType.USE).getItem((byte) i); + Item tempItem = c.getPlayer().getInventory(InventoryType.USE).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, (byte) i, tempItem.getQuantity(), false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Use Slot Cleared."); break; case "setup": for (int i = 0; i < 101; i++) { - Item tempItem = c.getPlayer().getInventory(MapleInventoryType.SETUP).getItem((byte) i); + Item tempItem = c.getPlayer().getInventory(InventoryType.SETUP).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Set-Up Slot Cleared."); break; case "etc": for (int i = 0; i < 101; i++) { - Item tempItem = c.getPlayer().getInventory(MapleInventoryType.ETC).getItem((byte) i); + Item tempItem = c.getPlayer().getInventory(InventoryType.ETC).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("ETC Slot Cleared."); break; case "cash": for (int i = 0; i < 101; i++) { - Item tempItem = c.getPlayer().getInventory(MapleInventoryType.CASH).getItem((byte) i); + Item tempItem = c.getPlayer().getInventory(InventoryType.CASH).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Cash Slot Cleared."); break; diff --git a/src/main/java/client/command/commands/gm2/ItemDropCommand.java b/src/main/java/client/command/commands/gm2/ItemDropCommand.java index 2b58ecd421..9943a231f5 100644 --- a/src/main/java/client/command/commands/gm2/ItemDropCommand.java +++ b/src/main/java/client/command/commands/gm2/ItemDropCommand.java @@ -26,8 +26,8 @@ package client.command.commands.gm2; import client.MapleCharacter; import client.MapleClient; import client.command.Command; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.MaplePet; import config.YamlConfig; import constants.inventory.ItemConstants; @@ -94,7 +94,7 @@ public class ItemDropCommand extends Command { } Item toDrop; - if (ItemConstants.getInventoryType(itemId) == MapleInventoryType.EQUIP) { + if (ItemConstants.getInventoryType(itemId) == InventoryType.EQUIP) { toDrop = ii.getEquipById(itemId); } else { toDrop = new Item(itemId, (short) 0, quantity); diff --git a/src/main/java/client/command/commands/gm2/RechargeCommand.java b/src/main/java/client/command/commands/gm2/RechargeCommand.java index 017494b79b..4df653a8c1 100644 --- a/src/main/java/client/command/commands/gm2/RechargeCommand.java +++ b/src/main/java/client/command/commands/gm2/RechargeCommand.java @@ -26,8 +26,8 @@ package client.command.commands.gm2; import client.MapleCharacter; import client.MapleClient; import client.command.Command; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import constants.inventory.ItemConstants; import server.MapleItemInformationProvider; @@ -40,7 +40,7 @@ public class RechargeCommand extends Command { public void execute(MapleClient c, String[] params) { MapleCharacter player = c.getPlayer(); MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - for (Item torecharge : c.getPlayer().getInventory(MapleInventoryType.USE).list()) { + for (Item torecharge : c.getPlayer().getInventory(InventoryType.USE).list()) { if (ItemConstants.isThrowingStar(torecharge.getItemId())){ torecharge.setQuantity(ii.getSlotMax(c, torecharge.getItemId())); c.getPlayer().forceUpdateItem(torecharge); diff --git a/src/main/java/client/command/commands/gm4/ProItemCommand.java b/src/main/java/client/command/commands/gm4/ProItemCommand.java index 96a0d5466d..49e1d4a872 100644 --- a/src/main/java/client/command/commands/gm4/ProItemCommand.java +++ b/src/main/java/client/command/commands/gm4/ProItemCommand.java @@ -27,8 +27,8 @@ import client.MapleCharacter; import client.MapleClient; import client.command.Command; import client.inventory.Equip; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; import server.MapleItemInformationProvider; @@ -57,8 +57,8 @@ public class ProItemCommand extends Command { short stat = (short) Math.max(0, Short.parseShort(params[1])); short spdjmp = params.length >= 3 ? (short) Math.max(0, Short.parseShort(params[2])) : 0; - MapleInventoryType type = ItemConstants.getInventoryType(itemid); - if (type.equals(MapleInventoryType.EQUIP)) { + InventoryType type = ItemConstants.getInventoryType(itemid); + if (type.equals(InventoryType.EQUIP)) { Item it = ii.getEquipById(itemid); it.setOwner(player.getName()); diff --git a/src/main/java/client/command/commands/gm4/SetEqStatCommand.java b/src/main/java/client/command/commands/gm4/SetEqStatCommand.java index c9fc51298d..7b4ba19bc8 100644 --- a/src/main/java/client/command/commands/gm4/SetEqStatCommand.java +++ b/src/main/java/client/command/commands/gm4/SetEqStatCommand.java @@ -28,7 +28,7 @@ import client.MapleClient; import client.command.Command; import client.inventory.Equip; import client.inventory.Inventory; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; import constants.inventory.ItemConstants; public class SetEqStatCommand extends Command { @@ -46,7 +46,7 @@ public class SetEqStatCommand extends Command { short newStat = (short) Math.max(0, Integer.parseInt(params[0])); short newSpdJmp = params.length >= 2 ? (short) Integer.parseInt(params[1]) : 0; - Inventory equip = player.getInventory(MapleInventoryType.EQUIP); + Inventory equip = player.getInventory(InventoryType.EQUIP); for (byte i = 1; i <= equip.getSlotLimit(); i++) { try { diff --git a/src/main/java/client/creator/CharacterFactory.java b/src/main/java/client/creator/CharacterFactory.java index a2ed797925..0485823f67 100644 --- a/src/main/java/client/creator/CharacterFactory.java +++ b/src/main/java/client/creator/CharacterFactory.java @@ -23,8 +23,8 @@ import client.MapleCharacter; import client.MapleClient; import client.MapleSkinColor; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import config.YamlConfig; import net.server.Server; import server.MapleItemInformationProvider; @@ -58,7 +58,7 @@ public abstract class CharacterFactory { newchar.setJob(recipe.getJob()); newchar.setMapId(recipe.getMap()); - Inventory equipped = newchar.getInventory(MapleInventoryType.EQUIPPED); + Inventory equipped = newchar.getInventory(InventoryType.EQUIPPED); MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); int top = recipe.getTop(), bottom = recipe.getBottom(), shoes = recipe.getShoes(), weapon = recipe.getWeapon(); diff --git a/src/main/java/client/creator/CharacterFactoryRecipe.java b/src/main/java/client/creator/CharacterFactoryRecipe.java index 7ce5ac9b61..ce2cb689bd 100644 --- a/src/main/java/client/creator/CharacterFactoryRecipe.java +++ b/src/main/java/client/creator/CharacterFactoryRecipe.java @@ -21,15 +21,16 @@ package client.creator; import client.MapleJob; import client.Skill; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import config.YamlConfig; -import java.util.concurrent.atomic.AtomicInteger; +import tools.Pair; + import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import tools.Pair; +import java.util.concurrent.atomic.AtomicInteger; /** * @@ -44,8 +45,8 @@ public class CharacterFactoryRecipe { private int meso = 0; private List> skills = new LinkedList<>(); - private List> itemsWithType = new LinkedList<>(); - private Map runningTypePosition = new LinkedHashMap<>(); + private List> itemsWithType = new LinkedList<>(); + private Map runningTypePosition = new LinkedHashMap<>(); public CharacterFactoryRecipe(MapleJob job, int level, int map, int top, int bottom, int shoes, int weapon) { this.job = job; @@ -107,10 +108,10 @@ public class CharacterFactoryRecipe { } public void addStartingEquipment(Item eqpItem) { - itemsWithType.add(new Pair<>(eqpItem, MapleInventoryType.EQUIP)); + itemsWithType.add(new Pair<>(eqpItem, InventoryType.EQUIP)); } - public void addStartingItem(int itemid, int quantity, MapleInventoryType itemType) { + public void addStartingItem(int itemid, int quantity, InventoryType itemType) { AtomicInteger p = runningTypePosition.get(itemType); if(p == null) { p = new AtomicInteger(0); @@ -188,7 +189,7 @@ public class CharacterFactoryRecipe { return skills; } - public List> getStartingItems() { + public List> getStartingItems() { return itemsWithType; } } diff --git a/src/main/java/client/creator/novice/BeginnerCreator.java b/src/main/java/client/creator/novice/BeginnerCreator.java index a6aeedd974..be19294a1f 100644 --- a/src/main/java/client/creator/novice/BeginnerCreator.java +++ b/src/main/java/client/creator/novice/BeginnerCreator.java @@ -23,7 +23,7 @@ import client.MapleClient; import client.MapleJob; import client.creator.CharacterFactory; import client.creator.CharacterFactoryRecipe; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; /** * @@ -33,11 +33,11 @@ public class BeginnerCreator extends CharacterFactory { private static CharacterFactoryRecipe createRecipe(MapleJob job, int level, int map, int top, int bottom, int shoes, int weapon) { CharacterFactoryRecipe recipe = new CharacterFactoryRecipe(job, level, map, top, bottom, shoes, weapon); - giveItem(recipe, 4161001, 1, MapleInventoryType.ETC); + giveItem(recipe, 4161001, 1, InventoryType.ETC); return recipe; } - private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, MapleInventoryType itemType) { + private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, InventoryType itemType) { recipe.addStartingItem(itemid, quantity, itemType); } diff --git a/src/main/java/client/creator/novice/LegendCreator.java b/src/main/java/client/creator/novice/LegendCreator.java index 28ee321cab..94033fae89 100644 --- a/src/main/java/client/creator/novice/LegendCreator.java +++ b/src/main/java/client/creator/novice/LegendCreator.java @@ -23,7 +23,7 @@ import client.MapleClient; import client.MapleJob; import client.creator.CharacterFactory; import client.creator.CharacterFactoryRecipe; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; /** * @@ -33,11 +33,11 @@ public class LegendCreator extends CharacterFactory { private static CharacterFactoryRecipe createRecipe(MapleJob job, int level, int map, int top, int bottom, int shoes, int weapon) { CharacterFactoryRecipe recipe = new CharacterFactoryRecipe(job, level, map, top, bottom, shoes, weapon); - giveItem(recipe, 4161048, 1, MapleInventoryType.ETC); + giveItem(recipe, 4161048, 1, InventoryType.ETC); return recipe; } - private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, MapleInventoryType itemType) { + private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, InventoryType itemType) { recipe.addStartingItem(itemid, quantity, itemType); } diff --git a/src/main/java/client/creator/novice/NoblesseCreator.java b/src/main/java/client/creator/novice/NoblesseCreator.java index d353d2051a..0be91a5fe2 100644 --- a/src/main/java/client/creator/novice/NoblesseCreator.java +++ b/src/main/java/client/creator/novice/NoblesseCreator.java @@ -23,7 +23,7 @@ import client.MapleClient; import client.MapleJob; import client.creator.CharacterFactory; import client.creator.CharacterFactoryRecipe; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; /** * @@ -33,11 +33,11 @@ public class NoblesseCreator extends CharacterFactory { private static CharacterFactoryRecipe createRecipe(MapleJob job, int level, int map, int top, int bottom, int shoes, int weapon) { CharacterFactoryRecipe recipe = new CharacterFactoryRecipe(job, level, map, top, bottom, shoes, weapon); - giveItem(recipe, 4161047, 1, MapleInventoryType.ETC); + giveItem(recipe, 4161047, 1, InventoryType.ETC); return recipe; } - private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, MapleInventoryType itemType) { + private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, InventoryType itemType) { recipe.addStartingItem(itemid, quantity, itemType); } diff --git a/src/main/java/client/creator/veteran/BowmanCreator.java b/src/main/java/client/creator/veteran/BowmanCreator.java index f7a20eb3a8..f3b004c25e 100644 --- a/src/main/java/client/creator/veteran/BowmanCreator.java +++ b/src/main/java/client/creator/veteran/BowmanCreator.java @@ -23,8 +23,8 @@ import client.MapleClient; import client.MapleJob; import client.creator.CharacterFactory; import client.creator.CharacterFactoryRecipe; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import server.MapleItemInformationProvider; /** @@ -53,9 +53,9 @@ public class BowmanCreator extends CharacterFactory { giveEquipment(recipe, ii, weapons[i]); } - giveItem(recipe, 2000002, 100, MapleInventoryType.USE); - giveItem(recipe, 2000003, 100, MapleInventoryType.USE); - giveItem(recipe, 3010000, 1, MapleInventoryType.SETUP); + giveItem(recipe, 2000002, 100, InventoryType.USE); + giveItem(recipe, 2000003, 100, InventoryType.USE); + giveItem(recipe, 3010000, 1, InventoryType.SETUP); return recipe; } @@ -65,7 +65,7 @@ public class BowmanCreator extends CharacterFactory { recipe.addStartingEquipment(nEquip); } - private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, MapleInventoryType itemType) { + private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, InventoryType itemType) { recipe.addStartingItem(itemid, quantity, itemType); } diff --git a/src/main/java/client/creator/veteran/MagicianCreator.java b/src/main/java/client/creator/veteran/MagicianCreator.java index d1f2b033b3..83e5f50d89 100644 --- a/src/main/java/client/creator/veteran/MagicianCreator.java +++ b/src/main/java/client/creator/veteran/MagicianCreator.java @@ -25,8 +25,8 @@ import client.Skill; import client.SkillFactory; import client.creator.CharacterFactory; import client.creator.CharacterFactoryRecipe; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import constants.skills.Magician; import server.MapleItemInformationProvider; @@ -61,9 +61,9 @@ public class MagicianCreator extends CharacterFactory { giveEquipment(recipe, ii, weapons[i]); } - giveItem(recipe, 2000001, 100, MapleInventoryType.USE); - giveItem(recipe, 2000006, 100, MapleInventoryType.USE); - giveItem(recipe, 3010000, 1, MapleInventoryType.SETUP); + giveItem(recipe, 2000001, 100, InventoryType.USE); + giveItem(recipe, 2000006, 100, InventoryType.USE); + giveItem(recipe, 3010000, 1, InventoryType.SETUP); if(improveSp > 0) { improveSp += 5; @@ -88,7 +88,7 @@ public class MagicianCreator extends CharacterFactory { recipe.addStartingEquipment(nEquip); } - private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, MapleInventoryType itemType) { + private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, InventoryType itemType) { recipe.addStartingItem(itemid, quantity, itemType); } diff --git a/src/main/java/client/creator/veteran/PirateCreator.java b/src/main/java/client/creator/veteran/PirateCreator.java index 3c35ba2f52..cb1e98f45a 100644 --- a/src/main/java/client/creator/veteran/PirateCreator.java +++ b/src/main/java/client/creator/veteran/PirateCreator.java @@ -23,8 +23,8 @@ import client.MapleClient; import client.MapleJob; import client.creator.CharacterFactory; import client.creator.CharacterFactoryRecipe; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import server.MapleItemInformationProvider; /** @@ -55,11 +55,11 @@ public class PirateCreator extends CharacterFactory { giveEquipment(recipe, ii, weapons[i]); } - giveItem(recipe, 2330000, 800, MapleInventoryType.USE); + giveItem(recipe, 2330000, 800, InventoryType.USE); - giveItem(recipe, 2000002, 100, MapleInventoryType.USE); - giveItem(recipe, 2000003, 100, MapleInventoryType.USE); - giveItem(recipe, 3010000, 1, MapleInventoryType.SETUP); + giveItem(recipe, 2000002, 100, InventoryType.USE); + giveItem(recipe, 2000003, 100, InventoryType.USE); + giveItem(recipe, 3010000, 1, InventoryType.SETUP); return recipe; } @@ -69,7 +69,7 @@ public class PirateCreator extends CharacterFactory { recipe.addStartingEquipment(nEquip); } - private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, MapleInventoryType itemType) { + private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, InventoryType itemType) { recipe.addStartingItem(itemid, quantity, itemType); } diff --git a/src/main/java/client/creator/veteran/ThiefCreator.java b/src/main/java/client/creator/veteran/ThiefCreator.java index a711dce5cb..fff71a1a1f 100644 --- a/src/main/java/client/creator/veteran/ThiefCreator.java +++ b/src/main/java/client/creator/veteran/ThiefCreator.java @@ -23,8 +23,8 @@ import client.MapleClient; import client.MapleJob; import client.creator.CharacterFactory; import client.creator.CharacterFactoryRecipe; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import server.MapleItemInformationProvider; /** @@ -53,11 +53,11 @@ public class ThiefCreator extends CharacterFactory { giveEquipment(recipe, ii, weapons[i]); } - giveItem(recipe, 2070000, 500, MapleInventoryType.USE); + giveItem(recipe, 2070000, 500, InventoryType.USE); - giveItem(recipe, 2000002, 100, MapleInventoryType.USE); - giveItem(recipe, 2000003, 100, MapleInventoryType.USE); - giveItem(recipe, 3010000, 1, MapleInventoryType.SETUP); + giveItem(recipe, 2000002, 100, InventoryType.USE); + giveItem(recipe, 2000003, 100, InventoryType.USE); + giveItem(recipe, 3010000, 1, InventoryType.SETUP); return recipe; } @@ -67,7 +67,7 @@ public class ThiefCreator extends CharacterFactory { recipe.addStartingEquipment(nEquip); } - private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, MapleInventoryType itemType) { + private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, InventoryType itemType) { recipe.addStartingItem(itemid, quantity, itemType); } diff --git a/src/main/java/client/creator/veteran/WarriorCreator.java b/src/main/java/client/creator/veteran/WarriorCreator.java index 7b974fab1f..aa6c89670d 100644 --- a/src/main/java/client/creator/veteran/WarriorCreator.java +++ b/src/main/java/client/creator/veteran/WarriorCreator.java @@ -25,8 +25,8 @@ import client.Skill; import client.SkillFactory; import client.creator.CharacterFactory; import client.creator.CharacterFactoryRecipe; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import constants.skills.Warrior; import server.MapleItemInformationProvider; @@ -76,9 +76,9 @@ public class WarriorCreator extends CharacterFactory { } } - giveItem(recipe, 2000002, 100, MapleInventoryType.USE); - giveItem(recipe, 2000003, 100, MapleInventoryType.USE); - giveItem(recipe, 3010000, 1, MapleInventoryType.SETUP); + giveItem(recipe, 2000002, 100, InventoryType.USE); + giveItem(recipe, 2000003, 100, InventoryType.USE); + giveItem(recipe, 3010000, 1, InventoryType.SETUP); return recipe; } @@ -88,7 +88,7 @@ public class WarriorCreator extends CharacterFactory { recipe.addStartingEquipment(nEquip); } - private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, MapleInventoryType itemType) { + private static void giveItem(CharacterFactoryRecipe recipe, int itemid, int quantity, InventoryType itemType) { recipe.addStartingItem(itemid, quantity, itemType); } diff --git a/src/main/java/client/inventory/Inventory.java b/src/main/java/client/inventory/Inventory.java index d1f23d9903..6371953553 100644 --- a/src/main/java/client/inventory/Inventory.java +++ b/src/main/java/client/inventory/Inventory.java @@ -41,14 +41,14 @@ import java.util.concurrent.locks.Lock; */ public class Inventory implements Iterable { protected final Map inventory; - protected final MapleInventoryType type; + protected final InventoryType type; protected final Lock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.INVENTORY, true); protected MapleCharacter owner; protected byte slotLimit; protected boolean checked = false; - public Inventory(MapleCharacter mc, MapleInventoryType type, byte slotLimit) { + public Inventory(MapleCharacter mc, InventoryType type, byte slotLimit) { this.owner = mc; this.inventory = new LinkedHashMap<>(); this.type = type; @@ -56,11 +56,11 @@ public class Inventory implements Iterable { } public boolean isExtendableInventory() { // not sure about cash, basing this on the previous one. - return !(type.equals(MapleInventoryType.UNDEFINED) || type.equals(MapleInventoryType.EQUIPPED) || type.equals(MapleInventoryType.CASH)); + return !(type.equals(InventoryType.UNDEFINED) || type.equals(InventoryType.EQUIPPED) || type.equals(InventoryType.CASH)); } public boolean isEquipInventory() { - return type.equals(MapleInventoryType.EQUIP) || type.equals(MapleInventoryType.EQUIPPED); + return type.equals(InventoryType.EQUIP) || type.equals(InventoryType.EQUIPPED); } public byte getSlotLimit() { @@ -223,7 +223,7 @@ public class Inventory implements Iterable { } public void addItemFromDB(Item item) { - if (item.getPosition() < 0 && !type.equals(MapleInventoryType.EQUIPPED)) { + if (item.getPosition() < 0 && !type.equals(InventoryType.EQUIPPED)) { return; } addSlotFromDB(item.getPosition(), item); @@ -246,7 +246,7 @@ public class Inventory implements Iterable { inventory.put(dSlot, source); inventory.remove(sSlot); } else if (target.getItemId() == source.getItemId() && !ItemConstants.isRechargeable(source.getItemId()) && isSameOwner(source, target)) { - if (type.getType() == MapleInventoryType.EQUIP.getType() || type.getType() == MapleInventoryType.CASH.getType()) { + if (type.getType() == InventoryType.EQUIP.getType() || type.getType() == InventoryType.CASH.getType()) { swap(target, source); } else if (source.getQuantity() + target.getQuantity() > slotMax) { short rest = (short) ((source.getQuantity() + target.getQuantity()) - slotMax); @@ -420,11 +420,11 @@ public class Inventory implements Iterable { } } - private static boolean checkItemRestricted(List> items) { + private static boolean checkItemRestricted(List> items) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); // thanks Shavit for noticing set creation that would be only effective in rare situations - for (Pair p : items) { + for (Pair p : items) { int itemid = p.getLeft().getItemId(); if (ii.isPickupRestricted(itemid) && p.getLeft().getQuantity() > 1) { return false; @@ -439,7 +439,7 @@ public class Inventory implements Iterable { } public static boolean checkSpot(MapleCharacter chr, List items) { - List> listItems = new LinkedList<>(); + List> listItems = new LinkedList<>(); for (Item item : items) { listItems.add(new Pair<>(item, item.getInventoryType())); } @@ -447,12 +447,12 @@ public class Inventory implements Iterable { return checkSpotsAndOwnership(chr, listItems); } - public static boolean checkSpots(MapleCharacter chr, List> items) { + public static boolean checkSpots(MapleCharacter chr, List> items) { return checkSpots(chr, items, false); } - public static boolean checkSpots(MapleCharacter chr, List> items, boolean useProofInv) { - int invTypesSize = MapleInventoryType.values().length; + public static boolean checkSpots(MapleCharacter chr, List> items, boolean useProofInv) { + int invTypesSize = InventoryType.values().length; List zeroedList = new ArrayList<>(invTypesSize); for (byte i = 0; i < invTypesSize; i++) { zeroedList.add(0); @@ -461,7 +461,7 @@ public class Inventory implements Iterable { return checkSpots(chr, items, zeroedList, useProofInv); } - public static boolean checkSpots(MapleCharacter chr, List> items, List typesSlotsUsed, boolean useProofInv) { + public static boolean checkSpots(MapleCharacter chr, List> items, List typesSlotsUsed, boolean useProofInv) { // assumption: no "UNDEFINED" or "EQUIPPED" items shall be tested here, all counts are >= 0. if (!checkItemRestricted(items)) { @@ -471,7 +471,7 @@ public class Inventory implements Iterable { Map> rcvItems = new LinkedHashMap<>(); Map rcvTypes = new LinkedHashMap<>(); - for (Pair item : items) { + for (Pair item : items) { Integer itemId = item.left.getItemId(); List qty = rcvItems.get(itemId); @@ -528,11 +528,11 @@ public class Inventory implements Iterable { return (itemId.longValue() << 32L) + fnvHash32(owner); } - public static boolean checkSpotsAndOwnership(MapleCharacter chr, List> items) { + public static boolean checkSpotsAndOwnership(MapleCharacter chr, List> items) { return checkSpotsAndOwnership(chr, items, false); } - public static boolean checkSpotsAndOwnership(MapleCharacter chr, List> items, boolean useProofInv) { + public static boolean checkSpotsAndOwnership(MapleCharacter chr, List> items, boolean useProofInv) { List zeroedList = new ArrayList<>(5); for (byte i = 0; i < 5; i++) { zeroedList.add(0); @@ -541,7 +541,7 @@ public class Inventory implements Iterable { return checkSpotsAndOwnership(chr, items, zeroedList, useProofInv); } - public static boolean checkSpotsAndOwnership(MapleCharacter chr, List> items, List typesSlotsUsed, boolean useProofInv) { + public static boolean checkSpotsAndOwnership(MapleCharacter chr, List> items, List typesSlotsUsed, boolean useProofInv) { //assumption: no "UNDEFINED" or "EQUIPPED" items shall be tested here, all counts are >= 0 and item list to be checked is a legal one. if (!checkItemRestricted(items)) { @@ -552,7 +552,7 @@ public class Inventory implements Iterable { Map rcvTypes = new LinkedHashMap<>(); Map rcvOwners = new LinkedHashMap<>(); - for (Pair item : items) { + for (Pair item : items) { Long itemHash = hashKey(item.left.getItemId(), item.left.getOwner()); List qty = rcvItems.get(itemHash); @@ -597,7 +597,7 @@ public class Inventory implements Iterable { return true; } - public MapleInventoryType getType() { + public InventoryType getType() { return type; } @@ -610,7 +610,7 @@ public class Inventory implements Iterable { boolean isRing = false; Equip equip = null; for (Item item : list()) { - if (item.getInventoryType().equals(MapleInventoryType.EQUIP)) { + if (item.getInventoryType().equals(InventoryType.EQUIP)) { equip = (Equip) item; isRing = equip.getRingId() > -1; } diff --git a/src/main/java/client/inventory/InventoryProof.java b/src/main/java/client/inventory/InventoryProof.java index 1482728d24..0e5232fde8 100644 --- a/src/main/java/client/inventory/InventoryProof.java +++ b/src/main/java/client/inventory/InventoryProof.java @@ -27,7 +27,7 @@ import client.MapleCharacter; public class InventoryProof extends Inventory { public InventoryProof(MapleCharacter mc) { - super(mc, MapleInventoryType.CANHOLD, (byte) 0); + super(mc, InventoryType.CANHOLD, (byte) 0); } public void cloneContents(Inventory inv) { diff --git a/src/main/java/client/inventory/MapleInventoryType.java b/src/main/java/client/inventory/InventoryType.java similarity index 71% rename from src/main/java/client/inventory/MapleInventoryType.java rename to src/main/java/client/inventory/InventoryType.java index 778262f463..33318ca142 100644 --- a/src/main/java/client/inventory/MapleInventoryType.java +++ b/src/main/java/client/inventory/InventoryType.java @@ -24,7 +24,7 @@ package client.inventory; /** * @author Matze */ -public enum MapleInventoryType { +public enum InventoryType { UNDEFINED(0), EQUIP(1), USE(2), @@ -33,9 +33,10 @@ public enum MapleInventoryType { CASH(5), CANHOLD(6), //Proof-guard for inserting after removal checks EQUIPPED(-1); //Seems nexon screwed something when removing an item T_T + final byte type; - private MapleInventoryType(int type) { + InventoryType(int type) { this.type = (byte) type; } @@ -47,8 +48,8 @@ public enum MapleInventoryType { return (short) (2 << type); } - public static MapleInventoryType getByType(byte type) { - for (MapleInventoryType l : MapleInventoryType.values()) { + public static InventoryType getByType(byte type) { + for (InventoryType l : InventoryType.values()) { if (l.getType() == type) { return l; } @@ -56,18 +57,14 @@ public enum MapleInventoryType { return null; } - public static MapleInventoryType getByWZName(String name) { - if (name.equals("Install")) { - return SETUP; - } else if (name.equals("Consume")) { - return USE; - } else if (name.equals("Etc")) { - return ETC; - } else if (name.equals("Cash")) { - return CASH; - } else if (name.equals("Pet")) { - return CASH; - } - return UNDEFINED; + public static InventoryType getByWZName(String name) { + return switch (name) { + case "Install" -> SETUP; + case "Consume" -> USE; + case "Etc" -> ETC; + case "Cash" -> CASH; + case "Pet" -> CASH; + default -> UNDEFINED; + }; } } diff --git a/src/main/java/client/inventory/Item.java b/src/main/java/client/inventory/Item.java index 5da563f29d..f8dcb7415a 100644 --- a/src/main/java/client/inventory/Item.java +++ b/src/main/java/client/inventory/Item.java @@ -21,13 +21,14 @@ along with this program. If not, see . */ package client.inventory; +import client.inventory.manipulator.MapleKarmaManipulator; import constants.inventory.ItemConstants; +import server.MapleItemInformationProvider; + import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import client.inventory.manipulator.MapleKarmaManipulator; -import server.MapleItemInformationProvider; public class Item implements Comparable { @@ -104,7 +105,7 @@ public class Item implements Comparable { return quantity; } - public MapleInventoryType getInventoryType() { + public InventoryType getInventoryType() { return ItemConstants.getInventoryType(id); } diff --git a/src/main/java/client/inventory/ItemFactory.java b/src/main/java/client/inventory/ItemFactory.java index e6ce4b20c9..9103bd5385 100644 --- a/src/main/java/client/inventory/ItemFactory.java +++ b/src/main/java/client/inventory/ItemFactory.java @@ -66,16 +66,16 @@ public enum ItemFactory { return value; } - public List> loadItems(int id, boolean login) throws SQLException { + public List> loadItems(int id, boolean login) throws SQLException { if(value != 6) return loadItemsCommon(id, login); else return loadItemsMerchant(id, login); } - public void saveItems(List> items, int id, Connection con) throws SQLException { + public void saveItems(List> items, int id, Connection con) throws SQLException { saveItems(items, null, id, con); } - public void saveItems(List> items, List bundlesList, int id, Connection con) throws SQLException { + public void saveItems(List> items, List bundlesList, int id, Connection con) throws SQLException { // thanks Arufonsu, MedicOP, BHB for pointing a "synchronized" bottleneck here if(value != 6) saveItemsCommon(items, id, con); @@ -126,7 +126,7 @@ public enum ItemFactory { query.append("WHERE accountterm.`"); query.append(isAccount ? "accountid" : "characterid"); query.append("` = ?"); - query.append(login ? " AND `inventorytype` = " + MapleInventoryType.EQUIPPED.getType() : ""); + query.append(login ? " AND `inventorytype` = " + InventoryType.EQUIPPED.getType() : ""); try (Connection con = DatabaseConnection.getConnection()) { try (PreparedStatement ps = con.prepareStatement(query.toString())) { @@ -144,8 +144,8 @@ public enum ItemFactory { return items; } - private List> loadItemsCommon(int id, boolean login) throws SQLException { - List> items = new ArrayList<>(); + private List> loadItemsCommon(int id, boolean login) throws SQLException { + List> items = new ArrayList<>(); try (Connection con = DatabaseConnection.getConnection()) { StringBuilder query = new StringBuilder(); @@ -153,7 +153,7 @@ public enum ItemFactory { query.append(account ? "accountid" : "characterid").append("` = ?"); if (login) { - query.append(" AND `inventorytype` = ").append(MapleInventoryType.EQUIPPED.getType()); + query.append(" AND `inventorytype` = ").append(InventoryType.EQUIPPED.getType()); } try (PreparedStatement ps = con.prepareStatement(query.toString())) { @@ -162,9 +162,9 @@ public enum ItemFactory { try (ResultSet rs = ps.executeQuery()) { while (rs.next()) { - MapleInventoryType mit = MapleInventoryType.getByType(rs.getByte("inventorytype")); + InventoryType mit = InventoryType.getByType(rs.getByte("inventorytype")); - if (mit.equals(MapleInventoryType.EQUIP) || mit.equals(MapleInventoryType.EQUIPPED)) { + if (mit.equals(InventoryType.EQUIP) || mit.equals(InventoryType.EQUIPPED)) { items.add(new Pair<>(loadEquipFromResultSet(rs), mit)); } else { int petid = rs.getInt("petid"); @@ -186,7 +186,7 @@ public enum ItemFactory { return items; } - private void saveItemsCommon(List> items, int id, Connection con) throws SQLException { + private void saveItemsCommon(List> items, int id, Connection con) throws SQLException { Lock lock = locks[id % lockCount]; lock.lock(); try { @@ -202,9 +202,9 @@ public enum ItemFactory { try (PreparedStatement psItem = con.prepareStatement("INSERT INTO `inventoryitems` VALUES (DEFAULT, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS)) { if (!items.isEmpty()) { - for (Pair pair : items) { + for (Pair pair : items) { Item item = pair.getLeft(); - MapleInventoryType mit = pair.getRight(); + InventoryType mit = pair.getRight(); psItem.setInt(1, value); psItem.setString(2, account ? null : String.valueOf(id)); psItem.setString(3, account ? String.valueOf(id) : null); @@ -219,7 +219,7 @@ public enum ItemFactory { psItem.setString(12, item.getGiftFrom()); psItem.executeUpdate(); - if (mit.equals(MapleInventoryType.EQUIP) || mit.equals(MapleInventoryType.EQUIPPED)) { + if (mit.equals(InventoryType.EQUIP) || mit.equals(InventoryType.EQUIPPED)) { try (PreparedStatement psEquip = con.prepareStatement("INSERT INTO `inventoryequipment` VALUES (DEFAULT, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) { try (ResultSet rs = psItem.getGeneratedKeys()) { if (!rs.next()) { @@ -263,8 +263,8 @@ public enum ItemFactory { } } - private List> loadItemsMerchant(int id, boolean login) throws SQLException { - List> items = new ArrayList<>(); + private List> loadItemsMerchant(int id, boolean login) throws SQLException { + List> items = new ArrayList<>(); try (Connection con = DatabaseConnection.getConnection()) { StringBuilder query = new StringBuilder(); @@ -272,7 +272,7 @@ public enum ItemFactory { query.append(account ? "accountid" : "characterid").append("` = ?"); if (login) { - query.append(" AND `inventorytype` = ").append(MapleInventoryType.EQUIPPED.getType()); + query.append(" AND `inventorytype` = ").append(InventoryType.EQUIPPED.getType()); } try (PreparedStatement ps = con.prepareStatement(query.toString())) { @@ -292,9 +292,9 @@ public enum ItemFactory { } } - MapleInventoryType mit = MapleInventoryType.getByType(rs.getByte("inventorytype")); + InventoryType mit = InventoryType.getByType(rs.getByte("inventorytype")); - if (mit.equals(MapleInventoryType.EQUIP) || mit.equals(MapleInventoryType.EQUIPPED)) { + if (mit.equals(InventoryType.EQUIP) || mit.equals(InventoryType.EQUIPPED)) { items.add(new Pair<>(loadEquipFromResultSet(rs), mit)); } else { if (bundles > 0) { @@ -318,7 +318,7 @@ public enum ItemFactory { return items; } - private void saveItemsMerchant(List> items, List bundlesList, int id, Connection con) throws SQLException { + private void saveItemsMerchant(List> items, List bundlesList, int id, Connection con) throws SQLException { Lock lock = locks[id % lockCount]; lock.lock(); try { @@ -338,10 +338,10 @@ public enum ItemFactory { } int i = 0; - for (Pair pair : items) { + for (Pair pair : items) { final Item item = pair.getLeft(); final Short bundles = bundlesList.get(i); - final MapleInventoryType mit = pair.getRight(); + final InventoryType mit = pair.getRight(); i++; final int genKey; @@ -379,7 +379,7 @@ public enum ItemFactory { } // Equipment - if (mit.equals(MapleInventoryType.EQUIP) || mit.equals(MapleInventoryType.EQUIPPED)) { + if (mit.equals(InventoryType.EQUIP) || mit.equals(InventoryType.EQUIPPED)) { try (PreparedStatement ps = con.prepareStatement("INSERT INTO `inventoryequipment` VALUES (DEFAULT, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) { ps.setInt(1, genKey); diff --git a/src/main/java/client/inventory/MaplePet.java b/src/main/java/client/inventory/MaplePet.java index 0703424a44..943abd9245 100644 --- a/src/main/java/client/inventory/MaplePet.java +++ b/src/main/java/client/inventory/MaplePet.java @@ -223,7 +223,7 @@ public class MaplePet extends Item { owner.getMap().broadcastMessage(PacketCreator.petFoodResponse(owner.getId(), slot, enjoyed, false)); saveToDb(); - Item petz = owner.getInventory(MapleInventoryType.CASH).getItem(getPosition()); + Item petz = owner.getInventory(InventoryType.CASH).getItem(getPosition()); if (petz != null) owner.forceUpdateItem(petz); } @@ -284,7 +284,7 @@ public class MaplePet extends Item { this.petFlag |= flag.getValue(); saveToDb(); - Item petz = owner.getInventory(MapleInventoryType.CASH).getItem(getPosition()); + Item petz = owner.getInventory(InventoryType.CASH).getItem(getPosition()); if (petz != null) owner.forceUpdateItem(petz); } @@ -293,7 +293,7 @@ public class MaplePet extends Item { this.petFlag &= 0xFFFFFFFF ^ flag.getValue(); saveToDb(); - Item petz = owner.getInventory(MapleInventoryType.CASH).getItem(getPosition()); + Item petz = owner.getInventory(InventoryType.CASH).getItem(getPosition()); if (petz != null) owner.forceUpdateItem(petz); } diff --git a/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java b/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java index bf47df80b0..c8abec9bbf 100644 --- a/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java +++ b/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java @@ -64,7 +64,7 @@ public class MapleInventoryManipulator { public static boolean addById(MapleClient c, int itemId, short quantity, String owner, int petid, short flag, long expiration) { MapleCharacter chr = c.getPlayer(); - MapleInventoryType type = ItemConstants.getInventoryType(itemId); + InventoryType type = ItemConstants.getInventoryType(itemId); Inventory inv = chr.getInventory(type); inv.lockInventory(); @@ -75,9 +75,9 @@ public class MapleInventoryManipulator { } } - private static boolean addByIdInternal(MapleClient c, MapleCharacter chr, MapleInventoryType type, Inventory inv, int itemId, short quantity, String owner, int petid, short flag, long expiration) { + private static boolean addByIdInternal(MapleClient c, MapleCharacter chr, InventoryType type, Inventory inv, int itemId, short quantity, String owner, int petid, short flag, long expiration) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - if (!type.equals(MapleInventoryType.EQUIP)) { + if (!type.equals(InventoryType.EQUIP)) { short slotMax = ii.getSlotMax(c, itemId); List existing = inv.listById(itemId); if (!ItemConstants.isRechargeable(itemId) && petid == -1) { @@ -167,7 +167,7 @@ public class MapleInventoryManipulator { public static boolean addFromDrop(MapleClient c, Item item, boolean show, int petId) { MapleCharacter chr = c.getPlayer(); - MapleInventoryType type = item.getInventoryType(); + InventoryType type = item.getInventoryType(); Inventory inv = chr.getInventory(type); inv.lockInventory(); @@ -178,7 +178,7 @@ public class MapleInventoryManipulator { } } - private static boolean addFromDropInternal(MapleClient c, MapleCharacter chr, MapleInventoryType type, Inventory inv, Item item, boolean show, int petId) { + private static boolean addFromDropInternal(MapleClient c, MapleCharacter chr, InventoryType type, Inventory inv, Item item, boolean show, int petId) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); int itemid = item.getItemId(); if (ii.isPickupRestricted(itemid) && chr.haveItemWithId(itemid, true)) { @@ -188,7 +188,7 @@ public class MapleInventoryManipulator { } short quantity = item.getQuantity(); - if (!type.equals(MapleInventoryType.EQUIP)) { + if (!type.equals(InventoryType.EQUIP)) { short slotMax = ii.getSlotMax(c, itemid); List existing = inv.listById(itemid); if (!ItemConstants.isRechargeable(itemid) && petId == -1) { @@ -274,19 +274,19 @@ public class MapleInventoryManipulator { public static boolean checkSpace(MapleClient c, int itemid, int quantity, String owner) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - MapleInventoryType type = ItemConstants.getInventoryType(itemid); + InventoryType type = ItemConstants.getInventoryType(itemid); MapleCharacter chr = c.getPlayer(); Inventory inv = chr.getInventory(type); if (ii.isPickupRestricted(itemid)) { if (haveItemWithId(inv, itemid)) { return false; - } else if (ItemConstants.isEquipment(itemid) && haveItemWithId(chr.getInventory(MapleInventoryType.EQUIPPED), itemid)) { + } else if (ItemConstants.isEquipment(itemid) && haveItemWithId(chr.getInventory(InventoryType.EQUIPPED), itemid)) { return false; } } - if (!type.equals(MapleInventoryType.EQUIP)) { + if (!type.equals(InventoryType.EQUIP)) { short slotMax = ii.getSlotMax(c, itemid); List existing = inv.listById(itemid); @@ -329,19 +329,19 @@ public class MapleInventoryManipulator { int returnValue; MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - MapleInventoryType type = !useProofInv ? ItemConstants.getInventoryType(itemid) : MapleInventoryType.CANHOLD; + InventoryType type = !useProofInv ? ItemConstants.getInventoryType(itemid) : InventoryType.CANHOLD; MapleCharacter chr = c.getPlayer(); Inventory inv = chr.getInventory(type); if (ii.isPickupRestricted(itemid)) { if (haveItemWithId(inv, itemid)) { return 0; - } else if (ItemConstants.isEquipment(itemid) && haveItemWithId(chr.getInventory(MapleInventoryType.EQUIPPED), itemid)) { + } else if (ItemConstants.isEquipment(itemid) && haveItemWithId(chr.getInventory(InventoryType.EQUIPPED), itemid)) { return 0; // thanks Captain & Aika & Vcoc for pointing out inventory checkup on player trades missing out one-of-a-kind items. } } - if (!type.equals(MapleInventoryType.EQUIP)) { + if (!type.equals(InventoryType.EQUIP)) { short slotMax = ii.getSlotMax(c, itemid); final int numSlotsNeeded; @@ -383,17 +383,17 @@ public class MapleInventoryManipulator { return returnValue; } - public static void removeFromSlot(MapleClient c, MapleInventoryType type, short slot, short quantity, boolean fromDrop) { + public static void removeFromSlot(MapleClient c, InventoryType type, short slot, short quantity, boolean fromDrop) { removeFromSlot(c, type, slot, quantity, fromDrop, false); } - public static void removeFromSlot(MapleClient c, MapleInventoryType type, short slot, short quantity, boolean fromDrop, boolean consume) { + public static void removeFromSlot(MapleClient c, InventoryType type, short slot, short quantity, boolean fromDrop, boolean consume) { MapleCharacter chr = c.getPlayer(); Inventory inv = chr.getInventory(type); Item item = inv.getItem(slot); boolean allowZero = consume && ItemConstants.isRechargeable(item.getItemId()); - if(type == MapleInventoryType.EQUIPPED) { + if(type == InventoryType.EQUIPPED) { inv.lockInventory(); try { chr.unequippedItem((Equip) item); @@ -413,14 +413,14 @@ public class MapleInventoryManipulator { } inv.removeItem(slot, quantity, allowZero); - if(type != MapleInventoryType.CANHOLD) { + if(type != InventoryType.CANHOLD) { announceModifyInventory(c, item, fromDrop, allowZero); } // thanks Robin Schulz for noticing pet issues when moving pets out of inventory } else { inv.removeItem(slot, quantity, allowZero); - if(type != MapleInventoryType.CANHOLD) { + if(type != InventoryType.CANHOLD) { announceModifyInventory(c, item, fromDrop, allowZero); } } @@ -435,13 +435,13 @@ public class MapleInventoryManipulator { } } - public static void removeById(MapleClient c, MapleInventoryType type, int itemId, int quantity, boolean fromDrop, boolean consume) { + public static void removeById(MapleClient c, InventoryType type, int itemId, int quantity, boolean fromDrop, boolean consume) { int removeQuantity = quantity; Inventory inv = c.getPlayer().getInventory(type); - int slotLimit = type == MapleInventoryType.EQUIPPED ? 128 : inv.getSlotLimit(); + int slotLimit = type == InventoryType.EQUIPPED ? 128 : inv.getSlotLimit(); for (short i = 0; i <= slotLimit; i++) { - Item item = inv.getItem((short) (type == MapleInventoryType.EQUIPPED ? -i : i)); + Item item = inv.getItem((short) (type == InventoryType.EQUIPPED ? -i : i)); if (item != null) { if (item.getItemId() == itemId || item.getCashId() == itemId) { if (removeQuantity <= item.getQuantity()) { @@ -455,7 +455,7 @@ public class MapleInventoryManipulator { } } } - if (removeQuantity > 0 && type != MapleInventoryType.CANHOLD) { + if (removeQuantity > 0 && type != InventoryType.CANHOLD) { throw new RuntimeException("[Hack] Not enough items available of Item:" + itemId + ", Quantity (After Quantity/Over Current Quantity): " + (quantity - removeQuantity) + "/" + quantity); } } @@ -464,7 +464,7 @@ public class MapleInventoryManipulator { return source.getOwner().equals(target.getOwner()); } - public static void move(MapleClient c, MapleInventoryType type, short src, short dst) { + public static void move(MapleClient c, InventoryType type, short src, short dst) { Inventory inv = c.getPlayer().getInventory(type); if (src < 0 || dst < 0) { @@ -487,7 +487,7 @@ public class MapleInventoryManipulator { short slotMax = ii.getSlotMax(c, source.getItemId()); inv.move(src, dst, slotMax); final List mods = new ArrayList<>(); - if (!(type.equals(MapleInventoryType.EQUIP) || type.equals(MapleInventoryType.CASH)) && initialTarget != null && initialTarget.getItemId() == source.getItemId() && !ItemConstants.isRechargeable(source.getItemId()) && isSameOwner(source, initialTarget)) { + if (!(type.equals(InventoryType.EQUIP) || type.equals(InventoryType.CASH)) && initialTarget != null && initialTarget.getItemId() == source.getItemId() && !ItemConstants.isRechargeable(source.getItemId()) && isSameOwner(source, initialTarget)) { if ((olddstQ + oldsrcQ) > slotMax) { mods.add(new ModifyInventory(1, source)); mods.add(new ModifyInventory(1, initialTarget)); @@ -505,8 +505,8 @@ public class MapleInventoryManipulator { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); MapleCharacter chr = c.getPlayer(); - Inventory eqpInv = chr.getInventory(MapleInventoryType.EQUIP); - Inventory eqpdInv = chr.getInventory(MapleInventoryType.EQUIPPED); + Inventory eqpInv = chr.getInventory(InventoryType.EQUIP); + Inventory eqpdInv = chr.getInventory(InventoryType.EQUIPPED); Equip source = (Equip) eqpInv.getItem(src); if (source == null || !ii.canWearEquipment(chr, source, dst)) { @@ -620,8 +620,8 @@ public class MapleInventoryManipulator { public static void unequip(MapleClient c, short src, short dst) { MapleCharacter chr = c.getPlayer(); - Inventory eqpInv = chr.getInventory(MapleInventoryType.EQUIP); - Inventory eqpdInv = chr.getInventory(MapleInventoryType.EQUIPPED); + Inventory eqpInv = chr.getInventory(InventoryType.EQUIP); + Inventory eqpdInv = chr.getInventory(InventoryType.EQUIPPED); Equip source = (Equip) eqpdInv.getItem(src); Equip target = (Equip) eqpInv.getItem(dst); @@ -679,9 +679,9 @@ public class MapleInventoryManipulator { return false; } - public static void drop(MapleClient c, MapleInventoryType type, short src, short quantity) { + public static void drop(MapleClient c, InventoryType type, short src, short quantity) { if (src < 0) { - type = MapleInventoryType.EQUIPPED; + type = InventoryType.EQUIPPED; } MapleCharacter chr = c.getPlayer(); @@ -730,7 +730,7 @@ public class MapleInventoryManipulator { map.spawnItemDrop(chr, chr, target, dropPos, true, true); } } else { - if (type == MapleInventoryType.EQUIPPED) { + if (type == InventoryType.EQUIPPED) { inv.lockInventory(); try { chr.unequippedItem((Equip) source); diff --git a/src/main/java/client/processor/action/MakerProcessor.java b/src/main/java/client/processor/action/MakerProcessor.java index d23a59aa5e..4f589234f9 100644 --- a/src/main/java/client/processor/action/MakerProcessor.java +++ b/src/main/java/client/processor/action/MakerProcessor.java @@ -22,8 +22,8 @@ package client.processor.action; import client.MapleCharacter; import client.MapleClient; import client.inventory.Equip; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; import constants.game.GameConstants; @@ -75,7 +75,7 @@ public class MakerProcessor { p.readInt(); // 1... probably inventory type pos = p.readInt(); - Item it = c.getPlayer().getInventory(MapleInventoryType.EQUIP).getItem((short) pos); + Item it = c.getPlayer().getInventory(InventoryType.EQUIP).getItem((short) pos); if(it != null && it.getItemId() == toCreate) { toDisassemble = toCreate; @@ -182,7 +182,7 @@ public class MakerProcessor { default: if(toDisassemble != -1) { - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.EQUIP, (short) pos, (short) 1, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (short) pos, (short) 1, false); } else { for (Pair pair : recipe.getReqItems()) { c.getAbstractPlayerInteraction().gainItem(pair.getLeft(), (short) -pair.getRight(), false); diff --git a/src/main/java/client/processor/action/PetAutopotProcessor.java b/src/main/java/client/processor/action/PetAutopotProcessor.java index 508d54c870..893a361367 100644 --- a/src/main/java/client/processor/action/PetAutopotProcessor.java +++ b/src/main/java/client/processor/action/PetAutopotProcessor.java @@ -24,8 +24,8 @@ package client.processor.action; import client.MapleCharacter; import client.MapleClient; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; import server.MapleItemInformationProvider; @@ -55,7 +55,7 @@ public class PetAutopotProcessor { private boolean cursorOnNextAvailablePot(MapleCharacter chr) { if(toUseList == null) { - toUseList = chr.getInventory(MapleInventoryType.USE).linkedListById(itemId); + toUseList = chr.getInventory(InventoryType.USE).linkedListById(itemId); } toUse = null; @@ -96,7 +96,7 @@ public class PetAutopotProcessor { curHp = chr.getHp(); curMp = chr.getMp(); - Inventory useInv = chr.getInventory(MapleInventoryType.USE); + Inventory useInv = chr.getInventory(InventoryType.USE); useInv.lockInventory(); try { toUse = useInv.getItem(slot); @@ -150,7 +150,7 @@ public class PetAutopotProcessor { while (true) { short qtyToUse = (short) Math.min(qtyCount, toUse.getQuantity()); - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, slot, qtyToUse, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, qtyToUse, false); curHp += (incHp * qtyToUse); curMp += (incMp * qtyToUse); diff --git a/src/main/java/client/processor/action/SpawnPetProcessor.java b/src/main/java/client/processor/action/SpawnPetProcessor.java index 29cc716a31..64d470e9d7 100644 --- a/src/main/java/client/processor/action/SpawnPetProcessor.java +++ b/src/main/java/client/processor/action/SpawnPetProcessor.java @@ -22,7 +22,7 @@ package client.processor.action; import client.MapleCharacter; import client.MapleClient; import client.SkillFactory; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; import client.inventory.MaplePet; import client.inventory.manipulator.MapleInventoryManipulator; import provider.MapleDataProvider; @@ -44,7 +44,7 @@ public class SpawnPetProcessor { if (c.tryacquireClient()) { try { MapleCharacter chr = c.getPlayer(); - MaplePet pet = chr.getInventory(MapleInventoryType.CASH).getItem(slot).getPet(); + MaplePet pet = chr.getInventory(InventoryType.CASH).getItem(slot).getPet(); if (pet == null) return; int petid = pet.getItemId(); @@ -60,8 +60,8 @@ public class SpawnPetProcessor { if (petId == -1) { return; } - long expiration = chr.getInventory(MapleInventoryType.CASH).getItem(slot).getExpiration(); - MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, petid, (short) 1, false, false); + long expiration = chr.getInventory(InventoryType.CASH).getItem(slot).getExpiration(); + MapleInventoryManipulator.removeById(c, InventoryType.CASH, petid, (short) 1, false, false); MapleInventoryManipulator.addById(c, evolveid, (short) 1, null, petId, expiration); c.sendPacket(PacketCreator.enableActions()); diff --git a/src/main/java/client/processor/npc/DueyProcessor.java b/src/main/java/client/processor/npc/DueyProcessor.java index fa45802c88..e1ec57fb52 100644 --- a/src/main/java/client/processor/npc/DueyProcessor.java +++ b/src/main/java/client/processor/npc/DueyProcessor.java @@ -27,9 +27,9 @@ import client.MapleCharacter; import client.MapleClient; import client.autoban.AutobanFactory; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.ItemFactory; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; @@ -146,7 +146,7 @@ public class DueyProcessor { try { int packageId = rs.getInt("PackageId"); - List> dueyItems = ItemFactory.DUEY.loadItems(packageId, false); + List> dueyItems = ItemFactory.DUEY.loadItems(packageId, false); DueyPackage dueypack; if (!dueyItems.isEmpty()) { // in a duey package there's only one item @@ -226,7 +226,7 @@ public class DueyProcessor { } private static boolean insertPackageItem(int packageId, Item item) { - Pair dueyItem = new Pair<>(item, MapleInventoryType.getByType(item.getItemType())); + Pair dueyItem = new Pair<>(item, InventoryType.getByType(item.getItemType())); try (Connection con = DatabaseConnection.getConnection()) { ItemFactory.DUEY.saveItems(Collections.singletonList(dueyItem), packageId, con); return true; @@ -241,7 +241,7 @@ public class DueyProcessor { if (invTypeId > 0) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - MapleInventoryType invType = MapleInventoryType.getByType(invTypeId); + InventoryType invType = InventoryType.getByType(invTypeId); Inventory inv = c.getPlayer().getInventory(invType); Item item; @@ -324,7 +324,7 @@ public class DueyProcessor { } if (quick) { - MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, 5330000, (short) 1, false, false); + MapleInventoryManipulator.removeById(c, InventoryType.CASH, 5330000, (short) 1, false, false); } int packageId = createPackage(sendMesos, sendMessage, c.getPlayer().getName(), recipientCid, quick); diff --git a/src/main/java/client/processor/npc/FredrickProcessor.java b/src/main/java/client/processor/npc/FredrickProcessor.java index 46222fe641..88728477a2 100644 --- a/src/main/java/client/processor/npc/FredrickProcessor.java +++ b/src/main/java/client/processor/npc/FredrickProcessor.java @@ -26,9 +26,9 @@ package client.processor.npc; import client.MapleCharacter; import client.MapleClient; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.ItemFactory; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import net.server.Server; import net.server.world.World; @@ -52,10 +52,10 @@ public class FredrickProcessor { private static int[] dailyReminders = new int[]{2, 5, 10, 15, 30, 60, 90, Integer.MAX_VALUE}; - private static byte canRetrieveFromFredrick(MapleCharacter chr, List> items) { + private static byte canRetrieveFromFredrick(MapleCharacter chr, List> items) { if (!Inventory.checkSpotsAndOwnership(chr, items)) { List itemids = new LinkedList<>(); - for (Pair it : items) { + for (Pair it : items) { itemids.add(it.getLeft().getItemId()); } @@ -269,7 +269,7 @@ public class FredrickProcessor { try { MapleCharacter chr = c.getPlayer(); - List> items; + List> items; try { items = ItemFactory.MERCHANT.loadItems(chr.getId(), false); @@ -287,7 +287,7 @@ public class FredrickProcessor { if(merchant != null) merchant.clearItems(); - for (Pair it : items) { + for (Pair it : items) { Item item = it.getLeft(); MapleInventoryManipulator.addFromDrop(chr.getClient(), item, false); String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId()); diff --git a/src/main/java/client/processor/npc/StorageProcessor.java b/src/main/java/client/processor/npc/StorageProcessor.java index 4c0fcb1f0d..b501e413e0 100644 --- a/src/main/java/client/processor/npc/StorageProcessor.java +++ b/src/main/java/client/processor/npc/StorageProcessor.java @@ -25,8 +25,8 @@ import client.MapleCharacter; import client.MapleClient; import client.autoban.AutobanFactory; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; @@ -67,7 +67,7 @@ public class StorageProcessor { c.disconnect(true, false); return; } - slot = storage.getSlot(MapleInventoryType.getByType(type), slot); + slot = storage.getSlot(InventoryType.getByType(type), slot); Item item = storage.getItem(slot); if (item != null) { if (ii.isPickupRestricted(item.getItemId()) && chr.haveItemWithId(item.getItemId(), true)) { @@ -106,7 +106,7 @@ public class StorageProcessor { short slot = p.readShort(); int itemId = p.readInt(); short quantity = p.readShort(); - MapleInventoryType invType = ItemConstants.getInventoryType(itemId); + InventoryType invType = ItemConstants.getInventoryType(itemId); Inventory inv = chr.getInventory(invType); if (slot < 1 || slot > inv.getSlotLimit()) { //player inv starts at one AutobanFactory.PACKET_EDIT.alert(c.getPlayer(), c.getPlayer().getName() + " tried to packet edit with storage."); diff --git a/src/main/java/client/processor/stat/AssignAPProcessor.java b/src/main/java/client/processor/stat/AssignAPProcessor.java index 7e4afb1437..76c4e0be13 100644 --- a/src/main/java/client/processor/stat/AssignAPProcessor.java +++ b/src/main/java/client/processor/stat/AssignAPProcessor.java @@ -26,8 +26,8 @@ package client.processor.stat; import client.*; import client.autoban.AutobanFactory; import client.inventory.Equip; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import config.YamlConfig; import constants.skills.*; import net.packet.InPacket; @@ -49,7 +49,7 @@ public class AssignAPProcessor { MapleCharacter chr = c.getPlayer(); if (chr.getRemainingAp() < 1) return; - Collection equippedC = chr.getInventory(MapleInventoryType.EQUIPPED).list(); + Collection equippedC = chr.getInventory(InventoryType.EQUIPPED).list(); c.lockClient(); try { diff --git a/src/main/java/constants/inventory/ItemConstants.java b/src/main/java/constants/inventory/ItemConstants.java index c7b73f781e..99746e61ac 100644 --- a/src/main/java/constants/inventory/ItemConstants.java +++ b/src/main/java/constants/inventory/ItemConstants.java @@ -21,13 +21,13 @@ */ package constants.inventory; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; import config.YamlConfig; -import java.util.HashSet; -import java.util.Set; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Set; /** * @@ -35,7 +35,7 @@ import java.util.Map; * @author Ronan */ public final class ItemConstants { - protected static Map inventoryTypeCache = new HashMap<>(); + protected static Map inventoryTypeCache = new HashMap<>(); public final static short LOCK = 0x01; public final static short SPIKES = 0x02; @@ -184,16 +184,16 @@ public final class ItemConstants { return itemId / 10000 == 514; } - public static MapleInventoryType getInventoryType(final int itemId) { + public static InventoryType getInventoryType(final int itemId) { if (inventoryTypeCache.containsKey(itemId)) { return inventoryTypeCache.get(itemId); } - MapleInventoryType ret = MapleInventoryType.UNDEFINED; + InventoryType ret = InventoryType.UNDEFINED; final byte type = (byte) (itemId / 1000000); if (type >= 1 && type <= 5) { - ret = MapleInventoryType.getByType(type); + ret = InventoryType.getByType(type); } inventoryTypeCache.put(itemId, ret); diff --git a/src/main/java/net/server/channel/handlers/AdminCommandHandler.java b/src/main/java/net/server/channel/handlers/AdminCommandHandler.java index 4ab9586cc1..bbc0c1745d 100644 --- a/src/main/java/net/server/channel/handlers/AdminCommandHandler.java +++ b/src/main/java/net/server/channel/handlers/AdminCommandHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.inventory.Inventory; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -62,10 +62,10 @@ public final class AdminCommandHandler extends AbstractPacketHandler { break; case 0x01: { // /d (inv) byte type = p.readByte(); - Inventory in = c.getPlayer().getInventory(MapleInventoryType.getByType(type)); + Inventory in = c.getPlayer().getInventory(InventoryType.getByType(type)); for (short i = 1; i <= in.getSlotLimit(); i++) { //TODO What is the point of this loop? if (in.getItem(i) != null) { - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.getByType(type), i, in.getItem(i).getQuantity(), false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.getByType(type), i, in.getItem(i).getQuantity(), false); } return; } diff --git a/src/main/java/net/server/channel/handlers/CashOperationHandler.java b/src/main/java/net/server/channel/handlers/CashOperationHandler.java index d7e6dbd967..80ad58f2fa 100644 --- a/src/main/java/net/server/channel/handlers/CashOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/CashOperationHandler.java @@ -26,8 +26,8 @@ import client.MapleClient; import client.MapleRing; import client.inventory.Equip; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; @@ -280,7 +280,7 @@ public final class CashOperationHandler extends AbstractPacketHandler { return; } - Inventory mi = chr.getInventory(MapleInventoryType.getByType(invType)); + Inventory mi = chr.getInventory(InventoryType.getByType(invType)); Item item = mi.findByCashId(cashId); if (item == null) { c.enableCSActions(); diff --git a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java b/src/main/java/net/server/channel/handlers/ChangeMapHandler.java index 78001a0b36..1bf71d0a41 100644 --- a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java +++ b/src/main/java/net/server/channel/handlers/ChangeMapHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -94,7 +94,7 @@ public final class ChangeMapHandler extends AbstractPacketHandler { if (wheel && chr.haveItemWithId(5510000, false)) { // thanks lucasziron (lziron) for showing revivePlayer() triggering by Wheel - MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, 5510000, 1, true, false); + MapleInventoryManipulator.removeById(c, InventoryType.CASH, 5510000, 1, true, false); chr.sendPacket(PacketCreator.showWheelsLeft(chr.getItemQuantity(5510000, false))); chr.updateHp(50); diff --git a/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java b/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java index 1f933f52b4..e941c7c0b8 100644 --- a/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java +++ b/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java @@ -24,8 +24,8 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; import net.AbstractPacketHandler; @@ -53,7 +53,7 @@ public final class InventoryMergeHandler extends AbstractPacketHandler { return; } - MapleInventoryType inventoryType = MapleInventoryType.getByType(invType); + InventoryType inventoryType = InventoryType.getByType(invType); Inventory inventory = c.getPlayer().getInventory(inventoryType); inventory.lockInventory(); try { diff --git a/src/main/java/net/server/channel/handlers/InventorySortHandler.java b/src/main/java/net/server/channel/handlers/InventorySortHandler.java index e2d42ba806..debc8ba793 100644 --- a/src/main/java/net/server/channel/handlers/InventorySortHandler.java +++ b/src/main/java/net/server/channel/handlers/InventorySortHandler.java @@ -238,7 +238,7 @@ class PairedQuicksort { if(A.size() > 0) { MapleQuicksort(0, A.size() - 1, A, primarySort); - if (A.get(0).getInventoryType().equals(MapleInventoryType.USE)) { // thanks KDA & Vcoc for suggesting stronger projectiles coming before weaker ones + if (A.get(0).getInventoryType().equals(InventoryType.USE)) { // thanks KDA & Vcoc for suggesting stronger projectiles coming before weaker ones reverseSortSublist(A, BinarySearchElement(A, 206)); // arrows reverseSortSublist(A, BinarySearchElement(A, 207)); // stars reverseSortSublist(A, BinarySearchElement(A, 233)); // bullets @@ -280,7 +280,7 @@ public final class InventorySortHandler extends AbstractPacketHandler { ArrayList itemarray = new ArrayList<>(); List mods = new ArrayList<>(); - Inventory inventory = chr.getInventory(MapleInventoryType.getByType(invType)); + Inventory inventory = chr.getInventory(InventoryType.getByType(invType)); inventory.lockInventory(); try { for (short i = 1; i <= inventory.getSlotLimit(); i++) { @@ -295,7 +295,7 @@ public final class InventorySortHandler extends AbstractPacketHandler { mods.add(new ModifyInventory(3, item)); } - int invTypeCriteria = (MapleInventoryType.getByType(invType) == MapleInventoryType.EQUIP) ? 3 : 1; + int invTypeCriteria = (InventoryType.getByType(invType) == InventoryType.EQUIP) ? 3 : 1; int sortCriteria = (YamlConfig.config.server.USE_ITEM_SORT_BY_NAME == true) ? 2 : 0; PairedQuicksort pq = new PairedQuicksort(itemarray, sortCriteria, invTypeCriteria); diff --git a/src/main/java/net/server/channel/handlers/ItemMoveHandler.java b/src/main/java/net/server/channel/handlers/ItemMoveHandler.java index e1e5fe9f0c..3dd2c46600 100644 --- a/src/main/java/net/server/channel/handlers/ItemMoveHandler.java +++ b/src/main/java/net/server/channel/handlers/ItemMoveHandler.java @@ -22,7 +22,7 @@ package net.server.channel.handlers; import client.MapleClient; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -41,7 +41,7 @@ public final class ItemMoveHandler extends AbstractPacketHandler { return; } - MapleInventoryType type = MapleInventoryType.getByType(p.readByte()); + InventoryType type = InventoryType.getByType(p.readByte()); short src = p.readShort(); //is there any reason to use byte instead of short in src and action? short action = p.readShort(); short quantity = p.readShort(); diff --git a/src/main/java/net/server/channel/handlers/ItemRewardHandler.java b/src/main/java/net/server/channel/handlers/ItemRewardHandler.java index 346116dab4..554d12d55c 100644 --- a/src/main/java/net/server/channel/handlers/ItemRewardHandler.java +++ b/src/main/java/net/server/channel/handlers/ItemRewardHandler.java @@ -22,8 +22,8 @@ package net.server.channel.handlers; import client.MapleClient; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; @@ -47,8 +47,8 @@ public final class ItemRewardHandler extends AbstractPacketHandler { byte slot = (byte) p.readShort(); int itemId = p.readInt(); // will load from xml I don't care. - Item it = c.getPlayer().getInventory(MapleInventoryType.USE).getItem(slot); // null check here thanks to Thora - if (it == null || it.getItemId() != itemId || c.getPlayer().getInventory(MapleInventoryType.USE).countById(itemId) < 1) return; + Item it = c.getPlayer().getInventory(InventoryType.USE).getItem(slot); // null check here thanks to Thora + if (it == null || it.getItemId() != itemId || c.getPlayer().getInventory(InventoryType.USE).countById(itemId) < 1) return; MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); Pair> rewards = ii.getItemReward(itemId); @@ -58,7 +58,7 @@ public final class ItemRewardHandler extends AbstractPacketHandler { break; } if (Randomizer.nextInt(rewards.getLeft()) < reward.prob) {//Is it even possible to get an item with prob 1? - if (ItemConstants.getInventoryType(reward.itemid) == MapleInventoryType.EQUIP) { + if (ItemConstants.getInventoryType(reward.itemid) == InventoryType.EQUIP) { final Item item = ii.getEquipById(reward.itemid); if (reward.period != -1) { item.setExpiration(currentServerTime() + (reward.period * 60 * 60 * 10)); @@ -67,7 +67,7 @@ public final class ItemRewardHandler extends AbstractPacketHandler { } else { MapleInventoryManipulator.addById(c, reward.itemid, reward.quantity, "", -1); } - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, false, false); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, false, false); if (reward.worldmsg != null) { String msg = reward.worldmsg; msg.replaceAll("/name", c.getPlayer().getName()); diff --git a/src/main/java/net/server/channel/handlers/KeymapChangeHandler.java b/src/main/java/net/server/channel/handlers/KeymapChangeHandler.java index 87ac61c051..8e471ac2e8 100644 --- a/src/main/java/net/server/channel/handlers/KeymapChangeHandler.java +++ b/src/main/java/net/server/channel/handlers/KeymapChangeHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleClient; import client.Skill; import client.SkillFactory; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; import client.keybind.MapleKeyBinding; import constants.game.GameConstants; import net.AbstractPacketHandler; @@ -65,14 +65,14 @@ public final class KeymapChangeHandler extends AbstractPacketHandler { } } else if(mode == 1) { // Auto HP Potion int itemID = p.readInt(); - if(itemID != 0 && c.getPlayer().getInventory(MapleInventoryType.USE).findById(itemID) == null) { + if(itemID != 0 && c.getPlayer().getInventory(InventoryType.USE).findById(itemID) == null) { c.disconnect(false, false); // Don't let them send a packet with a use item they dont have. return; } c.getPlayer().changeKeybinding(91, new MapleKeyBinding(7, itemID)); } else if(mode == 2) { // Auto MP Potion int itemID = p.readInt(); - if(itemID != 0 && c.getPlayer().getInventory(MapleInventoryType.USE).findById(itemID) == null) { + if(itemID != 0 && c.getPlayer().getInventory(InventoryType.USE).findById(itemID) == null) { c.disconnect(false, false); // Don't let them send a packet with a use item they dont have. return; } diff --git a/src/main/java/net/server/channel/handlers/MTSHandler.java b/src/main/java/net/server/channel/handlers/MTSHandler.java index d4168900b8..2caaa48812 100644 --- a/src/main/java/net/server/channel/handlers/MTSHandler.java +++ b/src/main/java/net/server/channel/handlers/MTSHandler.java @@ -24,8 +24,8 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.inventory.Equip; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; @@ -102,7 +102,7 @@ public final class MTSHandler extends AbstractPacketHandler { if (quantity < 0 || price < 110 || c.getPlayer().getItemQuantity(itemid, false) < quantity) { return; } - MapleInventoryType invType = ItemConstants.getInventoryType(itemid); + InventoryType invType = ItemConstants.getInventoryType(itemid); Item i = c.getPlayer().getInventory(invType).getItem(slot).copy(); if (i != null && c.getPlayer().getMeso() >= 5000) { Connection con = null; @@ -159,7 +159,7 @@ public final class MTSHandler extends AbstractPacketHandler { } else { date += day + ""; } - if (!i.getInventoryType().equals(MapleInventoryType.EQUIP)) { + if (!i.getInventoryType().equals(InventoryType.EQUIP)) { Item item = i; ps = con.prepareStatement("INSERT INTO mts_items (tab, type, itemid, quantity, expiration, giftFrom, seller, price, owner, sellername, sell_ends) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); ps.setInt(1, 1); diff --git a/src/main/java/net/server/channel/handlers/PetFoodHandler.java b/src/main/java/net/server/channel/handlers/PetFoodHandler.java index a97d6e89f8..d130247d91 100644 --- a/src/main/java/net/server/channel/handlers/PetFoodHandler.java +++ b/src/main/java/net/server/channel/handlers/PetFoodHandler.java @@ -25,8 +25,8 @@ import client.MapleCharacter; import client.MapleClient; import client.autoban.AutobanManager; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.MaplePet; import client.inventory.manipulator.MapleInventoryManipulator; import net.AbstractPacketHandler; @@ -71,7 +71,7 @@ public final class PetFoodHandler extends AbstractPacketHandler { if (c.tryacquireClient()) { try { - Inventory useInv = chr.getInventory(MapleInventoryType.USE); + Inventory useInv = chr.getInventory(InventoryType.USE); useInv.lockInventory(); try { Item use = useInv.getItem(pos); @@ -80,7 +80,7 @@ public final class PetFoodHandler extends AbstractPacketHandler { } pet.gainClosenessFullness(chr, (pet.getFullness() <= 75) ? 1 : 0, 30, 1); // 25+ "emptyness" to get +1 closeness - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, pos, (short) 1, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, pos, (short) 1, false); } finally { useInv.unlockInventory(); } diff --git a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java b/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java index 2bf4ae05ec..1324672d32 100644 --- a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java @@ -25,8 +25,8 @@ import client.MapleCharacter; import client.MapleClient; import client.autoban.AutobanFactory; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; @@ -239,7 +239,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler { String desc = p.readString(); p.skip(3); int itemId = p.readInt(); - if (chr.getInventory(MapleInventoryType.CASH).countById(itemId) < 1) { + if (chr.getInventory(InventoryType.CASH).countById(itemId) < 1) { chr.sendPacket(PacketCreator.getMiniRoomError(6)); return; } @@ -363,7 +363,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler { if (shop != null && shop.isOwner(chr)) { if(YamlConfig.config.server.USE_ERASE_PERMIT_ON_OPENSHOP) { try { - MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, shop.getItemId(), 1, true, false); + MapleInventoryManipulator.removeById(c, InventoryType.CASH, shop.getItemId(), 1, true, false); } catch(RuntimeException re) {} // fella does not have a player shop permit... } @@ -472,7 +472,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler { chr.getTrade().setMeso(p.readInt()); } else if (mode == Action.SET_ITEMS.getCode()) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - MapleInventoryType ivType = MapleInventoryType.getByType(p.readByte()); + InventoryType ivType = InventoryType.getByType(p.readByte()); short pos = p.readShort(); Item item = chr.getInventory(ivType).getItem(pos); short quantity = p.readShort(); @@ -556,7 +556,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler { } else if (mode == Action.ADD_ITEM.getCode() || mode == Action.PUT_ITEM.getCode()) { if (isTradeOpen(chr)) return; - MapleInventoryType ivType = MapleInventoryType.getByType(p.readByte()); + InventoryType ivType = InventoryType.getByType(p.readByte()); short slot = p.readShort(); short bundles = p.readShort(); Item ivItem = chr.getInventory(ivType).getItem(slot); @@ -616,7 +616,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler { c.sendPacket(PacketCreator.getPlayerShopItemUpdate(shop)); } else if (merchant != null && merchant.isOwner(chr)) { - if (ivType.equals(MapleInventoryType.CASH) && merchant.isPublished()) { + if (ivType.equals(InventoryType.CASH) && merchant.isPublished()) { c.sendPacket(PacketCreator.serverNotice(1, "Cash items are only allowed to be sold when first opening the store.")); return; } diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index aafec75622..e1cbe05f75 100644 --- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java @@ -314,7 +314,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler { player.updatePartyMemberHP(); } - Inventory eqpInv = player.getInventory(MapleInventoryType.EQUIPPED); + Inventory eqpInv = player.getInventory(InventoryType.EQUIPPED); eqpInv.lockInventory(); try { for (Item it : eqpInv.list()) { diff --git a/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java b/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java index 186f925af7..aad60870cd 100644 --- a/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java +++ b/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java @@ -4,7 +4,7 @@ import client.MapleCharacter; import client.MapleClient; import client.MapleQuestStatus; import client.inventory.Inventory; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -47,7 +47,7 @@ public class RaiseIncExpHandler extends AbstractPacketHandler { } int consId; - Inventory inv = chr.getInventory(MapleInventoryType.getByType(inventorytype)); + Inventory inv = chr.getInventory(InventoryType.getByType(inventorytype)); inv.lockInventory(); try { consId = inv.getItem(slot).getItemId(); @@ -55,7 +55,7 @@ public class RaiseIncExpHandler extends AbstractPacketHandler { return; } - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.getByType(inventorytype), slot, (short) 1, false, true); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.getByType(inventorytype), slot, (short) 1, false, true); } finally { inv.unlockInventory(); } diff --git a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java index 8fa683db8e..c85a2453ea 100644 --- a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java +++ b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java @@ -23,8 +23,8 @@ package net.server.channel.handlers; import client.*; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.MapleWeaponType; import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; @@ -89,7 +89,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { applyAttack(attack, chr, 4); } } else { - Item weapon = chr.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -11); + Item weapon = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -11); MapleWeaponType type = MapleItemInformationProvider.getInstance().getWeaponType(weapon.getItemId()); if (type == MapleWeaponType.NOT_A_WEAPON) { return; @@ -123,7 +123,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { if (hasShadowPartner) { bulletCount *= 2; } - Inventory inv = chr.getInventory(MapleInventoryType.USE); + Inventory inv = chr.getInventory(InventoryType.USE); for (short i = 1; i <= inv.getSlotLimit(); i++) { Item item = inv.getItem(i); if (item != null) { @@ -167,14 +167,14 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { } if(slot < 0) System.out.println(" Projectile to use was unable to be found."); - else MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, slot, bulletConsume, false, true); + else MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, bulletConsume, false, true); } } if (projectile != 0 || soulArrow || attack.skill == 11101004 || attack.skill == 15111007 || attack.skill == 14101006 || attack.skill == 4111004 || attack.skill == 13101005) { int visProjectile = projectile; //visible projectile sent to players if (ItemConstants.isThrowingStar(projectile)) { - Inventory cash = chr.getInventory(MapleInventoryType.CASH); + Inventory cash = chr.getInventory(InventoryType.CASH); for (int i = 1; i <= cash.getSlotLimit(); i++) { // impose order... Item item = cash.getItem((short) i); if (item != null) { diff --git a/src/main/java/net/server/channel/handlers/RingActionHandler.java b/src/main/java/net/server/channel/handlers/RingActionHandler.java index 0e8faef6d1..997c3a963e 100644 --- a/src/main/java/net/server/channel/handlers/RingActionHandler.java +++ b/src/main/java/net/server/channel/handlers/RingActionHandler.java @@ -25,8 +25,8 @@ import client.MapleCharacter; import client.MapleClient; import client.MapleRing; import client.inventory.Equip; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.processor.npc.DueyProcessor; import net.AbstractPacketHandler; @@ -205,9 +205,9 @@ public final class RingActionHandler extends AbstractPacketHandler { private static void resetRingId(MapleCharacter player) { int ringitemid = player.getMarriageRing().getItemId(); - Item it = player.getInventory(MapleInventoryType.EQUIP).findById(ringitemid); + Item it = player.getInventory(InventoryType.EQUIP).findById(ringitemid); if(it == null) { - it = player.getInventory(MapleInventoryType.EQUIPPED).findById(ringitemid); + it = player.getInventory(InventoryType.EQUIPPED).findById(ringitemid); } if(it != null) { @@ -230,7 +230,7 @@ public final class RingActionHandler extends AbstractPacketHandler { int partnerMarriageitemid = marriageitemid + ((chr.getGender() == 0) ? 1 : -1); if(partner.haveItem(partnerMarriageitemid)) { - MapleInventoryManipulator.removeById(partner.getClient(), MapleInventoryType.ETC, partnerMarriageitemid, (short) 1, false, false); + MapleInventoryManipulator.removeById(partner.getClient(), InventoryType.ETC, partnerMarriageitemid, (short) 1, false, false); } //partner.sendPacket(Wedding.OnMarriageResult((byte) 0)); ok, how to gracefully unengage someone without the need to cc? @@ -240,7 +240,7 @@ public final class RingActionHandler extends AbstractPacketHandler { } if(chr.haveItem(marriageitemid)) { - MapleInventoryManipulator.removeById(chr.getClient(), MapleInventoryType.ETC, marriageitemid, (short) 1, false, false); + MapleInventoryManipulator.removeById(chr.getClient(), InventoryType.ETC, marriageitemid, (short) 1, false, false); } chr.dropMessage(5, "You have successfully break the engagement with " + MapleCharacter.getNameById(partnerid) + "."); @@ -251,9 +251,9 @@ public final class RingActionHandler extends AbstractPacketHandler { } public static void breakMarriageRing(MapleCharacter chr, final int wItemId) { - final MapleInventoryType type = MapleInventoryType.getByType((byte) (wItemId / 1000000)); + final InventoryType type = InventoryType.getByType((byte) (wItemId / 1000000)); final Item wItem = chr.getInventory(type).findById(wItemId); - final boolean weddingToken = (wItem != null && type == MapleInventoryType.ETC && wItemId / 10000 == 403); + final boolean weddingToken = (wItem != null && type == InventoryType.ETC && wItemId / 10000 == 403); final boolean weddingRing = (wItem != null && wItemId / 10 == 111280); if (weddingRing) { @@ -333,7 +333,7 @@ public final class RingActionHandler extends AbstractPacketHandler { } try { - MapleInventoryManipulator.removeById(source.getClient(), MapleInventoryType.USE, itemid, 1, false, false); + MapleInventoryManipulator.removeById(source.getClient(), InventoryType.USE, itemid, 1, false, false); int marriageId = c.getWorldServer().createRelationship(source.getId(), target.getId()); source.setPartnerId(target.getId()); // engage them (new marriageitemid, partnerid for both) @@ -372,7 +372,7 @@ public final class RingActionHandler extends AbstractPacketHandler { int itemId; try { - itemId = c.getPlayer().getInventory(MapleInventoryType.ETC).getItem(slot).getItemId(); + itemId = c.getPlayer().getInventory(InventoryType.ETC).getItem(slot).getItemId(); } catch(NullPointerException npe) { c.sendPacket(PacketCreator.enableActions()); return; @@ -442,7 +442,7 @@ public final class RingActionHandler extends AbstractPacketHandler { int invitationid = p.readInt(); if(invitationid == 4031406 || invitationid == 4031407) { - Item item = c.getPlayer().getInventory(MapleInventoryType.ETC).getItem(slot); + Item item = c.getPlayer().getInventory(InventoryType.ETC).getItem(slot); if(item == null || item.getItemId() != invitationid) { c.sendPacket(PacketCreator.enableActions()); return; diff --git a/src/main/java/net/server/channel/handlers/ScrollHandler.java b/src/main/java/net/server/channel/handlers/ScrollHandler.java index 049195cc58..3b213fa283 100644 --- a/src/main/java/net/server/channel/handlers/ScrollHandler.java +++ b/src/main/java/net/server/channel/handlers/ScrollHandler.java @@ -60,15 +60,15 @@ public final class ScrollHandler extends AbstractPacketHandler { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); MapleCharacter chr = c.getPlayer(); - Equip toScroll = (Equip) chr.getInventory(MapleInventoryType.EQUIPPED).getItem(dst); + Equip toScroll = (Equip) chr.getInventory(InventoryType.EQUIPPED).getItem(dst); Skill LegendarySpirit = SkillFactory.getSkill(1003); if (chr.getSkillLevel(LegendarySpirit) > 0 && dst >= 0) { legendarySpirit = true; - toScroll = (Equip) chr.getInventory(MapleInventoryType.EQUIP).getItem(dst); + toScroll = (Equip) chr.getInventory(InventoryType.EQUIP).getItem(dst); } byte oldLevel = toScroll.getLevel(); byte oldSlots = toScroll.getUpgradeSlots(); - Inventory useInventory = chr.getInventory(MapleInventoryType.USE); + Inventory useInventory = chr.getInventory(InventoryType.USE); Item scroll = useInventory.getItem(slot); Item wscroll = null; @@ -128,10 +128,10 @@ public final class ScrollHandler extends AbstractPacketHandler { return; } - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, wscroll.getPosition(), (short) 1, false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, wscroll.getPosition(), (short) 1, false, false); } - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, scroll.getPosition(), (short) 1, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, scroll.getPosition(), (short) 1, false); } finally { useInventory.unlockInventory(); } @@ -141,7 +141,7 @@ public final class ScrollHandler extends AbstractPacketHandler { if(!ItemConstants.isWeddingRing(toScroll.getItemId())) { mods.add(new ModifyInventory(3, toScroll)); if (dst < 0) { - Inventory inv = chr.getInventory(MapleInventoryType.EQUIPPED); + Inventory inv = chr.getInventory(InventoryType.EQUIPPED); inv.lockInventory(); try { @@ -151,7 +151,7 @@ public final class ScrollHandler extends AbstractPacketHandler { inv.unlockInventory(); } } else { - Inventory inv = chr.getInventory(MapleInventoryType.EQUIP); + Inventory inv = chr.getInventory(InventoryType.EQUIP); inv.lockInventory(); try { diff --git a/src/main/java/net/server/channel/handlers/SkillBookHandler.java b/src/main/java/net/server/channel/handlers/SkillBookHandler.java index c0a2f711b8..d48c959e8b 100644 --- a/src/main/java/net/server/channel/handlers/SkillBookHandler.java +++ b/src/main/java/net/server/channel/handlers/SkillBookHandler.java @@ -26,8 +26,8 @@ import client.MapleClient; import client.Skill; import client.SkillFactory; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -56,7 +56,7 @@ public final class SkillBookHandler extends AbstractPacketHandler { MapleCharacter player = c.getPlayer(); if (c.tryacquireClient()) { try { - Inventory inv = c.getPlayer().getInventory(MapleInventoryType.USE); + Inventory inv = c.getPlayer().getInventory(InventoryType.USE); Item toUse = inv.getItem(slot); if (toUse == null || toUse.getItemId() != itemId) { return; @@ -76,7 +76,7 @@ public final class SkillBookHandler extends AbstractPacketHandler { return; } - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, slot, (short) 1, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); } finally { inv.unlockInventory(); } diff --git a/src/main/java/net/server/channel/handlers/SummonDamageHandler.java b/src/main/java/net/server/channel/handlers/SummonDamageHandler.java index 8651d94ee6..2fb8eb3add 100644 --- a/src/main/java/net/server/channel/handlers/SummonDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/SummonDamageHandler.java @@ -26,8 +26,8 @@ import client.MapleClient; import client.Skill; import client.SkillFactory; import client.autoban.AutobanFactory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.MapleWeaponType; import client.status.MonsterStatusEffect; import constants.skills.Outlaw; @@ -135,7 +135,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler { maxDamage = player.calculateMaxBaseMagicDamage(matk) * (0.05 * summonEffect.getMatk()); } else { int watk = Math.max(player.getTotalWatk(), 14); - Item weapon_item = player.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -11); + Item weapon_item = player.getInventory(InventoryType.EQUIPPED).getItem((short) -11); int maxBaseDmg; // thanks Conrad, Atoot for detecting some summons legitimately hitting over the calculated limit if (weapon_item != null) { diff --git a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java index a6c05afeb1..8e4239a574 100644 --- a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java @@ -23,8 +23,8 @@ package net.server.channel.handlers; import client.*; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.status.MonsterStatus; import client.status.MonsterStatusEffect; @@ -88,7 +88,7 @@ public final class TakeDamageHandler extends AbstractPacketHandler { loseItems = attacker.getStats().loseItem(); if (loseItems != null) { if (chr.getBuffEffect(MapleBuffStat.AURA) == null) { - MapleInventoryType type; + InventoryType type; final int playerpos = chr.getPosition().x; byte d = 1; Point pos = new Point(0, chr.getPosition().y); diff --git a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java index e587f6bb1a..ff6b22e4ea 100644 --- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java @@ -68,7 +68,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { int itemId = p.readInt(); int itemType = itemId / 10000; - Inventory cashInv = player.getInventory(MapleInventoryType.CASH); + Inventory cashInv = player.getInventory(InventoryType.CASH); Item toUse = cashInv.getItem(position); if (toUse == null || toUse.getItemId() != itemId) { toUse = cashInv.findById(itemId); @@ -87,7 +87,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { } String medal = ""; - Item medalItem = player.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -49); + Item medalItem = player.getInventory(InventoryType.EQUIPPED).getItem((short) -49); if (medalItem != null) { medal = "<" + ii.getName(medalItem.getItemId()) + "> "; } @@ -203,10 +203,10 @@ public final class UseCashItemHandler extends AbstractPacketHandler { if (equipSlot == 0) { return; } - eq = player.getInventory(MapleInventoryType.EQUIPPED).getItem((short) equipSlot); + eq = player.getInventory(InventoryType.EQUIPPED).getItem((short) equipSlot); eq.setOwner(player.getName()); } else if (itemId == 5060001 || itemId == 5061000 || itemId == 5061001 || itemId == 5061002 || itemId == 5061003) { // Sealing lock - MapleInventoryType type = MapleInventoryType.getByType((byte) p.readInt()); + InventoryType type = InventoryType.getByType((byte) p.readInt()); eq = player.getInventory(type).getItem((short) p.readInt()); if (eq == null) { //Check if the type is EQUIPMENT? return; @@ -237,13 +237,13 @@ public final class UseCashItemHandler extends AbstractPacketHandler { } else if (itemId == 5060002) { // Incubator byte inventory2 = (byte) p.readInt(); short slot2 = (short) p.readInt(); - Item item2 = player.getInventory(MapleInventoryType.getByType(inventory2)).getItem(slot2); + Item item2 = player.getInventory(InventoryType.getByType(inventory2)).getItem(slot2); if (item2 == null) // hacking { return; } if (getIncubatedItem(c, itemId)) { - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.getByType(inventory2), slot2, (short) 1, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.getByType(inventory2), slot2, (short) 1, false); remove(c, position, itemId); } return; @@ -312,7 +312,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { whisper = p.readByte() == 1; Item item = null; if (p.readByte() == 1) { //item - item = player.getInventory(MapleInventoryType.getByType((byte) p.readInt())).getItem((short) p.readInt()); + item = player.getInventory(InventoryType.getByType((byte) p.readInt())).getItem((short) p.readInt()); if (item == null) //hack { return; @@ -376,7 +376,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { pet.setName(newName); pet.saveToDb(); - Item item = player.getInventory(MapleInventoryType.CASH).getItem(pet.getPosition()); + Item item = player.getInventory(InventoryType.CASH).getItem(pet.getPosition()); if (item != null) { player.forceUpdateItem(item); } @@ -504,7 +504,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { } else if (itemType == 550) { //Extend item expiration c.sendPacket(PacketCreator.enableActions()); } else if (itemType == 552) { - MapleInventoryType type = MapleInventoryType.getByType((byte) p.readInt()); + 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())) { @@ -522,8 +522,8 @@ public final class UseCashItemHandler extends AbstractPacketHandler { p.readInt(); int itemSlot = p.readInt(); p.readInt(); - final Equip equip = (Equip) player.getInventory(MapleInventoryType.EQUIP).getItem((short) itemSlot); - if (equip.getVicious() >= 2 || player.getInventory(MapleInventoryType.CASH).findById(5570000) == null) { + final Equip equip = (Equip) player.getInventory(InventoryType.EQUIP).getItem((short) itemSlot); + if (equip.getVicious() >= 2 || player.getInventory(InventoryType.CASH).findById(5570000) == null) { return; } equip.setVicious(equip.getVicious() + 1); @@ -538,14 +538,14 @@ public final class UseCashItemHandler extends AbstractPacketHandler { } final byte eSlot = (byte) p.readInt(); - final Item eitem = player.getInventory(MapleInventoryType.EQUIP).getItem(eSlot); + final Item eitem = player.getInventory(InventoryType.EQUIP).getItem(eSlot); if (p.readInt() != 2) { return; } final byte uSlot = (byte) p.readInt(); - final Item uitem = player.getInventory(MapleInventoryType.USE).getItem(uSlot); + final Item uitem = player.getInventory(InventoryType.USE).getItem(uSlot); if (eitem == null || uitem == null) { return; } @@ -570,7 +570,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { c.sendPacket(PacketCreator.sendVegaScroll(scrolled.getLevel() > curlevel ? 0x41 : 0x43)); //opcodes 0x42, 0x44: "this item cannot be used"; 0x39, 0x45: crashes - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, uSlot, (short) 1, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, uSlot, (short) 1, false); remove(c, position, itemId); final MapleClient client = c; @@ -601,7 +601,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { } private static void remove(MapleClient c, short position, int itemid) { - Inventory cashInv = c.getPlayer().getInventory(MapleInventoryType.CASH); + Inventory cashInv = c.getPlayer().getInventory(InventoryType.CASH); cashInv.lockInventory(); try { Item it = cashInv.getItem(position); @@ -612,7 +612,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { } } - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.CASH, position, (short) 1, true, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.CASH, position, (short) 1, true, false); } finally { cashInv.unlockInventory(); } @@ -627,7 +627,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { amount = quantitys[i]; } } - if (c.getPlayer().getInventory(MapleInventoryType.getByType((byte) (id / 1000000))).isFull()) { + if (c.getPlayer().getInventory(InventoryType.getByType((byte) (id / 1000000))).isFull()) { return false; } MapleInventoryManipulator.addById(c, id, (short) amount); diff --git a/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java b/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java index bd9b5a3202..8d60dc3d67 100644 --- a/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.autoban.AutobanManager; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; @@ -61,7 +61,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getId() == 9300101) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 1902000, (short) 1, "", -1); } c.sendPacket(PacketCreator.enableActions()); @@ -72,7 +72,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 4031830, (short) 1, "", -1); } else { abm.spam(10); @@ -90,7 +90,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (Math.random() < 0.5) { // 50% chance chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 4031868, (short) 1, "", -1); } else { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 0)); @@ -112,7 +112,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 4031887, (short) 1, "", -1); } else { c.sendPacket(PacketCreator.catchMessage(0)); @@ -125,7 +125,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 2109001, (short) 1, "", -1); } else { c.sendPacket(PacketCreator.catchMessage(0)); @@ -138,7 +138,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 2109002, (short) 1, "", -1); } else { c.sendPacket(PacketCreator.catchMessage(0)); @@ -151,7 +151,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 2109003, (short) 1, "", -1); } else { c.sendPacket(PacketCreator.catchMessage(0)); @@ -164,7 +164,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 4001169, (short) 1, "", -1); } else { c.sendPacket(PacketCreator.catchMessage(0)); @@ -178,7 +178,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { abm.spam(10); chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, 2022323, (short) 1, "", -1); } else { chr.message("You cannot use the Fishing Net yet."); @@ -201,7 +201,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mobHp != 0 && mob.getHp() < ((mob.getMaxHp() / 100) * mobHp)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); MapleInventoryManipulator.addById(c, itemGanho, (short) 1, "", -1); } else if (mob.getId() != 9500336) { if (mobHp != 0) { diff --git a/src/main/java/net/server/channel/handlers/UseChairHandler.java b/src/main/java/net/server/channel/handlers/UseChairHandler.java index 0e6b6e5f66..fcded57bd5 100644 --- a/src/main/java/net/server/channel/handlers/UseChairHandler.java +++ b/src/main/java/net/server/channel/handlers/UseChairHandler.java @@ -22,7 +22,7 @@ package net.server.channel.handlers; import client.MapleClient; -import client.inventory.MapleInventoryType; +import client.inventory.InventoryType; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -33,7 +33,7 @@ public final class UseChairHandler extends AbstractPacketHandler { int itemId = p.readInt(); // thanks Darter (YungMoozi) for reporting unchecked chair item - if (!ItemConstants.isChair(itemId) || c.getPlayer().getInventory(MapleInventoryType.SETUP).findById(itemId) == null) { + if (!ItemConstants.isChair(itemId) || c.getPlayer().getInventory(InventoryType.SETUP).findById(itemId) == null) { return; } diff --git a/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java b/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java index 703b3de6c3..675dec5105 100644 --- a/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java +++ b/src/main/java/net/server/channel/handlers/UseItemEffectHandler.java @@ -22,8 +22,8 @@ package net.server.channel.handlers; import client.MapleClient; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import net.AbstractPacketHandler; import net.packet.InPacket; import tools.PacketCreator; @@ -34,9 +34,9 @@ public final class UseItemEffectHandler extends AbstractPacketHandler { Item toUse; int itemId = p.readInt(); if (itemId == 4290001 || itemId == 4290000) { - toUse = c.getPlayer().getInventory(MapleInventoryType.ETC).findById(itemId); + toUse = c.getPlayer().getInventory(InventoryType.ETC).findById(itemId); } else { - toUse = c.getPlayer().getInventory(MapleInventoryType.CASH).findById(itemId); + toUse = c.getPlayer().getInventory(InventoryType.CASH).findById(itemId); } if (toUse == null || toUse.getQuantity() < 1) { if (itemId != 0) return; diff --git a/src/main/java/net/server/channel/handlers/UseItemHandler.java b/src/main/java/net/server/channel/handlers/UseItemHandler.java index 67ccb4817c..465001b069 100644 --- a/src/main/java/net/server/channel/handlers/UseItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseItemHandler.java @@ -24,8 +24,8 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.MapleDisease; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; @@ -51,7 +51,7 @@ public final class UseItemHandler extends AbstractPacketHandler { p.readInt(); short slot = p.readShort(); int itemId = p.readInt(); - Item toUse = chr.getInventory(MapleInventoryType.USE).getItem(slot); + Item toUse = chr.getInventory(InventoryType.USE).getItem(slot); if (toUse != null && toUse.getQuantity() > 0 && toUse.getItemId() == itemId) { if (itemId == 2050004) { chr.dispelDebuffs(); @@ -107,7 +107,7 @@ public final class UseItemHandler extends AbstractPacketHandler { } private void remove(MapleClient c, short slot) { - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, slot, (short) 1, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); c.sendPacket(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java b/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java index af689945bb..7f7681b9ab 100644 --- a/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java +++ b/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java @@ -25,8 +25,8 @@ import client.MapleCharacter; import client.MapleClient; import client.MapleMount; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import constants.game.ExpTable; import net.AbstractPacketHandler; @@ -46,7 +46,7 @@ public final class UseMountFoodHandler extends AbstractPacketHandler { MapleCharacter chr = c.getPlayer(); MapleMount mount = chr.getMount(); - Inventory useInv = chr.getInventory(MapleInventoryType.USE); + Inventory useInv = chr.getInventory(InventoryType.USE); if (c.tryacquireClient()) { try { @@ -73,7 +73,7 @@ public final class UseMountFoodHandler extends AbstractPacketHandler { mountLevelup = levelup; } - MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemid, 1, true, false); + MapleInventoryManipulator.removeById(c, InventoryType.USE, itemid, 1, true, false); } } finally { useInv.unlockInventory(); diff --git a/src/main/java/net/server/channel/handlers/UseSolomonHandler.java b/src/main/java/net/server/channel/handlers/UseSolomonHandler.java index d2b3533aa4..a3454e6842 100644 --- a/src/main/java/net/server/channel/handlers/UseSolomonHandler.java +++ b/src/main/java/net/server/channel/handlers/UseSolomonHandler.java @@ -24,8 +24,8 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -50,7 +50,7 @@ public final class UseSolomonHandler extends AbstractPacketHandler { if (c.tryacquireClient()) { try { MapleCharacter chr = c.getPlayer(); - Inventory inv = chr.getInventory(MapleInventoryType.USE); + Inventory inv = chr.getInventory(InventoryType.USE); inv.lockInventory(); try { Item slotItem = inv.getItem(slot); @@ -66,7 +66,7 @@ public final class UseSolomonHandler extends AbstractPacketHandler { return; } chr.addGachaExp((int) gachaexp); - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, slot, (short) 1, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); } finally { inv.unlockInventory(); } diff --git a/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java b/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java index 33e47be57d..87fef6afd5 100644 --- a/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java +++ b/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java @@ -22,8 +22,8 @@ package net.server.channel.handlers; import client.MapleClient; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -48,9 +48,9 @@ public final class UseSummonBagHandler extends AbstractPacketHandler { p.readInt(); short slot = p.readShort(); int itemId = p.readInt(); - Item toUse = c.getPlayer().getInventory(MapleInventoryType.USE).getItem(slot); + Item toUse = c.getPlayer().getInventory(InventoryType.USE).getItem(slot); if (toUse != null && toUse.getQuantity() > 0 && toUse.getItemId() == itemId) { - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, slot, (short) 1, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(itemId); for (int[] toSpawnChild : toSpawn) { if (Randomizer.nextInt(100) < toSpawnChild[1]) { diff --git a/src/main/java/net/server/channel/handlers/WeddingHandler.java b/src/main/java/net/server/channel/handlers/WeddingHandler.java index 37ec41c22c..fe79b7c6d7 100644 --- a/src/main/java/net/server/channel/handlers/WeddingHandler.java +++ b/src/main/java/net/server/channel/handlers/WeddingHandler.java @@ -10,8 +10,8 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; @@ -56,7 +56,7 @@ public final class WeddingHandler extends AbstractPacketHandler { if (chr.getId() != cid) { // cannot gift yourself MapleCharacter spouse = marriage.getPlayerById(cid); if (spouse != null) { - MapleInventoryType type = ItemConstants.getInventoryType(itemid); + InventoryType type = ItemConstants.getInventoryType(itemid); Inventory chrInv = chr.getInventory(type); Item newItem = null; diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index 3b8d0cc68c..5d0482cff5 100644 --- a/src/main/java/scripting/AbstractPlayerInteraction.java +++ b/src/main/java/scripting/AbstractPlayerInteraction.java @@ -170,10 +170,10 @@ public class AbstractPlayerInteraction { } public Inventory getInventory(int type) { - return getPlayer().getInventory(MapleInventoryType.getByType((byte) type)); + return getPlayer().getInventory(InventoryType.getByType((byte) type)); } - public Inventory getInventory(MapleInventoryType type) { + public Inventory getInventory(InventoryType type) { return getPlayer().getInventory(type); } @@ -245,7 +245,7 @@ public class AbstractPlayerInteraction { private boolean canHoldAll(List itemids, List quantity, boolean isInteger) { int size = Math.min(itemids.size(), quantity.size()); - List> addedItems = new LinkedList<>(); + List> addedItems = new LinkedList<>(); for(int i = 0; i < size; i++) { Item it = new Item(itemids.get(i), (short) 0, quantity.get(i).shortValue()); addedItems.add(new Pair<>(it, ItemConstants.getInventoryType(itemids.get(i)))); @@ -254,11 +254,11 @@ public class AbstractPlayerInteraction { return Inventory.checkSpots(c.getPlayer(), addedItems); } - private List> prepareProofInventoryItems(List> items) { - List> addedItems = new LinkedList<>(); + private List> prepareProofInventoryItems(List> items) { + List> addedItems = new LinkedList<>(); for(Pair p : items) { Item it = new Item(p.getLeft(), (short) 0, p.getRight().shortValue()); - addedItems.add(new Pair<>(it, MapleInventoryType.CANHOLD)); + addedItems.add(new Pair<>(it, InventoryType.CANHOLD)); } return addedItems; @@ -268,7 +268,7 @@ public class AbstractPlayerInteraction { int size = Math.min(itemids.size(), quantity.size()); List>> invList = new ArrayList<>(6); - for(int i = MapleInventoryType.UNDEFINED.getType(); i < MapleInventoryType.CASH.getType(); i++) { + for(int i = InventoryType.UNDEFINED.getType(); i < InventoryType.CASH.getType(); i++) { invList.add(new LinkedList<>()); } @@ -284,10 +284,10 @@ public class AbstractPlayerInteraction { List>> toAddItemList = prepareInventoryItemList(toAddItemids, toAddQuantity); List>> toRemoveItemList = prepareInventoryItemList(toRemoveItemids, toRemoveQuantity); - InventoryProof prfInv = (InventoryProof) this.getInventory(MapleInventoryType.CANHOLD); + InventoryProof prfInv = (InventoryProof) this.getInventory(InventoryType.CANHOLD); prfInv.lockInventory(); try { - for(int i = MapleInventoryType.EQUIP.getType(); i < MapleInventoryType.CASH.getType(); i++) { + for(int i = InventoryType.EQUIP.getType(); i < InventoryType.CASH.getType(); i++) { List> toAdd = toAddItemList.get(i); if(!toAdd.isEmpty()) { @@ -297,10 +297,10 @@ public class AbstractPlayerInteraction { prfInv.cloneContents(inv); for(Pair p : toRemove) { - MapleInventoryManipulator.removeById(c, MapleInventoryType.CANHOLD, p.getLeft(), p.getRight(), false, false); + MapleInventoryManipulator.removeById(c, InventoryType.CANHOLD, p.getLeft(), p.getRight(), false, false); } - List> addItems = prepareProofInventoryItems(toAdd); + List> addItems = prepareProofInventoryItems(toAdd); boolean canHold = Inventory.checkSpots(c.getPlayer(), addItems, true); if(!canHold) { @@ -532,7 +532,7 @@ public class AbstractPlayerInteraction { chr.getClient().getWorldServer().registerPetHunger(chr, chr.getPetIndex(evolved)); */ - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.CASH, target.getPosition(), (short) 1, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.CASH, target.getPosition(), (short) 1, false); return evolved; } @@ -593,7 +593,7 @@ public class AbstractPlayerInteraction { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - if (ItemConstants.getInventoryType(id).equals(MapleInventoryType.EQUIP)) { + if (ItemConstants.getInventoryType(id).equals(InventoryType.EQUIP)) { item = ii.getEquipById(id); if(item != null) { @@ -622,7 +622,7 @@ public class AbstractPlayerInteraction { c.getPlayer().dropMessage(1, "Your inventory is full. Please remove an item from your " + ItemConstants.getInventoryType(id).name() + " inventory."); return null; } - if (ItemConstants.getInventoryType(id) == MapleInventoryType.EQUIP) { + if (ItemConstants.getInventoryType(id) == InventoryType.EQUIP) { if (randomStats) { MapleInventoryManipulator.addFromDrop(c, ii.randomizeStats((Equip) item), false, petId); } else { @@ -842,7 +842,7 @@ public class AbstractPlayerInteraction { public void removeFromParty(int id, List party) { for (MapleCharacter chr : party) { - MapleInventoryType type = ItemConstants.getInventoryType(id); + InventoryType type = ItemConstants.getInventoryType(id); Inventory iv = chr.getInventory(type); int possesed = iv.countById(id); if (possesed > 0) { @@ -857,16 +857,16 @@ public class AbstractPlayerInteraction { } public void removeAll(int id, MapleClient cl) { - MapleInventoryType invType = ItemConstants.getInventoryType(id); + InventoryType invType = ItemConstants.getInventoryType(id); int possessed = cl.getPlayer().getInventory(invType).countById(id); if (possessed > 0) { MapleInventoryManipulator.removeById(cl, ItemConstants.getInventoryType(id), id, possessed, true, false); cl.sendPacket(PacketCreator.getShowItemGain(id, (short) -possessed, true)); } - if(invType == MapleInventoryType.EQUIP) { - if(cl.getPlayer().getInventory(MapleInventoryType.EQUIPPED).countById(id) > 0) { - MapleInventoryManipulator.removeById(cl, MapleInventoryType.EQUIPPED, id, 1, true, false); + if(invType == InventoryType.EQUIP) { + if(cl.getPlayer().getInventory(InventoryType.EQUIPPED).countById(id) > 0) { + MapleInventoryManipulator.removeById(cl, InventoryType.EQUIPPED, id, 1, true, false); cl.sendPacket(PacketCreator.getShowItemGain(id, (short) -1, true)); } } @@ -931,18 +931,18 @@ public class AbstractPlayerInteraction { } public void removeEquipFromSlot(short slot) { - Item tempItem = c.getPlayer().getInventory(MapleInventoryType.EQUIPPED).getItem(slot); - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.EQUIPPED, slot, tempItem.getQuantity(), false, false); + Item tempItem = c.getPlayer().getInventory(InventoryType.EQUIPPED).getItem(slot); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.EQUIPPED, slot, tempItem.getQuantity(), false, false); } public void gainAndEquip(int itemid, short slot) { - final Item old = c.getPlayer().getInventory(MapleInventoryType.EQUIPPED).getItem(slot); + final Item old = c.getPlayer().getInventory(InventoryType.EQUIPPED).getItem(slot); if (old != null) { - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.EQUIPPED, slot, old.getQuantity(), false, false); + MapleInventoryManipulator.removeFromSlot(c, InventoryType.EQUIPPED, slot, old.getQuantity(), false, false); } final Item newItem = MapleItemInformationProvider.getInstance().getEquipById(itemid); newItem.setPosition(slot); - c.getPlayer().getInventory(MapleInventoryType.EQUIPPED).addItemFromDB(newItem); + c.getPlayer().getInventory(InventoryType.EQUIPPED).addItemFromDB(newItem); c.sendPacket(PacketCreator.modifyInventory(false, Collections.singletonList(new ModifyInventory(0, newItem)))); } @@ -1117,7 +1117,7 @@ public class AbstractPlayerInteraction { List list = new LinkedList<>(); long curTime = System.currentTimeMillis(); - for(Item it : getPlayer().getInventory(MapleInventoryType.CASH).list()) { + for(Item it : getPlayer().getInventory(InventoryType.CASH).list()) { if(ItemConstants.isPet(it.getItemId()) && it.getExpiration() < curTime) { MaplePet pet = it.getPet(); if (pet != null) { diff --git a/src/main/java/scripting/reactor/ReactorActionManager.java b/src/main/java/scripting/reactor/ReactorActionManager.java index 4140a79155..664b13f7e5 100644 --- a/src/main/java/scripting/reactor/ReactorActionManager.java +++ b/src/main/java/scripting/reactor/ReactorActionManager.java @@ -24,8 +24,8 @@ package scripting.reactor; import client.MapleCharacter; import client.MapleClient; import client.inventory.Equip; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import config.YamlConfig; import constants.inventory.ItemConstants; import scripting.AbstractPlayerInteraction; @@ -175,7 +175,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction { } else { Item drop; - if (ItemConstants.getInventoryType(d.itemId) != MapleInventoryType.EQUIP) { + if (ItemConstants.getInventoryType(d.itemId) != InventoryType.EQUIP) { drop = new Item(d.itemId, (short) 0, (short) 1); } else { drop = ii.randomizeStats((Equip) ii.getEquipById(d.itemId)); @@ -206,7 +206,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction { } else { Item drop; - if (ItemConstants.getInventoryType(d.itemId) != MapleInventoryType.EQUIP) { + if (ItemConstants.getInventoryType(d.itemId) != InventoryType.EQUIP) { drop = new Item(d.itemId, (short) 0, (short) 1); } else { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); diff --git a/src/main/java/server/CashShop.java b/src/main/java/server/CashShop.java index 07362d3b22..9966bcc25e 100644 --- a/src/main/java/server/CashShop.java +++ b/src/main/java/server/CashShop.java @@ -90,7 +90,7 @@ public class CashShop { petid = MaplePet.createPet(itemId); } - if (ItemConstants.getInventoryType(itemId).equals(MapleInventoryType.EQUIP)) { + if (ItemConstants.getInventoryType(itemId).equals(InventoryType.EQUIP)) { item = MapleItemInformationProvider.getInstance().getEquipById(itemId); } else { item = new Item(itemId, (byte) 0, count, petid); @@ -277,7 +277,7 @@ public class CashShop { } } - for (Pair item : factory.loadItems(accountId, false)) { + for (Pair item : factory.loadItems(accountId, false)) { inventory.add(item.getLeft()); } @@ -348,7 +348,7 @@ public class CashShop { boolean isRing; Equip equip = null; for (Item item : getInventory()) { - if (item.getInventoryType().equals(MapleInventoryType.EQUIP)) { + if (item.getInventoryType().equals(InventoryType.EQUIP)) { equip = (Equip) item; isRing = equip.getRingId() > -1; } else { @@ -426,7 +426,7 @@ public class CashShop { Item item = cItem.toItem(); Equip equip = null; item.setGiftFrom(rs.getString("from")); - if (item.getInventoryType().equals(MapleInventoryType.EQUIP)) { + if (item.getInventoryType().equals(InventoryType.EQUIP)) { equip = (Equip) item; equip.setRingId(rs.getInt("ringid")); gifts.add(new Pair<>(equip, rs.getString("message"))); @@ -474,7 +474,7 @@ public class CashShop { ps.executeUpdate(); } - List> itemsWithType = new ArrayList<>(); + List> itemsWithType = new ArrayList<>(); List inv = getInventory(); for (Item item : inv) { diff --git a/src/main/java/server/MapleItemInformationProvider.java b/src/main/java/server/MapleItemInformationProvider.java index 5dca23d0dd..46b6efe186 100644 --- a/src/main/java/server/MapleItemInformationProvider.java +++ b/src/main/java/server/MapleItemInformationProvider.java @@ -345,7 +345,7 @@ public class MapleItemInformationProvider { if (item != null) { MapleData smEntry = item.getChildByPath("info/slotMax"); if (smEntry == null) { - if (ItemConstants.getInventoryType(itemId).getType() == MapleInventoryType.EQUIP.getType()) { + if (ItemConstants.getInventoryType(itemId).getType() == InventoryType.EQUIP.getType()) { ret = 1; } else { ret = 100; @@ -1581,7 +1581,7 @@ public class MapleItemInformationProvider { } public Collection canWearEquipment(MapleCharacter chr, Collection items) { - Inventory inv = chr.getInventory(MapleInventoryType.EQUIPPED); + Inventory inv = chr.getInventory(InventoryType.EQUIPPED); if (inv.checked()) { return items; } @@ -1597,8 +1597,8 @@ public class MapleItemInformationProvider { boolean highfivestamp = false; /* Removed because players shouldn't even get this, and gm's should just be gm job. try { - for (Pair ii : ItemFactory.INVENTORY.loadItems(chr.getId(), false)) { - if (ii.getRight() == MapleInventoryType.CASH) { + for (Pair ii : ItemFactory.INVENTORY.loadItems(chr.getId(), false)) { + if (ii.getRight() == InventoryType.CASH) { if (ii.getLeft().getItemId() == 5590000) { highfivestamp = true; } @@ -1683,8 +1683,8 @@ public class MapleItemInformationProvider { boolean highfivestamp = false; /* Removed check above for message >< try { - for (Pair ii : ItemFactory.INVENTORY.loadItems(chr.getId(), false)) { - if (ii.getRight() == MapleInventoryType.CASH) { + for (Pair ii : ItemFactory.INVENTORY.loadItems(chr.getId(), false)) { + if (ii.getRight() == InventoryType.CASH) { if (ii.getLeft().getItemId() == 5590000) { highfivestamp = true; } diff --git a/src/main/java/server/MapleMarriage.java b/src/main/java/server/MapleMarriage.java index ee3200c552..52fc7fd55d 100644 --- a/src/main/java/server/MapleMarriage.java +++ b/src/main/java/server/MapleMarriage.java @@ -22,9 +22,9 @@ package server; import client.MapleCharacter; import client.MapleClient; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.ItemFactory; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import scripting.event.EventInstanceManager; import scripting.event.EventManager; @@ -139,7 +139,7 @@ public class MapleMarriage extends EventInstanceManager { List items = new LinkedList<>(); try { - for (Pair it : ItemFactory.MARRIAGE_GIFTS.loadItems(cid, false)) { + for (Pair it : ItemFactory.MARRIAGE_GIFTS.loadItems(cid, false)) { items.add(it.getLeft()); } } catch (SQLException sqle) { @@ -154,7 +154,7 @@ public class MapleMarriage extends EventInstanceManager { } public static void saveGiftItemsToDb(MapleClient c, List giftItems, int cid) { - List> items = new LinkedList<>(); + List> items = new LinkedList<>(); for (Item it : giftItems) { items.add(new Pair<>(it, it.getInventoryType())); } diff --git a/src/main/java/server/MapleShop.java b/src/main/java/server/MapleShop.java index 86e1ff085b..838ffee992 100644 --- a/src/main/java/server/MapleShop.java +++ b/src/main/java/server/MapleShop.java @@ -22,8 +22,8 @@ package server; import client.MapleClient; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.MaplePet; import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; @@ -113,24 +113,24 @@ public class MapleShop { } else if (item.getPitch() > 0) { int amount = (int)Math.min((float) item.getPitch() * quantity, Integer.MAX_VALUE); - if (c.getPlayer().getInventory(MapleInventoryType.ETC).countById(4310000) >= amount) { + if (c.getPlayer().getInventory(InventoryType.ETC).countById(4310000) >= amount) { if (MapleInventoryManipulator.checkSpace(c, itemId, quantity, "")) { if (!ItemConstants.isRechargeable(itemId)) { MapleInventoryManipulator.addById(c, itemId, quantity, "", -1); - MapleInventoryManipulator.removeById(c, MapleInventoryType.ETC, 4310000, amount, false, false); + MapleInventoryManipulator.removeById(c, InventoryType.ETC, 4310000, amount, false, false); } else { short slotMax = ii.getSlotMax(c, item.getItemId()); quantity = slotMax; MapleInventoryManipulator.addById(c, itemId, quantity, "", -1); - MapleInventoryManipulator.removeById(c, MapleInventoryType.ETC, 4310000, amount, false, false); + MapleInventoryManipulator.removeById(c, InventoryType.ETC, 4310000, amount, false, false); } c.sendPacket(PacketCreator.shopTransaction((byte) 0)); } else c.sendPacket(PacketCreator.shopTransaction((byte) 3)); } - } else if (c.getPlayer().getInventory(MapleInventoryType.CASH).countById(token) != 0) { - int amount = c.getPlayer().getInventory(MapleInventoryType.CASH).countById(token); + } else if (c.getPlayer().getInventory(InventoryType.CASH).countById(token) != 0) { + int amount = c.getPlayer().getInventory(InventoryType.CASH).countById(token); int value = amount * tokenvalue; int cost = item.getPrice() * quantity; if (c.getPlayer().getMeso() + value >= cost) { @@ -186,7 +186,7 @@ public class MapleShop { return quantity; } - public void sell(MapleClient c, MapleInventoryType type, short slot, short quantity) { + public void sell(MapleClient c, InventoryType type, short slot, short quantity) { if (quantity == 0xFFFF || quantity == 0) { quantity = 1; } else if (quantity < 0) { @@ -211,7 +211,7 @@ public class MapleShop { public void recharge(MapleClient c, short slot) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - Item item = c.getPlayer().getInventory(MapleInventoryType.USE).getItem(slot); + Item item = c.getPlayer().getInventory(InventoryType.USE).getItem(slot); if (item == null || !ItemConstants.isRechargeable(item.getItemId())) { return; } diff --git a/src/main/java/server/MapleStatEffect.java b/src/main/java/server/MapleStatEffect.java index 3eea513439..ec64e15dbd 100644 --- a/src/main/java/server/MapleStatEffect.java +++ b/src/main/java/server/MapleStatEffect.java @@ -23,8 +23,8 @@ package server; import client.*; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.status.MonsterStatus; import client.status.MonsterStatusEffect; @@ -940,7 +940,7 @@ public class MapleStatEffect { if (isShadowClaw()) { short projectileConsume = this.getBulletConsume(); // noticed by shavit - Inventory use = applyto.getInventory(MapleInventoryType.USE); + Inventory use = applyto.getInventory(InventoryType.USE); use.lockInventory(); try { Item projectile = null; @@ -956,7 +956,7 @@ public class MapleStatEffect { if (projectile == null) { return false; } else { - MapleInventoryManipulator.removeFromSlot(applyto.getClient(), MapleInventoryType.USE, projectile.getPosition(), projectileConsume, false, true); + MapleInventoryManipulator.removeFromSlot(applyto.getClient(), InventoryType.USE, projectile.getPosition(), projectileConsume, false, true); } } finally { use.unlockInventory(); @@ -1225,7 +1225,7 @@ public class MapleStatEffect { MapleMount givemount = null; if (isMonsterRiding()) { int ridingMountId = 0; - Item mount = applyfrom.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -18); + Item mount = applyfrom.getInventory(InventoryType.EQUIPPED).getItem((short) -18); if (mount != null) { ridingMountId = mount.getItemId(); } diff --git a/src/main/java/server/MapleStorage.java b/src/main/java/server/MapleStorage.java index 046b2ec154..adbcbcfeff 100644 --- a/src/main/java/server/MapleStorage.java +++ b/src/main/java/server/MapleStorage.java @@ -19,9 +19,9 @@ package server; import client.MapleClient; +import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.ItemFactory; -import client.inventory.MapleInventoryType; import constants.game.GameConstants; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; @@ -54,7 +54,7 @@ public class MapleStorage { private int currentNpcid; private int meso; private byte slots; - private Map> typeItems = new HashMap<>(); + private Map> typeItems = new HashMap<>(); private List items = new LinkedList<>(); private Lock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.STORAGE, true); @@ -85,7 +85,7 @@ public class MapleStorage { try (ResultSet rs = ps.executeQuery()) { if (rs.next()) { ret = new MapleStorage(rs.getInt("storageid"), (byte) rs.getInt("slots"), rs.getInt("meso")); - for (Pair item : ItemFactory.STORAGE.loadItems(ret.id, false)) { + for (Pair item : ItemFactory.STORAGE.loadItems(ret.id, false)) { ret.items.add(item.getLeft()); } } else { @@ -132,7 +132,7 @@ public class MapleStorage { ps.setInt(3, id); ps.executeUpdate(); } - List> itemsWithType = new ArrayList<>(); + List> itemsWithType = new ArrayList<>(); List list = getItems(); for (Item item : list) { @@ -159,7 +159,7 @@ public class MapleStorage { try { boolean ret = items.remove(item); - MapleInventoryType type = item.getInventoryType(); + InventoryType type = item.getInventoryType(); typeItems.put(type, new ArrayList<>(filterItems(type))); return ret; @@ -177,7 +177,7 @@ public class MapleStorage { items.add(item); - MapleInventoryType type = item.getInventoryType(); + InventoryType type = item.getInventoryType(); typeItems.put(type, new ArrayList<>(filterItems(type))); return true; @@ -195,7 +195,7 @@ public class MapleStorage { } } - private List filterItems(MapleInventoryType type) { + private List filterItems(InventoryType type) { List storageItems = getItems(); List ret = new LinkedList<>(); @@ -207,7 +207,7 @@ public class MapleStorage { return ret; } - public byte getSlot(MapleInventoryType type, byte slot) { + public byte getSlot(InventoryType type, byte slot) { lock.lock(); try { byte ret = 0; @@ -243,7 +243,7 @@ public class MapleStorage { }); List storageItems = getItems(); - for (MapleInventoryType type : MapleInventoryType.values()) { + for (InventoryType type : InventoryType.values()) { typeItems.put(type, new ArrayList<>(storageItems)); } @@ -254,7 +254,7 @@ public class MapleStorage { } } - public void sendStored(MapleClient c, MapleInventoryType type) { + public void sendStored(MapleClient c, InventoryType type) { lock.lock(); try { c.sendPacket(PacketCreator.storeStorage(slots, type, typeItems.get(type))); @@ -263,7 +263,7 @@ public class MapleStorage { } } - public void sendTakenOut(MapleClient c, MapleInventoryType type) { + public void sendTakenOut(MapleClient c, InventoryType type) { lock.lock(); try { c.sendPacket(PacketCreator.takeOutStorage(slots, type, typeItems.get(type))); @@ -279,7 +279,7 @@ public class MapleStorage { msi.mergeItems(); items = msi.sortItems(); - for (MapleInventoryType type : MapleInventoryType.values()) { + for (InventoryType type : InventoryType.values()) { typeItems.put(type, new ArrayList<>(items)); } diff --git a/src/main/java/server/MapleTrade.java b/src/main/java/server/MapleTrade.java index 1aee9d427c..a8df4db60e 100644 --- a/src/main/java/server/MapleTrade.java +++ b/src/main/java/server/MapleTrade.java @@ -23,8 +23,8 @@ package server; import client.MapleCharacter; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; @@ -246,7 +246,7 @@ public class MapleTrade { } private boolean fitsInInventory() { - List> tradeItems = new LinkedList<>(); + List> tradeItems = new LinkedList<>(); for (Item item : exchangeItems) { tradeItems.add(new Pair<>(item, item.getInventoryType())); } diff --git a/src/main/java/server/life/MaplePlayerNPC.java b/src/main/java/server/life/MaplePlayerNPC.java index cec6d892f4..6f1cc05ca7 100644 --- a/src/main/java/server/life/MaplePlayerNPC.java +++ b/src/main/java/server/life/MaplePlayerNPC.java @@ -23,8 +23,8 @@ package server.life; import client.MapleCharacter; import client.MapleClient; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import config.YamlConfig; import constants.game.GameConstants; import net.server.Server; @@ -451,7 +451,7 @@ public class MaplePlayerNPC extends AbstractMapleMapObject { try (PreparedStatement ps = con.prepareStatement("INSERT INTO playernpcs_equip (npcid, equipid, equippos) VALUES (?, ?, ?)")) { ps.setInt(1, npcId); - for (Item equip : chr.getInventory(MapleInventoryType.EQUIPPED)) { + for (Item equip : chr.getInventory(InventoryType.EQUIPPED)) { int position = Math.abs(equip.getPosition()); if ((position < 12 && position > 0) || (position > 100 && position < 112)) { ps.setInt(2, equip.getItemId()); diff --git a/src/main/java/server/loot/MapleLootInventory.java b/src/main/java/server/loot/MapleLootInventory.java index 3810ea4963..ebb0b7589a 100644 --- a/src/main/java/server/loot/MapleLootInventory.java +++ b/src/main/java/server/loot/MapleLootInventory.java @@ -20,10 +20,11 @@ package server.loot; import client.MapleCharacter; +import client.inventory.InventoryType; +import client.inventory.Item; + import java.util.HashMap; import java.util.Map; -import client.inventory.Item; -import client.inventory.MapleInventoryType; /** @@ -34,7 +35,7 @@ public class MapleLootInventory { Map items = new HashMap<>(50); public MapleLootInventory(MapleCharacter from) { - for (MapleInventoryType values : MapleInventoryType.values()) { + for (InventoryType values : InventoryType.values()) { for(Item it : from.getInventory(values).list()) { Integer itemQty = items.get(it.getItemId()); diff --git a/src/main/java/server/maps/MapleHiredMerchant.java b/src/main/java/server/maps/MapleHiredMerchant.java index e2343658ed..8b63d0f0ab 100644 --- a/src/main/java/server/maps/MapleHiredMerchant.java +++ b/src/main/java/server/maps/MapleHiredMerchant.java @@ -24,9 +24,9 @@ package server.maps; import client.MapleCharacter; import client.MapleClient; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.ItemFactory; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import client.processor.npc.FredrickProcessor; @@ -266,7 +266,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { if (quantity < 1 || !pItem.isExist() || pItem.getBundles() < quantity) { c.sendPacket(PacketCreator.enableActions()); return; - } else if (newItem.getInventoryType().equals(MapleInventoryType.EQUIP) && newItem.getQuantity() > 1) { + } else if (newItem.getInventoryType().equals(InventoryType.EQUIP) && newItem.getQuantity() > 1) { c.sendPacket(PacketCreator.enableActions()); return; } @@ -410,7 +410,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { if (check(c.getPlayer(), copyItems) && !timeout) { for (MaplePlayerShopItem mpsi : copyItems) { if (mpsi.isExist()) { - if (mpsi.getItem().getInventoryType().equals(MapleInventoryType.EQUIP)) { + if (mpsi.getItem().getInventoryType().equals(InventoryType.EQUIP)) { MapleInventoryManipulator.addFromDrop(c, mpsi.getItem(), false); } else { MapleInventoryManipulator.addById(c, mpsi.getItem().getItemId(), (short) (mpsi.getBundles() * mpsi.getItem().getQuantity()), mpsi.getItem().getOwner(), -1, mpsi.getItem().getFlag(), mpsi.getItem().getExpiration()); @@ -622,7 +622,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { } public void saveItems(boolean shutdown) throws SQLException { - List> itemsWithType = new ArrayList<>(); + List> itemsWithType = new ArrayList<>(); List bundles = new ArrayList<>(); for (MaplePlayerShopItem pItems : getItems()) { @@ -648,7 +648,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { } private static boolean check(MapleCharacter chr, List items) { - List> li = new ArrayList<>(); + List> li = new ArrayList<>(); for (MaplePlayerShopItem item : items) { Item it = item.getItem().copy(); it.setQuantity((short)(it.getQuantity() * item.getBundles())); diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index 57322bd8ed..d8e2fe8b10 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -26,8 +26,8 @@ import client.MapleCharacter; import client.MapleClient; import client.autoban.AutobanFactory; import client.inventory.Equip; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.MaplePet; import client.status.MonsterStatus; import client.status.MonsterStatusEffect; @@ -659,7 +659,7 @@ public class MapleMap { spawnMesoDrop(mesos, calcDropPos(pos, mob.getPosition()), mob, chr, false, droptype); } } else { - if (ItemConstants.getInventoryType(de.itemId) == MapleInventoryType.EQUIP) { + if (ItemConstants.getInventoryType(de.itemId) == InventoryType.EQUIP) { idrop = ii.randomizeStats((Equip) ii.getEquipById(de.itemId)); } else { idrop = new Item(de.itemId, (short) 0, (short) (de.Maximum != 1 ? Randomizer.nextInt(de.Maximum - de.Minimum) + de.Minimum : 1)); @@ -687,7 +687,7 @@ public class MapleMap { pos.x = mobpos + ((d % 2 == 0) ? (25 * (d + 1) / 2) : -(25 * (d / 2))); } if (de.itemId != 0) { - if (ItemConstants.getInventoryType(de.itemId) == MapleInventoryType.EQUIP) { + if (ItemConstants.getInventoryType(de.itemId) == InventoryType.EQUIP) { idrop = ii.randomizeStats((Equip) ii.getEquipById(de.itemId)); } else { idrop = new Item(de.itemId, (short) 0, (short) (de.Maximum != 1 ? Randomizer.nextInt(de.Maximum - de.Minimum) + de.Minimum : 1)); @@ -2189,7 +2189,7 @@ public class MapleMap { final Item drop; int randomedId = integer; - if (ItemConstants.getInventoryType(randomedId) != MapleInventoryType.EQUIP) { + if (ItemConstants.getInventoryType(randomedId) != InventoryType.EQUIP) { drop = new Item(randomedId, (short) 0, (short) (rnd.nextInt(copies) + minCopies)); } else { drop = ii.randomizeStats((Equip) ii.getEquipById(randomedId)); diff --git a/src/main/java/server/maps/MaplePlayerShop.java b/src/main/java/server/maps/MaplePlayerShop.java index cc5fa3df31..8c463de2ab 100644 --- a/src/main/java/server/maps/MaplePlayerShop.java +++ b/src/main/java/server/maps/MaplePlayerShop.java @@ -24,8 +24,8 @@ package server.maps; import client.MapleCharacter; import client.MapleClient; import client.inventory.Inventory; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import net.packet.Packet; @@ -255,7 +255,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { if (quantity < 1 || !pItem.isExist() || pItem.getBundles() < quantity) { c.sendPacket(PacketCreator.enableActions()); return false; - } else if (newItem.getInventoryType().equals(MapleInventoryType.EQUIP) && newItem.getQuantity() > 1) { + } else if (newItem.getInventoryType().equals(InventoryType.EQUIP) && newItem.getQuantity() > 1) { c.sendPacket(PacketCreator.enableActions()); return false; } diff --git a/src/main/java/server/quest/actions/ItemAction.java b/src/main/java/server/quest/actions/ItemAction.java index 84757d42bc..e54ca48b85 100644 --- a/src/main/java/server/quest/actions/ItemAction.java +++ b/src/main/java/server/quest/actions/ItemAction.java @@ -23,8 +23,8 @@ package server.quest.actions; import client.MapleCharacter; import client.MapleClient; +import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleInventoryType; import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; import provider.MapleData; @@ -130,14 +130,14 @@ public class ItemAction extends MapleQuestAction { for(ItemData iEntry: takeItem) { int itemid = iEntry.getId(), count = iEntry.getCount(); - MapleInventoryType type = ItemConstants.getInventoryType(itemid); + InventoryType type = ItemConstants.getInventoryType(itemid); int quantity = count * -1; // Invert - if(type.equals(MapleInventoryType.EQUIP)) { + if(type.equals(InventoryType.EQUIP)) { if(chr.getInventory(type).countById(itemid) < quantity) { // Not enough in the equip inventoty, so check Equipped... - if(chr.getInventory(MapleInventoryType.EQUIPPED).countById(itemid) > quantity) { + if(chr.getInventory(InventoryType.EQUIPPED).countById(itemid) > quantity) { // Found it equipped, so change the type to equipped. - type = MapleInventoryType.EQUIPPED; + type = InventoryType.EQUIPPED; } } } @@ -156,9 +156,9 @@ public class ItemAction extends MapleQuestAction { @Override public boolean check(MapleCharacter chr, Integer extSelection) { - List> gainList = new LinkedList<>(); - List> selectList = new LinkedList<>(); - List> randomList = new LinkedList<>(); + List> gainList = new LinkedList<>(); + List> selectList = new LinkedList<>(); + List> randomList = new LinkedList<>(); List allSlotUsed = new ArrayList(5); for(byte i = 0; i < 5; i++) allSlotUsed.add(0); @@ -168,7 +168,7 @@ public class ItemAction extends MapleQuestAction { continue; } - MapleInventoryType type = ItemConstants.getInventoryType(item.getId()); + InventoryType type = ItemConstants.getInventoryType(item.getId()); if(item.getProp() != null) { Item toItem = new Item(item.getId(), (short) 0, (short) item.getCount()); @@ -189,7 +189,7 @@ public class ItemAction extends MapleQuestAction { int freeSlotCount = chr.getInventory(type).freeSlotCountById(item.getId(), quantity); if(freeSlotCount == -1) { - if(type.equals(MapleInventoryType.EQUIP) && chr.getInventory(MapleInventoryType.EQUIPPED).countById(item.getId()) > quantity) + if(type.equals(InventoryType.EQUIP) && chr.getInventory(InventoryType.EQUIPPED).countById(item.getId()) > quantity) continue; announceInventoryLimit(Collections.singletonList(item.getId()), chr); @@ -209,7 +209,7 @@ public class ItemAction extends MapleQuestAction { List rndUsed = new ArrayList(5); for(byte i = 0; i < 5; i++) rndUsed.add(allSlotUsed.get(i)); - for(Pair it: randomList) { + for(Pair it: randomList) { int idx = it.getRight().getType() - 1; result = MapleInventoryManipulator.checkSpaceProgressively(c, it.getLeft().getItemId(), it.getLeft().getQuantity(), "", rndUsed.get(idx), false); @@ -223,13 +223,13 @@ public class ItemAction extends MapleQuestAction { } if(!selectList.isEmpty()) { - Pair selected = selectList.get(extSelection); + Pair selected = selectList.get(extSelection); gainList.add(selected); } if (!canHold(chr, gainList)) { List gainItemids = new LinkedList<>(); - for (Pair it : gainList) { + for (Pair it : gainList) { gainItemids.add(it.getLeft().getItemId()); } @@ -250,13 +250,13 @@ public class ItemAction extends MapleQuestAction { chr.dropMessage(1, "Please check if you have enough space in your inventory."); } - private boolean canHold(MapleCharacter chr, List> gainList) { + private boolean canHold(MapleCharacter chr, List> gainList) { List toAddItemids = new LinkedList<>(); List toAddQuantity = new LinkedList<>(); List toRemoveItemids = new LinkedList<>(); List toRemoveQuantity = new LinkedList<>(); - for (Pair item : gainList) { + for (Pair item : gainList) { Item it = item.getLeft(); if (it.getQuantity() > 0) { diff --git a/src/main/java/server/quest/requirements/ItemRequirement.java b/src/main/java/server/quest/requirements/ItemRequirement.java index 67eb679c28..a0681a8d4f 100644 --- a/src/main/java/server/quest/requirements/ItemRequirement.java +++ b/src/main/java/server/quest/requirements/ItemRequirement.java @@ -21,18 +21,18 @@ */ package server.quest.requirements; -import java.util.HashMap; -import java.util.Map; - +import client.MapleCharacter; +import client.inventory.InventoryType; +import client.inventory.Item; +import constants.inventory.ItemConstants; import provider.MapleData; import provider.MapleDataTool; import server.MapleItemInformationProvider; import server.quest.MapleQuest; import server.quest.MapleQuestRequirementType; -import client.MapleCharacter; -import client.inventory.Item; -import client.inventory.MapleInventoryType; -import constants.inventory.ItemConstants; + +import java.util.HashMap; +import java.util.Map; /** * @@ -65,23 +65,23 @@ public class ItemRequirement extends MapleQuestRequirement { int countNeeded = items.get(itemId); int count = 0; - MapleInventoryType iType = ItemConstants.getInventoryType(itemId); + InventoryType iType = ItemConstants.getInventoryType(itemId); - if (iType.equals(MapleInventoryType.UNDEFINED)) { + if (iType.equals(InventoryType.UNDEFINED)) { return false; } for (Item item : chr.getInventory(iType).listById(itemId)) { count += item.getQuantity(); } //Weird stuff, nexon made some quests only available when wearing gm clothes. This enables us to accept it >< - if (iType.equals(MapleInventoryType.EQUIP) && !ItemConstants.isMedal(itemId)) { + if (iType.equals(InventoryType.EQUIP) && !ItemConstants.isMedal(itemId)) { if(chr.isGM()) { - for (Item item : chr.getInventory(MapleInventoryType.EQUIPPED).listById(itemId)) { + for (Item item : chr.getInventory(InventoryType.EQUIPPED).listById(itemId)) { count += item.getQuantity(); } } else { if(count < countNeeded) { - if(chr.getInventory(MapleInventoryType.EQUIPPED).countById(itemId) + count >= countNeeded) { + if(chr.getInventory(InventoryType.EQUIPPED).countById(itemId) + count >= countNeeded) { chr.dropMessage(5, "Unequip the required " + ii.getName(itemId) + " before trying this quest operation."); return false; } diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index c3ebe4d167..fbf5561a0f 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -246,7 +246,7 @@ public class PacketCreator { } private static void addCharEquips(final OutPacket p, MapleCharacter chr) { - Inventory equip = chr.getInventory(MapleInventoryType.EQUIPPED); + Inventory equip = chr.getInventory(InventoryType.EQUIPPED); Collection ii = MapleItemInformationProvider.getInstance().canWearEquipment(chr, equip.list()); Map myEquip = new LinkedHashMap<>(); Map maskedEquip = new LinkedHashMap<>(); @@ -441,10 +441,10 @@ public class PacketCreator { private static void addInventoryInfo(OutPacket p, MapleCharacter chr) { for (byte i = 1; i <= 5; i++) { - p.writeByte(chr.getInventory(MapleInventoryType.getByType(i)).getSlotLimit()); + p.writeByte(chr.getInventory(InventoryType.getByType(i)).getSlotLimit()); } p.writeLong(getTime(-2)); - Inventory iv = chr.getInventory(MapleInventoryType.EQUIPPED); + Inventory iv = chr.getInventory(InventoryType.EQUIPPED); Collection equippedC = iv.list(); List equipped = new ArrayList<>(equippedC.size()); List equippedCash = new ArrayList<>(equippedC.size()); @@ -463,23 +463,23 @@ public class PacketCreator { addItemInfo(p, item); } p.writeShort(0); // start of equip inventory - for (Item item : chr.getInventory(MapleInventoryType.EQUIP).list()) { + for (Item item : chr.getInventory(InventoryType.EQUIP).list()) { addItemInfo(p, item); } p.writeInt(0); - for (Item item : chr.getInventory(MapleInventoryType.USE).list()) { + for (Item item : chr.getInventory(InventoryType.USE).list()) { addItemInfo(p, item); } p.writeByte(0); - for (Item item : chr.getInventory(MapleInventoryType.SETUP).list()) { + for (Item item : chr.getInventory(InventoryType.SETUP).list()) { addItemInfo(p, item); } p.writeByte(0); - for (Item item : chr.getInventory(MapleInventoryType.ETC).list()) { + for (Item item : chr.getInventory(InventoryType.ETC).list()) { addItemInfo(p, item); } p.writeByte(0); - for (Item item : chr.getInventory(MapleInventoryType.CASH).list()) { + for (Item item : chr.getInventory(InventoryType.CASH).list()) { addItemInfo(p, item); } } @@ -1921,9 +1921,9 @@ public class PacketCreator { }*/ addCharLook(p, chr, false); - p.writeInt(chr.getInventory(MapleInventoryType.CASH).countById(5110000)); + p.writeInt(chr.getInventory(InventoryType.CASH).countById(5110000)); p.writeInt(chr.getItemEffect()); - p.writeInt(ItemConstants.getInventoryType(chr.getChair()) == MapleInventoryType.SETUP ? chr.getChair() : 0); + p.writeInt(ItemConstants.getInventoryType(chr.getChair()) == InventoryType.SETUP ? chr.getChair() : 0); if (enteringField) { Point spawnPos = new Point(chr.getPosition()); @@ -2694,7 +2694,7 @@ public class PacketCreator { p.writeByte(0); // pMedalInfo, thanks to Arnah (Vertisy) MaplePet[] pets = chr.getPets(); - Item inv = chr.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -114); + Item inv = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -114); for (int i = 0; i < 3; i++) { if (pets[i] != null) { p.writeByte(pets[i].getUniqueId()); @@ -2710,7 +2710,7 @@ public class PacketCreator { p.writeByte(0); //end of pets Item mount; //mounts can potentially crash the client if the player's level is not properly checked - if (chr.getMount() != null && (mount = chr.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -18)) != null && MapleItemInformationProvider.getInstance().getEquipLevelReq(mount.getItemId()) <= chr.getLevel()) { + if (chr.getMount() != null && (mount = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -18)) != null && MapleItemInformationProvider.getInstance().getEquipLevelReq(mount.getItemId()) <= chr.getLevel()) { MapleMount mmount = chr.getMount(); p.writeByte(mmount.getId()); //mount p.writeInt(mmount.getLevel()); //level @@ -2730,7 +2730,7 @@ public class PacketCreator { p.writeInt(book.getSpecialCard()); p.writeInt(book.getTotalCards()); p.writeInt(chr.getMonsterBookCover() > 0 ? MapleItemInformationProvider.getInstance().getCardMobId(chr.getMonsterBookCover()) : 0); - Item medal = chr.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -49); + Item medal = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -49); if (medal != null) { p.writeInt(medal.getItemId()); } else { @@ -3552,7 +3552,7 @@ public class PacketCreator { return p; } - public static Packet storeStorage(byte slots, MapleInventoryType type, Collection items) { + public static Packet storeStorage(byte slots, InventoryType type, Collection items) { final OutPacket p = OutPacket.create(SendOpcode.STORAGE); p.writeByte(0xD); p.writeByte(slots); @@ -3566,7 +3566,7 @@ public class PacketCreator { return p; } - public static Packet takeOutStorage(byte slots, MapleInventoryType type, Collection items) { + public static Packet takeOutStorage(byte slots, InventoryType type, Collection items) { final OutPacket p = OutPacket.create(SendOpcode.STORAGE); p.writeByte(0x9); p.writeByte(slots); @@ -4929,10 +4929,10 @@ public class PacketCreator { p.writeInt(chr.getMerchantNetMeso()); p.writeByte(0); try { - List> items = ItemFactory.MERCHANT.loadItems(chr.getId(), false); + List> items = ItemFactory.MERCHANT.loadItems(chr.getId(), false); p.writeByte(items.size()); - for (Pair item : items) { + for (Pair item : items) { addItemInfo(p, item.getLeft(), true); } } catch (SQLException e) { @@ -5040,7 +5040,7 @@ public class PacketCreator { } p.writeByte(itemType); - if (itemType == MapleInventoryType.EQUIP.getType()) { + if (itemType == InventoryType.EQUIP.getType()) { addItemInfo(p, item.getItem(), true); } } @@ -6895,7 +6895,7 @@ public class PacketCreator { boolean isGift = giftMessage != null; boolean isRing = false; Equip equip = null; - if (item.getInventoryType().equals(MapleInventoryType.EQUIP)) { + if (item.getInventoryType().equals(InventoryType.EQUIP)) { equip = (Equip) item; isRing = equip.getRingId() > -1; } From 6ca5abd8962f9f138f9804658534680e3ddecc83 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 20:51:30 +0200 Subject: [PATCH 003/125] Rename and clean up MaplePet --- scripts/quest/4659.js | 2 +- src/main/java/client/MapleCharacter.java | 30 ++++---- .../command/commands/gm2/ItemCommand.java | 4 +- .../command/commands/gm2/ItemDropCommand.java | 4 +- .../command/commands/gm4/ForceVacCommand.java | 4 +- src/main/java/client/inventory/Item.java | 6 +- .../inventory/{MaplePet.java => Pet.java} | 72 ++++++++++--------- .../MapleInventoryManipulator.java | 4 +- .../processor/action/SpawnPetProcessor.java | 6 +- .../channel/handlers/PetCommandHandler.java | 4 +- .../handlers/PetExcludeItemsHandler.java | 4 +- .../channel/handlers/PetFoodHandler.java | 6 +- .../channel/handlers/PetLootHandler.java | 4 +- .../handlers/PlayerLoggedinHandler.java | 2 +- .../channel/handlers/UseCashItemHandler.java | 4 +- .../scripting/AbstractPlayerInteraction.java | 20 +++--- .../scripting/npc/NPCConversationManager.java | 4 +- src/main/java/server/CashShop.java | 2 +- src/main/java/server/MapleShop.java | 4 +- src/main/java/server/maps/MapleMap.java | 6 +- .../server/quest/actions/PetSpeedAction.java | 9 ++- .../quest/actions/PetTamenessAction.java | 6 +- .../requirements/MinTamenessRequirement.java | 4 +- .../quest/requirements/PetRequirement.java | 9 +-- src/main/java/tools/PacketCreator.java | 14 ++-- 25 files changed, 121 insertions(+), 113 deletions(-) rename src/main/java/client/inventory/{MaplePet.java => Pet.java} (92%) diff --git a/scripts/quest/4659.js b/scripts/quest/4659.js index d612aab6f3..8fb941c2f0 100644 --- a/scripts/quest/4659.js +++ b/scripts/quest/4659.js @@ -104,7 +104,7 @@ function end(mode, type, selection) { qm.gainMeso(-10000); qm.evolvePet(i, after); -// var petId = MaplePet.createPet(rand + 5000049, level, closeness, fullness); +// var petId = Pet.createPet(rand + 5000049, level, closeness, fullness); // if (petId == -1) return; // MapleInventoryManipulator.addById(qm.getClient(), rand+5000049, 1, "", petId); qm.dispose(); diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/MapleCharacter.java index b81420ce35..10572e10ff 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/MapleCharacter.java @@ -162,7 +162,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private MapleRockPaperScissor rps; private MapleMount maplemount; private MapleParty party; - private MaplePet[] pets = new MaplePet[3]; + private Pet[] pets = new Pet[3]; private MaplePlayerShop playerShop = null; private MapleShop shop = null; private MapleSkinColor skinColor = MapleSkinColor.NORMAL; @@ -616,7 +616,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { this.mesosTraded += gain; } - public void addPet(MaplePet pet) { + public void addPet(Pet pet) { petLock.lock(); try { for (int i = 0; i < 3; i++) { @@ -2962,7 +2962,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { deletedCoupon = true; } } else { - MaplePet pet = item.getPet(); // thanks Lame for noticing pets not getting despawned after expiration time + Pet pet = item.getPet(); // thanks Lame for noticing pets not getting despawned after expiration time if (pet != null) { unequipPet(pet, true); } @@ -5614,7 +5614,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { this.setMessengerPosition(4); } - public MaplePet[] getPets() { + public Pet[] getPets() { petLock.lock(); try { return Arrays.copyOf(pets, pets.length); @@ -5623,7 +5623,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - public MaplePet getPet(int index) { + public Pet getPet(int index) { if (index < 0) { return null; } @@ -5652,7 +5652,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - public byte getPetIndex(MaplePet pet) { + public byte getPetIndex(Pet pet) { petLock.lock(); try { for (byte i = 0; i < 3; i++) { @@ -7042,7 +7042,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.getInventory(item.getRight()).addItemFromDB(item.getLeft()); Item itemz = item.getLeft(); if (itemz.getPetId() > -1) { - MaplePet pet = itemz.getPet(); + Pet pet = itemz.getPet(); if (pet != null && pet.isSummoned()) { ret.addPet(pet); } @@ -7973,7 +7973,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - public void removePet(MaplePet pet, boolean shift_left) { + public void removePet(Pet pet, boolean shift_left) { petLock.lock(); try { int slot = -1; @@ -8477,7 +8477,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - List petList = new LinkedList<>(); + List petList = new LinkedList<>(); petLock.lock(); try { for (int i = 0; i < 3; i++) { @@ -8489,7 +8489,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { petLock.unlock(); } - for (MaplePet pet : petList) { + for (Pet pet : petList) { pet.saveToDb(); } @@ -9708,7 +9708,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void runFullnessSchedule(int petSlot) { - MaplePet pet = getPet(petSlot); + Pet pet = getPet(petSlot); if (pet == null) { return; } @@ -9762,20 +9762,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void unequipAllPets() { for (int i = 0; i < 3; i++) { - MaplePet pet = getPet(i); + Pet pet = getPet(i); if (pet != null) { unequipPet(pet, true); } } } - public void unequipPet(MaplePet pet, boolean shift_left) { + public void unequipPet(Pet pet, boolean shift_left) { unequipPet(pet, shift_left, false); } - public void unequipPet(MaplePet pet, boolean shift_left, boolean hunger) { + public void unequipPet(Pet pet, boolean shift_left, boolean hunger) { byte petIdx = this.getPetIndex(pet); - MaplePet chrPet = this.getPet(petIdx); + Pet chrPet = this.getPet(petIdx); if (chrPet != null) { chrPet.setSummoned(false); diff --git a/src/main/java/client/command/commands/gm2/ItemCommand.java b/src/main/java/client/command/commands/gm2/ItemCommand.java index 452e8babc6..57518ca405 100644 --- a/src/main/java/client/command/commands/gm2/ItemCommand.java +++ b/src/main/java/client/command/commands/gm2/ItemCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm2; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import client.inventory.MaplePet; +import client.inventory.Pet; import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; @@ -67,7 +67,7 @@ public class ItemCommand extends Command { quantity = 1; long days = Math.max(1, Integer.parseInt(params[1])); long expiration = System.currentTimeMillis() + (days * 24 * 60 * 60 * 1000); - int petid = MaplePet.createPet(itemId); + int petid = Pet.createPet(itemId); MapleInventoryManipulator.addById(c, itemId, quantity, player.getName(), petid, expiration); return; diff --git a/src/main/java/client/command/commands/gm2/ItemDropCommand.java b/src/main/java/client/command/commands/gm2/ItemDropCommand.java index 9943a231f5..69f241c2de 100644 --- a/src/main/java/client/command/commands/gm2/ItemDropCommand.java +++ b/src/main/java/client/command/commands/gm2/ItemDropCommand.java @@ -28,7 +28,7 @@ import client.MapleClient; import client.command.Command; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MaplePet; +import client.inventory.Pet; import config.YamlConfig; import constants.inventory.ItemConstants; import server.MapleItemInformationProvider; @@ -68,7 +68,7 @@ public class ItemDropCommand extends Command { quantity = 1; long days = Math.max(1, Integer.parseInt(params[1])); long expiration = System.currentTimeMillis() + (days * 24 * 60 * 60 * 1000); - int petid = MaplePet.createPet(itemId); + int petid = Pet.createPet(itemId); Item toDrop = new Item(itemId, (short) 0, quantity, petid); toDrop.setExpiration(expiration); diff --git a/src/main/java/client/command/commands/gm4/ForceVacCommand.java b/src/main/java/client/command/commands/gm4/ForceVacCommand.java index 2369efc487..cffafec896 100644 --- a/src/main/java/client/command/commands/gm4/ForceVacCommand.java +++ b/src/main/java/client/command/commands/gm4/ForceVacCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm4; import client.MapleCharacter; import client.MapleClient; import client.command.Command; -import client.inventory.MaplePet; +import client.inventory.Pet; import client.inventory.manipulator.MapleInventoryManipulator; import server.maps.MapleMapItem; import server.maps.MapleMapObject; @@ -59,7 +59,7 @@ public class ForceVacCommand extends Command { // Add NX to account, show effect and make item disappear player.getCashShop().gainCash(1, mapItem.getItemId() == 4031865 ? 100 : 250); } else if (mapItem.getItem().getItemId() >= 5000000 && mapItem.getItem().getItemId() <= 5000100) { - int petId = MaplePet.createPet(mapItem.getItem().getItemId()); + int petId = Pet.createPet(mapItem.getItem().getItemId()); if (petId == -1) { continue; } diff --git a/src/main/java/client/inventory/Item.java b/src/main/java/client/inventory/Item.java index f8dcb7415a..7df866905d 100644 --- a/src/main/java/client/inventory/Item.java +++ b/src/main/java/client/inventory/Item.java @@ -38,7 +38,7 @@ public class Item implements Comparable { private short position; private short quantity; private int petid = -1; - private MaplePet pet = null; + private Pet pet = null; private String owner = ""; protected List log; private short flag; @@ -58,7 +58,7 @@ public class Item implements Comparable { this.position = position; this.quantity = quantity; if (petid > -1) { // issue with null "pet" having petid > -1 found thanks to MedicOP - this.pet = MaplePet.loadFromDb(id, position, petid); + this.pet = Pet.loadFromDb(id, position, petid); if (this.pet == null) { petid = -1; } @@ -184,7 +184,7 @@ public class Item implements Comparable { this.giftFrom = giftFrom; } - public MaplePet getPet() { + public Pet getPet() { return pet; } diff --git a/src/main/java/client/inventory/MaplePet.java b/src/main/java/client/inventory/Pet.java similarity index 92% rename from src/main/java/client/inventory/MaplePet.java rename to src/main/java/client/inventory/Pet.java index 943abd9245..b46098ff31 100644 --- a/src/main/java/client/inventory/MaplePet.java +++ b/src/main/java/client/inventory/Pet.java @@ -40,10 +40,9 @@ import java.sql.SQLException; import java.util.List; /** - * * @author Matze */ -public class MaplePet extends Item { +public class Pet extends Item { private String name; private int uniqueid; private int closeness = 0; @@ -54,13 +53,13 @@ public class MaplePet extends Item { private int stance; private boolean summoned; private int petFlag = 0; - + public enum PetFlag { OWNER_SPEED(0x01); - - private int i; - private PetFlag(int i) { + private final int i; + + PetFlag(int i) { this.i = i; } @@ -69,14 +68,14 @@ public class MaplePet extends Item { } } - private MaplePet(int id, short position, int uniqueid) { + private Pet(int id, short position, int uniqueid) { super(id, position, (short) 1); this.uniqueid = uniqueid; this.pos = new Point(0, 0); } - public static MaplePet loadFromDb(int itemid, short position, int petid) { - MaplePet ret = new MaplePet(itemid, position, petid); + public static Pet loadFromDb(int itemid, short position, int petid) { + Pet ret = new Pet(itemid, position, petid); try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT name, level, closeness, fullness, summoned, flag FROM pets WHERE petid = ?")) { // Get the pet details... ps.setInt(1, petid); @@ -96,7 +95,7 @@ public class MaplePet extends Item { return null; } } - + public static void deleteFromDb(MapleCharacter owner, int petid) { try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM pets WHERE `petid` = ?")) { @@ -109,7 +108,7 @@ public class MaplePet extends Item { ex.printStackTrace(); } } - + public void saveToDb() { try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE pets SET name = ?, level = ?, closeness = ?, fullness = ?, summoned = ?, flag = ? WHERE petid = ?")) { @@ -184,48 +183,55 @@ public class MaplePet extends Item { public byte getLevel() { return level; } - + public void gainClosenessFullness(MapleCharacter owner, int incCloseness, int incFullness, int type) { byte slot = owner.getPetIndex(this); boolean enjoyed; - + //will NOT increase pet's closeness if tried to feed pet with 100% fullness if (fullness < 100 || incFullness == 0) { //incFullness == 0: command given int newFullness = fullness + incFullness; - if (newFullness > 100) newFullness = 100; + if (newFullness > 100) { + newFullness = 100; + } fullness = newFullness; - + if (incCloseness > 0 && closeness < 30000) { int newCloseness = closeness + incCloseness; - if (newCloseness > 30000) newCloseness = 30000; - + if (newCloseness > 30000) { + newCloseness = 30000; + } + closeness = newCloseness; - while(newCloseness >= ExpTable.getClosenessNeededForLevel(level)) { + while (newCloseness >= ExpTable.getClosenessNeededForLevel(level)) { level += 1; owner.sendPacket(PacketCreator.showOwnPetLevelUp(slot)); owner.getMap().broadcastMessage(PacketCreator.showPetLevelUp(owner, slot)); } } - + enjoyed = true; } else { int newCloseness = closeness - 1; - if (newCloseness < 0) newCloseness = 0; + if (newCloseness < 0) { + newCloseness = 0; + } closeness = newCloseness; if (level > 1 && newCloseness < ExpTable.getClosenessNeededForLevel(level - 1)) { level -= 1; } - + enjoyed = false; } - + owner.getMap().broadcastMessage(PacketCreator.petFoodResponse(owner.getId(), slot, enjoyed, false)); saveToDb(); - + Item petz = owner.getInventory(InventoryType.CASH).getItem(getPosition()); - if (petz != null) + if (petz != null) { owner.forceUpdateItem(petz); + } } public void setLevel(byte level) { @@ -271,31 +277,33 @@ public class MaplePet extends Item { public void setSummoned(boolean yes) { this.summoned = yes; } - + public int getPetFlag() { return this.petFlag; } - + private void setPetFlag(int flag) { this.petFlag = flag; } - + public void addPetFlag(MapleCharacter owner, PetFlag flag) { this.petFlag |= flag.getValue(); saveToDb(); - + Item petz = owner.getInventory(InventoryType.CASH).getItem(getPosition()); - if (petz != null) + if (petz != null) { owner.forceUpdateItem(petz); + } } - + public void removePetFlag(MapleCharacter owner, PetFlag flag) { this.petFlag &= 0xFFFFFFFF ^ flag.getValue(); saveToDb(); - + Item petz = owner.getInventory(InventoryType.CASH).getItem(getPosition()); - if (petz != null) + if (petz != null) { owner.forceUpdateItem(petz); + } } public Pair canConsume(int itemId) { diff --git a/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java b/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java index c8abec9bbf..1ee245e46c 100644 --- a/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java +++ b/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java @@ -408,7 +408,7 @@ public class MapleInventoryManipulator { if (petid > -1) { // thanks Vcoc for finding a d/c issue with equipped pets and pets remaining on DB here int petIdx = chr.getPetIndex(petid); if(petIdx > -1) { - MaplePet pet = chr.getPet(petIdx); + Pet pet = chr.getPet(petIdx); chr.unequipPet(pet, true); } @@ -702,7 +702,7 @@ public class MapleInventoryManipulator { if (petid > -1) { int petIdx = chr.getPetIndex(petid); if(petIdx > -1) { - MaplePet pet = chr.getPet(petIdx); + Pet pet = chr.getPet(petIdx); chr.unequipPet(pet, true); } } diff --git a/src/main/java/client/processor/action/SpawnPetProcessor.java b/src/main/java/client/processor/action/SpawnPetProcessor.java index 64d470e9d7..0a74ec27f9 100644 --- a/src/main/java/client/processor/action/SpawnPetProcessor.java +++ b/src/main/java/client/processor/action/SpawnPetProcessor.java @@ -23,7 +23,7 @@ import client.MapleCharacter; import client.MapleClient; import client.SkillFactory; import client.inventory.InventoryType; -import client.inventory.MaplePet; +import client.inventory.Pet; import client.inventory.manipulator.MapleInventoryManipulator; import provider.MapleDataProvider; import provider.MapleDataProviderFactory; @@ -44,7 +44,7 @@ public class SpawnPetProcessor { if (c.tryacquireClient()) { try { MapleCharacter chr = c.getPlayer(); - MaplePet pet = chr.getInventory(InventoryType.CASH).getItem(slot).getPet(); + Pet pet = chr.getInventory(InventoryType.CASH).getItem(slot).getPet(); if (pet == null) return; int petid = pet.getItemId(); @@ -56,7 +56,7 @@ public class SpawnPetProcessor { return; } else { int evolveid = MapleDataTool.getInt("info/evol1", dataRoot.getData("Pet/" + petid + ".img")); - int petId = MaplePet.createPet(evolveid); + int petId = Pet.createPet(evolveid); if (petId == -1) { return; } diff --git a/src/main/java/net/server/channel/handlers/PetCommandHandler.java b/src/main/java/net/server/channel/handlers/PetCommandHandler.java index b8dfd986e5..b1c7ae20d0 100644 --- a/src/main/java/net/server/channel/handlers/PetCommandHandler.java +++ b/src/main/java/net/server/channel/handlers/PetCommandHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; -import client.inventory.MaplePet; +import client.inventory.Pet; import client.inventory.PetCommand; import client.inventory.PetDataFactory; import net.AbstractPacketHandler; @@ -38,7 +38,7 @@ public final class PetCommandHandler extends AbstractPacketHandler { MapleCharacter chr = c.getPlayer(); int petId = p.readInt(); byte petIndex = chr.getPetIndex(petId); - MaplePet pet; + Pet pet; if (petIndex == -1) { return; } else { diff --git a/src/main/java/net/server/channel/handlers/PetExcludeItemsHandler.java b/src/main/java/net/server/channel/handlers/PetExcludeItemsHandler.java index 58384c67b7..2a023c3fd0 100644 --- a/src/main/java/net/server/channel/handlers/PetExcludeItemsHandler.java +++ b/src/main/java/net/server/channel/handlers/PetExcludeItemsHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.autoban.AutobanFactory; -import client.inventory.MaplePet; +import client.inventory.Pet; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -43,7 +43,7 @@ public final class PetExcludeItemsHandler extends AbstractPacketHandler { byte petIndex = chr.getPetIndex(petId); if (petIndex < 0) return; - final MaplePet pet = chr.getPet(petIndex); + final Pet pet = chr.getPet(petIndex); if (pet == null) { return; } diff --git a/src/main/java/net/server/channel/handlers/PetFoodHandler.java b/src/main/java/net/server/channel/handlers/PetFoodHandler.java index d130247d91..40a6008b77 100644 --- a/src/main/java/net/server/channel/handlers/PetFoodHandler.java +++ b/src/main/java/net/server/channel/handlers/PetFoodHandler.java @@ -27,7 +27,7 @@ import client.autoban.AutobanManager; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MaplePet; +import client.inventory.Pet; import client.inventory.manipulator.MapleInventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -53,7 +53,7 @@ public final class PetFoodHandler extends AbstractPacketHandler { } int previousFullness = 100; byte slot = 0; - MaplePet[] pets = chr.getPets(); + Pet[] pets = chr.getPets(); for (byte i = 0; i < 3; i++) { if (pets[i] != null) { if (pets[i].getFullness() < previousFullness) { @@ -63,7 +63,7 @@ public final class PetFoodHandler extends AbstractPacketHandler { } } - MaplePet pet = chr.getPet(slot); + Pet pet = chr.getPet(slot); if(pet == null) return; short pos = p.readShort(); diff --git a/src/main/java/net/server/channel/handlers/PetLootHandler.java b/src/main/java/net/server/channel/handlers/PetLootHandler.java index 8b03309ea8..e4a85f5a66 100644 --- a/src/main/java/net/server/channel/handlers/PetLootHandler.java +++ b/src/main/java/net/server/channel/handlers/PetLootHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; -import client.inventory.MaplePet; +import client.inventory.Pet; import net.AbstractPacketHandler; import net.packet.InPacket; import server.maps.MapleMapItem; @@ -42,7 +42,7 @@ public final class PetLootHandler extends AbstractPacketHandler { MapleCharacter chr = c.getPlayer(); int petIndex = chr.getPetIndex(p.readInt()); - MaplePet pet = chr.getPet(petIndex); + Pet pet = chr.getPet(petIndex); if (pet == null || !pet.isSummoned()) { c.sendPacket(PacketCreator.enableActions()); return; diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index e1cbe05f75..b2015d9dd1 100644 --- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java @@ -338,7 +338,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler { player.checkBerserk(player.isHidden()); if (newcomer) { - for (MaplePet pet : player.getPets()) { + for (Pet pet : player.getPets()) { if (pet != null) { wserv.registerPetHunger(player, player.getPetIndex(pet)); } diff --git a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java index ff6b22e4ea..564a71eddd 100644 --- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java @@ -367,7 +367,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { player.getMap().startMapEffect(ii.getMsg(itemId).replaceFirst("%s", player.getName()).replaceFirst("%s", p.readString()), itemId); remove(c, position, itemId); } else if (itemType == 517) { - MaplePet pet = player.getPet(0); + Pet pet = player.getPet(0); if (pet == null) { c.sendPacket(PacketCreator.enableActions()); return; @@ -405,7 +405,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { } else if (itemType == 524) { for (byte i = 0; i < 3; i++) { - MaplePet pet = player.getPet(i); + Pet pet = player.getPet(i); if (pet != null) { Pair pair = pet.canConsume(itemId); diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index 5d0482cff5..efe49b24fc 100644 --- a/src/main/java/scripting/AbstractPlayerInteraction.java +++ b/src/main/java/scripting/AbstractPlayerInteraction.java @@ -498,8 +498,8 @@ public class AbstractPlayerInteraction { } public Item evolvePet(byte slot, int afterId) { - MaplePet evolved = null; - MaplePet target; + Pet evolved = null; + Pet target; long period = (long) 90 * 24 * 60 * 60 * 1000; //refreshes expiration date: 90 days @@ -512,7 +512,7 @@ public class AbstractPlayerInteraction { Item tmp = gainItem(afterId, (short) 1, false, true, period, target); /* - evolved = MaplePet.loadFromDb(tmp.getItemId(), tmp.getPosition(), tmp.getPetId()); + evolved = Pet.loadFromDb(tmp.getItemId(), tmp.getPosition(), tmp.getPetId()); evolved = tmp.getPet(); if(evolved == null) { @@ -561,17 +561,17 @@ public class AbstractPlayerInteraction { return gainItem(id, quantity, randomStats, showMessage, expires, null); } - public Item gainItem(int id, short quantity, boolean randomStats, boolean showMessage, long expires, MaplePet from) { + public Item gainItem(int id, short quantity, boolean randomStats, boolean showMessage, long expires, Pet from) { Item item = null; - MaplePet evolved; + Pet evolved; int petId = -1; if (quantity >= 0) { if (ItemConstants.isPet(id)) { - petId = MaplePet.createPet(id); + petId = Pet.createPet(id); if(from != null) { - evolved = MaplePet.loadFromDb(id, (short) 0, petId); + evolved = Pet.loadFromDb(id, (short) 0, petId); Point pos = getPlayer().getPosition(); pos.y -= 12; @@ -1113,13 +1113,13 @@ public class AbstractPlayerInteraction { return getPlayer().getJailExpirationTimeLeft(); } - public List getDriedPets() { - List list = new LinkedList<>(); + public List getDriedPets() { + List list = new LinkedList<>(); long curTime = System.currentTimeMillis(); for(Item it : getPlayer().getInventory(InventoryType.CASH).list()) { if(ItemConstants.isPet(it.getItemId()) && it.getExpiration() < curTime) { - MaplePet pet = it.getPet(); + Pet pet = it.getPet(); if (pet != null) { list.add(pet); } diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java index dbc7d4db85..abc42d19dd 100644 --- a/src/main/java/scripting/npc/NPCConversationManager.java +++ b/src/main/java/scripting/npc/NPCConversationManager.java @@ -24,7 +24,7 @@ package scripting.npc; import client.*; import client.inventory.Item; import client.inventory.ItemFactory; -import client.inventory.MaplePet; +import client.inventory.Pet; import config.YamlConfig; import constants.game.GameConstants; import constants.inventory.ItemConstants; @@ -336,7 +336,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } public void gainCloseness(int closeness) { - for (MaplePet pet : getPlayer().getPets()) { + for (Pet pet : getPlayer().getPets()) { if(pet != null) { pet.gainClosenessFullness(getPlayer(), closeness, 0, 0); } diff --git a/src/main/java/server/CashShop.java b/src/main/java/server/CashShop.java index 9966bcc25e..3c6315a5c7 100644 --- a/src/main/java/server/CashShop.java +++ b/src/main/java/server/CashShop.java @@ -87,7 +87,7 @@ public class CashShop { int petid = -1; if (ItemConstants.isPet(itemId)) { - petid = MaplePet.createPet(itemId); + petid = Pet.createPet(itemId); } if (ItemConstants.getInventoryType(itemId).equals(InventoryType.EQUIP)) { diff --git a/src/main/java/server/MapleShop.java b/src/main/java/server/MapleShop.java index 838ffee992..a8ab926393 100644 --- a/src/main/java/server/MapleShop.java +++ b/src/main/java/server/MapleShop.java @@ -24,7 +24,7 @@ package server; import client.MapleClient; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MaplePet; +import client.inventory.Pet; import client.inventory.manipulator.MapleInventoryManipulator; import constants.inventory.ItemConstants; import tools.DatabaseConnection; @@ -138,7 +138,7 @@ public class MapleShop { int diff = cardreduce + c.getPlayer().getMeso(); if (MapleInventoryManipulator.checkSpace(c, itemId, quantity, "")) { if (ItemConstants.isPet(itemId)) { - int petid = MaplePet.createPet(itemId); + int petid = Pet.createPet(itemId); MapleInventoryManipulator.addById(c, itemId, quantity, "", petid, -1); } else { MapleInventoryManipulator.addById(c, itemId, quantity, "", -1, -1); diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index d8e2fe8b10..d0b3a49f6d 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -28,7 +28,7 @@ import client.autoban.AutobanFactory; import client.inventory.Equip; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MaplePet; +import client.inventory.Pet; import client.status.MonsterStatus; import client.status.MonsterStatusEffect; import config.YamlConfig; @@ -2452,8 +2452,8 @@ public class MapleMap { chr.sendPacket(PacketCreator.getClock(pqTimer / 1000)); } - MaplePet[] pets = chr.getPets(); - for (MaplePet pet : pets) { + Pet[] pets = chr.getPets(); + for (Pet pet : pets) { if (pet != null) { pet.setPos(getGroundBelow(chr.getPosition())); chr.sendPacket(PacketCreator.showPet(chr, pet, false, false)); diff --git a/src/main/java/server/quest/actions/PetSpeedAction.java b/src/main/java/server/quest/actions/PetSpeedAction.java index bdb1be7c57..66c2c01f61 100644 --- a/src/main/java/server/quest/actions/PetSpeedAction.java +++ b/src/main/java/server/quest/actions/PetSpeedAction.java @@ -19,11 +19,10 @@ */ package server.quest.actions; -import client.MapleClient; import client.MapleCharacter; -import client.inventory.MaplePet; +import client.MapleClient; +import client.inventory.Pet; import provider.MapleData; -import provider.MapleDataTool; import server.quest.MapleQuest; import server.quest.MapleQuestActionType; @@ -46,12 +45,12 @@ public class PetSpeedAction extends MapleQuestAction { public void run(MapleCharacter chr, Integer extSelection) { MapleClient c = chr.getClient(); - MaplePet pet = chr.getPet(0); // assuming here only the pet leader will gain owner speed + Pet pet = chr.getPet(0); // assuming here only the pet leader will gain owner speed if(pet == null) return; c.lockClient(); try { - pet.addPetFlag(c.getPlayer(), MaplePet.PetFlag.OWNER_SPEED); + pet.addPetFlag(c.getPlayer(), Pet.PetFlag.OWNER_SPEED); } finally { c.unlockClient(); } diff --git a/src/main/java/server/quest/actions/PetTamenessAction.java b/src/main/java/server/quest/actions/PetTamenessAction.java index ae6bbe3baf..4769916451 100644 --- a/src/main/java/server/quest/actions/PetTamenessAction.java +++ b/src/main/java/server/quest/actions/PetTamenessAction.java @@ -19,9 +19,9 @@ */ package server.quest.actions; -import client.MapleClient; import client.MapleCharacter; -import client.inventory.MaplePet; +import client.MapleClient; +import client.inventory.Pet; import provider.MapleData; import provider.MapleDataTool; import server.quest.MapleQuest; @@ -50,7 +50,7 @@ public class PetTamenessAction extends MapleQuestAction { public void run(MapleCharacter chr, Integer extSelection) { MapleClient c = chr.getClient(); - MaplePet pet = chr.getPet(0); // assuming here only the pet leader will gain tameness + Pet pet = chr.getPet(0); // assuming here only the pet leader will gain tameness if(pet == null) return; c.lockClient(); diff --git a/src/main/java/server/quest/requirements/MinTamenessRequirement.java b/src/main/java/server/quest/requirements/MinTamenessRequirement.java index 8d0c3a8676..faaacf9ba9 100644 --- a/src/main/java/server/quest/requirements/MinTamenessRequirement.java +++ b/src/main/java/server/quest/requirements/MinTamenessRequirement.java @@ -22,7 +22,7 @@ package server.quest.requirements; import client.MapleCharacter; -import client.inventory.MaplePet; +import client.inventory.Pet; import provider.MapleData; import provider.MapleDataTool; import server.quest.MapleQuest; @@ -55,7 +55,7 @@ public class MinTamenessRequirement extends MapleQuestRequirement { public boolean check(MapleCharacter chr, Integer npcid) { int curCloseness = 0; - for(MaplePet pet : chr.getPets()) { + for(Pet pet : chr.getPets()) { if(pet == null) continue; if(pet.getCloseness() > curCloseness) diff --git a/src/main/java/server/quest/requirements/PetRequirement.java b/src/main/java/server/quest/requirements/PetRequirement.java index e44e9c3111..4b65d7111a 100644 --- a/src/main/java/server/quest/requirements/PetRequirement.java +++ b/src/main/java/server/quest/requirements/PetRequirement.java @@ -22,14 +22,15 @@ package server.quest.requirements; import client.MapleCharacter; -import client.inventory.MaplePet; -import java.util.ArrayList; -import java.util.List; +import client.inventory.Pet; import provider.MapleData; import provider.MapleDataTool; import server.quest.MapleQuest; import server.quest.MapleQuestRequirementType; +import java.util.ArrayList; +import java.util.List; + /** * * @author Tyler (Twdtwd) @@ -54,7 +55,7 @@ public class PetRequirement extends MapleQuestRequirement { @Override public boolean check(MapleCharacter chr, Integer npcid) { - for(MaplePet pet : chr.getPets()) { + for(Pet pet : chr.getPets()) { if(pet == null) continue; // thanks Arufonsu for showing a NPE occurring here if(petIDs.contains(pet.getItemId())) diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index fbf5561a0f..0483153a84 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -137,7 +137,7 @@ public class PacketCreator { p.writeInt(chr.getHair()); // hair for (int i = 0; i < 3; i++) { - MaplePet pet = chr.getPet(i); + Pet pet = chr.getPet(i); if (pet != null) //Checked GMS.. and your pets stay when going into the cash shop. { p.writeLong(pet.getUniqueId()); @@ -375,7 +375,7 @@ public class PacketCreator { } addExpirationTime(p, item.getExpiration()); if (isPet) { - MaplePet pet = item.getPet(); + Pet pet = item.getPet(); p.writeFixedString(StringUtil.getRightPaddedStr(pet.getName(), '\0', 13)); p.writeByte(pet.getLevel()); p.writeShort(pet.getCloseness()); @@ -1937,7 +1937,7 @@ public class PacketCreator { p.writeShort(0);//chr.getFh() p.writeByte(0); - MaplePet[] pet = chr.getPets(); + Pet[] pet = chr.getPets(); for (int i = 0; i < 3; i++) { if (pet[i] != null) { addPetInfo(p, pet[i], false); @@ -2693,7 +2693,7 @@ public class PacketCreator { p.writeString(allianceName); // does not seem to work p.writeByte(0); // pMedalInfo, thanks to Arnah (Vertisy) - MaplePet[] pets = chr.getPets(); + Pet[] pets = chr.getPets(); Item inv = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -114); for (int i = 0; i < 3; i++) { if (pets[i] != null) { @@ -4361,7 +4361,7 @@ public class PacketCreator { return p; } - private static void addPetInfo(final OutPacket p, MaplePet pet, boolean showpet) { + private static void addPetInfo(final OutPacket p, Pet pet, boolean showpet) { p.writeByte(1); if (showpet) { p.writeByte(0); @@ -4375,7 +4375,7 @@ public class PacketCreator { p.writeInt(pet.getFh()); } - public static Packet showPet(MapleCharacter chr, MaplePet pet, boolean remove, boolean hunger) { + public static Packet showPet(MapleCharacter chr, Pet pet, boolean remove, boolean hunger) { OutPacket p = OutPacket.create(SendOpcode.SPAWN_PET); p.writeInt(chr.getId()); p.writeByte(chr.getPetIndex(pet)); @@ -4475,7 +4475,7 @@ public class PacketCreator { mask |= MapleStat.PET.getValue(); p.writeByte(0); p.writeInt(mask); - MaplePet[] pets = chr.getPets(); + Pet[] pets = chr.getPets(); for (int i = 0; i < 3; i++) { if (pets[i] != null) { p.writeLong(pets[i].getUniqueId()); From a5541c121c59ad55cece5ac3d75ad6c0353efbad Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 20:52:49 +0200 Subject: [PATCH 004/125] Rename and clean up MapleWeaponType --- src/main/java/client/MapleCharacter.java | 20 +++++++++---------- .../{MapleWeaponType.java => WeaponType.java} | 7 ++++--- .../channel/handlers/RangedAttackHandler.java | 12 +++++------ .../channel/handlers/SummonDamageHandler.java | 4 ++-- .../server/MapleItemInformationProvider.java | 6 +++--- 5 files changed, 25 insertions(+), 24 deletions(-) rename src/main/java/client/inventory/{MapleWeaponType.java => WeaponType.java} (92%) diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/MapleCharacter.java index 10572e10ff..d6bf589b57 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/MapleCharacter.java @@ -693,16 +693,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } - public int calculateMaxBaseDamage(int watk, MapleWeaponType weapon) { + public int calculateMaxBaseDamage(int watk, WeaponType weapon) { int mainstat, secondarystat; - if (getJob().isA(MapleJob.THIEF) && weapon == MapleWeaponType.DAGGER_OTHER) { - weapon = MapleWeaponType.DAGGER_THIEVES; + if (getJob().isA(MapleJob.THIEF) && weapon == WeaponType.DAGGER_OTHER) { + weapon = WeaponType.DAGGER_THIEVES; } - if (weapon == MapleWeaponType.BOW || weapon == MapleWeaponType.CROSSBOW || weapon == MapleWeaponType.GUN) { + if (weapon == WeaponType.BOW || weapon == WeaponType.CROSSBOW || weapon == WeaponType.GUN) { mainstat = localdex; secondarystat = localstr; - } else if (weapon == MapleWeaponType.CLAW || weapon == MapleWeaponType.DAGGER_THIEVES) { + } else if (weapon == WeaponType.CLAW || weapon == WeaponType.DAGGER_THIEVES) { mainstat = localluk; secondarystat = localdex + localstr; } else { @@ -7824,11 +7824,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (job.isA(MapleJob.THIEF) || job.isA(MapleJob.BOWMAN) || job.isA(MapleJob.PIRATE) || job.isA(MapleJob.NIGHTWALKER1) || job.isA(MapleJob.WINDARCHER1)) { Item weapon_item = getInventory(InventoryType.EQUIPPED).getItem((short) -11); if (weapon_item != null) { - MapleWeaponType weapon = ii.getWeaponType(weapon_item.getItemId()); - boolean bow = weapon == MapleWeaponType.BOW; - boolean crossbow = weapon == MapleWeaponType.CROSSBOW; - boolean claw = weapon == MapleWeaponType.CLAW; - boolean gun = weapon == MapleWeaponType.GUN; + WeaponType weapon = ii.getWeaponType(weapon_item.getItemId()); + boolean bow = weapon == WeaponType.BOW; + boolean crossbow = weapon == WeaponType.CROSSBOW; + boolean claw = weapon == WeaponType.CLAW; + boolean gun = weapon == WeaponType.GUN; if (bow || crossbow || claw || gun) { // Also calc stars into this. Inventory inv = getInventory(InventoryType.USE); diff --git a/src/main/java/client/inventory/MapleWeaponType.java b/src/main/java/client/inventory/WeaponType.java similarity index 92% rename from src/main/java/client/inventory/MapleWeaponType.java rename to src/main/java/client/inventory/WeaponType.java index 38032505fc..386ae2f1b9 100644 --- a/src/main/java/client/inventory/MapleWeaponType.java +++ b/src/main/java/client/inventory/WeaponType.java @@ -21,7 +21,7 @@ */ package client.inventory; -public enum MapleWeaponType { +public enum WeaponType { NOT_A_WEAPON(0), GENERAL1H_SWING(4.4), GENERAL1H_STAB(3.2), @@ -42,9 +42,10 @@ public enum MapleWeaponType { SWORD1H(4.0), SWORD2H(4.6), WAND(3.6); - private double damageMultiplier; - private MapleWeaponType(double maxDamageMultiplier) { + private final double damageMultiplier; + + WeaponType(double maxDamageMultiplier) { this.damageMultiplier = maxDamageMultiplier; } diff --git a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java index c85a2453ea..228cba91fa 100644 --- a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java +++ b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java @@ -25,7 +25,7 @@ import client.*; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleWeaponType; +import client.inventory.WeaponType; import client.inventory.manipulator.MapleInventoryManipulator; import config.YamlConfig; import constants.game.GameConstants; @@ -90,8 +90,8 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { } } else { Item weapon = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -11); - MapleWeaponType type = MapleItemInformationProvider.getInstance().getWeaponType(weapon.getItemId()); - if (type == MapleWeaponType.NOT_A_WEAPON) { + WeaponType type = MapleItemInformationProvider.getInstance().getWeaponType(weapon.getItemId()); + if (type == WeaponType.NOT_A_WEAPON) { return; } short slot = -1; @@ -133,13 +133,13 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { boolean bow = ItemConstants.isArrowForBow(id); boolean cbow = ItemConstants.isArrowForCrossBow(id); if (item.getQuantity() >= bulletCount) { //Fixes the bug where you can't use your last arrow. - if (type == MapleWeaponType.CLAW && ItemConstants.isThrowingStar(id) && weapon.getItemId() != 1472063) { + if (type == WeaponType.CLAW && ItemConstants.isThrowingStar(id) && weapon.getItemId() != 1472063) { if (((id == 2070007 || id == 2070018) && chr.getLevel() < 70) || (id == 2070016 && chr.getLevel() < 50)) { } else { projectile = id; break; } - } else if ((type == MapleWeaponType.GUN && ItemConstants.isBullet(id))) { + } else if ((type == WeaponType.GUN && ItemConstants.isBullet(id))) { if (id == 2331000 && id == 2332000) { if (chr.getLevel() > 69) { projectile = id; @@ -149,7 +149,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { projectile = id; break; } - } else if ((type == MapleWeaponType.BOW && bow) || (type == MapleWeaponType.CROSSBOW && cbow) || (weapon.getItemId() == 1472063 && (bow || cbow))) { + } else if ((type == WeaponType.BOW && bow) || (type == WeaponType.CROSSBOW && cbow) || (weapon.getItemId() == 1472063 && (bow || cbow))) { projectile = id; break; } diff --git a/src/main/java/net/server/channel/handlers/SummonDamageHandler.java b/src/main/java/net/server/channel/handlers/SummonDamageHandler.java index 2fb8eb3add..1f62dac4ff 100644 --- a/src/main/java/net/server/channel/handlers/SummonDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/SummonDamageHandler.java @@ -28,7 +28,7 @@ import client.SkillFactory; import client.autoban.AutobanFactory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.MapleWeaponType; +import client.inventory.WeaponType; import client.status.MonsterStatusEffect; import constants.skills.Outlaw; import net.packet.InPacket; @@ -141,7 +141,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler { if (weapon_item != null) { maxBaseDmg = player.calculateMaxBaseDamage(watk, MapleItemInformationProvider.getInstance().getWeaponType(weapon_item.getItemId())); } else { - maxBaseDmg = player.calculateMaxBaseDamage(watk, MapleWeaponType.SWORD1H); + maxBaseDmg = player.calculateMaxBaseDamage(watk, WeaponType.SWORD1H); } float summonDmgMod = (maxBaseDmg >= 438) ? 0.054f : 0.077f; diff --git a/src/main/java/server/MapleItemInformationProvider.java b/src/main/java/server/MapleItemInformationProvider.java index 46b6efe186..5f7c5c918f 100644 --- a/src/main/java/server/MapleItemInformationProvider.java +++ b/src/main/java/server/MapleItemInformationProvider.java @@ -585,11 +585,11 @@ public class MapleItemInformationProvider { return ret; } - public MapleWeaponType getWeaponType(int itemId) { + public WeaponType getWeaponType(int itemId) { int cat = (itemId / 10000) % 100; - MapleWeaponType[] type = {MapleWeaponType.SWORD1H, MapleWeaponType.GENERAL1H_SWING, MapleWeaponType.GENERAL1H_SWING, MapleWeaponType.DAGGER_OTHER, MapleWeaponType.NOT_A_WEAPON, MapleWeaponType.NOT_A_WEAPON, MapleWeaponType.NOT_A_WEAPON, MapleWeaponType.WAND, MapleWeaponType.STAFF, MapleWeaponType.NOT_A_WEAPON, MapleWeaponType.SWORD2H, MapleWeaponType.GENERAL2H_SWING, MapleWeaponType.GENERAL2H_SWING, MapleWeaponType.SPEAR_STAB, MapleWeaponType.POLE_ARM_SWING, MapleWeaponType.BOW, MapleWeaponType.CROSSBOW, MapleWeaponType.CLAW, MapleWeaponType.KNUCKLE, MapleWeaponType.GUN}; + WeaponType[] type = {WeaponType.SWORD1H, WeaponType.GENERAL1H_SWING, WeaponType.GENERAL1H_SWING, WeaponType.DAGGER_OTHER, WeaponType.NOT_A_WEAPON, WeaponType.NOT_A_WEAPON, WeaponType.NOT_A_WEAPON, WeaponType.WAND, WeaponType.STAFF, WeaponType.NOT_A_WEAPON, WeaponType.SWORD2H, WeaponType.GENERAL2H_SWING, WeaponType.GENERAL2H_SWING, WeaponType.SPEAR_STAB, WeaponType.POLE_ARM_SWING, WeaponType.BOW, WeaponType.CROSSBOW, WeaponType.CLAW, WeaponType.KNUCKLE, WeaponType.GUN}; if (cat < 30 || cat > 49) { - return MapleWeaponType.NOT_A_WEAPON; + return WeaponType.NOT_A_WEAPON; } return type[cat - 30]; } From 7c61df6887488dcd1e4142ef4c097c522d9c7813 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 20:53:51 +0200 Subject: [PATCH 005/125] Rename and clean up MapleCashidGenerator --- src/main/java/client/MapleCharacter.java | 6 +++--- src/main/java/client/MapleRing.java | 10 +++++----- src/main/java/client/inventory/Pet.java | 8 ++++---- ...{MapleCashidGenerator.java => CashIdGenerator.java} | 4 ++-- src/main/java/net/server/Server.java | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) rename src/main/java/client/inventory/manipulator/{MapleCashidGenerator.java => CashIdGenerator.java} (96%) diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/MapleCharacter.java index d6bf589b57..eb140ad742 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/MapleCharacter.java @@ -26,7 +26,7 @@ import client.autoban.AutobanManager; import client.creator.CharacterFactoryRecipe; import client.inventory.*; import client.inventory.Equip.StatUpgrade; -import client.inventory.manipulator.MapleCashidGenerator; +import client.inventory.manipulator.CashIdGenerator; import client.inventory.manipulator.MapleInventoryManipulator; import client.keybind.MapleKeyBinding; import client.keybind.MapleQuickslotBinding; @@ -2269,7 +2269,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ps3.executeUpdate(); } - MapleCashidGenerator.freeCashId(ringid); + CashIdGenerator.freeCashId(ringid); } } } @@ -2286,7 +2286,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ps2.setInt(1, petid); ps2.executeUpdate(); } - MapleCashidGenerator.freeCashId(petid); + CashIdGenerator.freeCashId(petid); } } } diff --git a/src/main/java/client/MapleRing.java b/src/main/java/client/MapleRing.java index a7634b2f7f..0a5f921e6a 100644 --- a/src/main/java/client/MapleRing.java +++ b/src/main/java/client/MapleRing.java @@ -21,7 +21,7 @@ */ package client; -import client.inventory.manipulator.MapleCashidGenerator; +import client.inventory.manipulator.CashIdGenerator; import tools.DatabaseConnection; import tools.Pair; @@ -85,8 +85,8 @@ public class MapleRing implements Comparable { ps.executeBatch(); } - MapleCashidGenerator.freeCashId(ring.getRingId()); - MapleCashidGenerator.freeCashId(ring.getPartnerRingId()); + CashIdGenerator.freeCashId(ring.getRingId()); + CashIdGenerator.freeCashId(ring.getPartnerRingId()); try (PreparedStatement ps = con.prepareStatement("UPDATE inventoryequipment SET ringid=-1 WHERE ringid=?")) { ps.setInt(1, ring.getRingId()); @@ -112,8 +112,8 @@ public class MapleRing implements Comparable { } int[] ringID = new int[2]; - ringID[0] = MapleCashidGenerator.generateCashId(); - ringID[1] = MapleCashidGenerator.generateCashId(); + ringID[0] = CashIdGenerator.generateCashId(); + ringID[1] = CashIdGenerator.generateCashId(); try (Connection con = DatabaseConnection.getConnection()) { try (PreparedStatement ps = con.prepareStatement("INSERT INTO rings (id, itemid, partnerRingId, partnerChrId, partnername) VALUES (?, ?, ?, ?, ?)")) { diff --git a/src/main/java/client/inventory/Pet.java b/src/main/java/client/inventory/Pet.java index b46098ff31..e616922a5d 100644 --- a/src/main/java/client/inventory/Pet.java +++ b/src/main/java/client/inventory/Pet.java @@ -22,7 +22,7 @@ package client.inventory; import client.MapleCharacter; -import client.inventory.manipulator.MapleCashidGenerator; +import client.inventory.manipulator.CashIdGenerator; import constants.game.ExpTable; import server.MapleItemInformationProvider; import server.movement.AbsoluteLifeMovement; @@ -103,7 +103,7 @@ public class Pet extends Item { ps.setInt(1, petid); owner.resetExcluded(petid); - MapleCashidGenerator.freeCashId(petid); + CashIdGenerator.freeCashId(petid); } catch (SQLException ex) { ex.printStackTrace(); } @@ -128,7 +128,7 @@ public class Pet extends Item { public static int createPet(int itemid) { try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO pets (petid, name, level, closeness, fullness, summoned, flag) VALUES (?, ?, 1, 0, 100, 0, 0)")) { - int ret = MapleCashidGenerator.generateCashId(); + int ret = CashIdGenerator.generateCashId(); ps.setInt(1, ret); ps.setString(2, MapleItemInformationProvider.getInstance().getName(itemid)); ps.executeUpdate(); @@ -142,7 +142,7 @@ public class Pet extends Item { public static int createPet(int itemid, byte level, int closeness, int fullness) { try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO pets (petid, name, level, closeness, fullness, summoned, flag) VALUES (?, ?, ?, ?, ?, 0, 0)")) { - int ret = MapleCashidGenerator.generateCashId(); + int ret = CashIdGenerator.generateCashId(); ps.setInt(1, ret); ps.setString(2, MapleItemInformationProvider.getInstance().getName(itemid)); ps.setByte(3, level); diff --git a/src/main/java/client/inventory/manipulator/MapleCashidGenerator.java b/src/main/java/client/inventory/manipulator/CashIdGenerator.java similarity index 96% rename from src/main/java/client/inventory/manipulator/MapleCashidGenerator.java rename to src/main/java/client/inventory/manipulator/CashIdGenerator.java index 13096a9724..999b125642 100644 --- a/src/main/java/client/inventory/manipulator/MapleCashidGenerator.java +++ b/src/main/java/client/inventory/manipulator/CashIdGenerator.java @@ -33,8 +33,8 @@ import java.util.Set; /** * @author RonanLana */ -public class MapleCashidGenerator { - private static final Logger log = LoggerFactory.getLogger(MapleCashidGenerator.class); +public class CashIdGenerator { + private static final Logger log = LoggerFactory.getLogger(CashIdGenerator.class); private final static Set existentCashids = new HashSet<>(10000); private static Integer runningCashid = 0; diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java index 2d564cae79..4e5bf773bd 100644 --- a/src/main/java/net/server/Server.java +++ b/src/main/java/net/server/Server.java @@ -28,7 +28,7 @@ import client.SkillFactory; import client.command.CommandsExecutor; import client.inventory.Item; import client.inventory.ItemFactory; -import client.inventory.manipulator.MapleCashidGenerator; +import client.inventory.manipulator.CashIdGenerator; import client.newyear.NewYearCardRecord; import config.YamlConfig; import constants.game.GameConstants; @@ -852,7 +852,7 @@ public class Server { loadCouponRates(con); updateActiveCoupons(con); NewYearCardRecord.startPendingNewYearCardRequests(con); - MapleCashidGenerator.loadExistentCashIdsFromDb(con); + CashIdGenerator.loadExistentCashIdsFromDb(con); applyAllNameChanges(con); // -- name changes can be missed by INSTANT_NAME_CHANGE -- applyAllWorldTransfers(con); From b2cbb65c6ab3a73443e7f1105eae48cc48c564d5 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 20:55:07 +0200 Subject: [PATCH 006/125] Rename and clean up MapleInventoryManipulator --- scripts/npc/1032102.js | 4 +- scripts/quest/4659.js | 2 +- src/main/java/client/MapleCharacter.java | 32 ++-- .../commands/gm2/ClearSlotCommand.java | 22 +-- .../command/commands/gm2/ItemCommand.java | 6 +- .../command/commands/gm4/ForceVacCommand.java | 6 +- .../command/commands/gm4/ProItemCommand.java | 4 +- src/main/java/client/inventory/Inventory.java | 6 +- ...pulator.java => InventoryManipulator.java} | 161 +++++++++--------- .../processor/action/MakerProcessor.java | 6 +- .../processor/action/PetAutopotProcessor.java | 4 +- .../processor/action/SpawnPetProcessor.java | 6 +- .../client/processor/npc/DueyProcessor.java | 12 +- .../processor/npc/FredrickProcessor.java | 4 +- .../processor/npc/StorageProcessor.java | 8 +- .../channel/handlers/AdminCommandHandler.java | 4 +- .../handlers/CashOperationHandler.java | 4 +- .../channel/handlers/ChangeMapHandler.java | 4 +- .../channel/handlers/CouponCodeHandler.java | 4 +- .../handlers/InventoryMergeHandler.java | 6 +- .../channel/handlers/ItemMoveHandler.java | 10 +- .../channel/handlers/ItemRewardHandler.java | 10 +- .../server/channel/handlers/MTSHandler.java | 6 +- .../channel/handlers/PetFoodHandler.java | 4 +- .../handlers/PlayerInteractionHandler.java | 14 +- .../channel/handlers/RaiseIncExpHandler.java | 4 +- .../channel/handlers/RangedAttackHandler.java | 4 +- .../channel/handlers/RingActionHandler.java | 24 +-- .../channel/handlers/ScrollHandler.java | 6 +- .../channel/handlers/SkillBookHandler.java | 4 +- .../channel/handlers/TakeDamageHandler.java | 4 +- .../channel/handlers/UseCashItemHandler.java | 12 +- .../channel/handlers/UseCatchItemHandler.java | 42 ++--- .../channel/handlers/UseItemHandler.java | 4 +- .../channel/handlers/UseMountFoodHandler.java | 4 +- .../channel/handlers/UseSolomonHandler.java | 4 +- .../channel/handlers/UseSummonBagHandler.java | 4 +- .../channel/handlers/WeddingHandler.java | 8 +- .../scripting/AbstractPlayerInteraction.java | 32 ++-- src/main/java/server/MapleMarriage.java | 4 +- src/main/java/server/MapleShop.java | 26 +-- src/main/java/server/MapleStatEffect.java | 8 +- src/main/java/server/MapleTrade.java | 6 +- .../java/server/maps/MapleHiredMerchant.java | 10 +- .../java/server/maps/MaplePlayerShop.java | 6 +- .../minigame/MapleRockPaperScissor.java | 4 +- .../java/server/quest/actions/ItemAction.java | 10 +- 47 files changed, 292 insertions(+), 287 deletions(-) rename src/main/java/client/inventory/manipulator/{MapleInventoryManipulator.java => InventoryManipulator.java} (94%) diff --git a/scripts/npc/1032102.js b/scripts/npc/1032102.js index 9a02418ab0..348d9f6eaa 100644 --- a/scripts/npc/1032102.js +++ b/scripts/npc/1032102.js @@ -101,9 +101,9 @@ function action(mode, type, selection) { } } else if (status == 2) { if (selection == 0) { - const MapleInventoryManipulator = Java.type('client.inventory.manipulator.MapleInventoryManipulator'); + const InventoryManipulator = Java.type('client.inventory.manipulator.InventoryManipulator'); const InventoryType = Java.type('client.inventory.InventoryType'); - MapleInventoryManipulator.removeFromSlot(cm.getClient(), InventoryType.CASH, 1, 1, true); + InventoryManipulator.removeFromSlot(cm.getClient(), InventoryType.CASH, 1, 1, true); cm.sendOk("Your cash first slot is removed."); } else if (selection == 1) { if (cm.haveItem(5000029, 2)) { diff --git a/scripts/quest/4659.js b/scripts/quest/4659.js index 8fb941c2f0..bfc0389130 100644 --- a/scripts/quest/4659.js +++ b/scripts/quest/4659.js @@ -106,7 +106,7 @@ function end(mode, type, selection) { qm.evolvePet(i, after); // var petId = Pet.createPet(rand + 5000049, level, closeness, fullness); // if (petId == -1) return; -// MapleInventoryManipulator.addById(qm.getClient(), rand+5000049, 1, "", petId); +// InventoryManipulator.addById(qm.getClient(), rand+5000049, 1, "", petId); qm.dispose(); } else { qm.dropMessage(1,"Your inventory is full"); diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/MapleCharacter.java index eb140ad742..7cc72a00d4 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/MapleCharacter.java @@ -27,7 +27,7 @@ import client.creator.CharacterFactoryRecipe; import client.inventory.*; import client.inventory.Equip.StatUpgrade; import client.inventory.manipulator.CashIdGenerator; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.keybind.MapleKeyBinding; import client.keybind.MapleQuickslotBinding; import client.newyear.NewYearCardRecord; @@ -911,8 +911,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { inv.lockInventory(); try { for(Item item : new ArrayList<>(inv.list())) { - if(MapleInventoryManipulator.isSandboxItem(item)) { - MapleInventoryManipulator.removeFromSlot(client, invType, item.getPosition(), item.getQuantity(), false); + if(InventoryManipulator.isSandboxItem(item)) { + InventoryManipulator.removeFromSlot(client, invType, item.getPosition(), item.getQuantity(), false); dropMessage(5, "[" + ii.getName(item.getItemId()) + "] has passed its trial conditions and will be removed from your inventory."); } } @@ -1948,7 +1948,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Item mItem = mapitem.getItem(); boolean hasSpaceInventory = true; - if (mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866 || mapitem.getMeso() > 0 || ii.isConsumeOnPickup(mapitem.getItemId()) || (hasSpaceInventory = MapleInventoryManipulator.checkSpace(client, mapitem.getItemId(), mItem.getQuantity(), mItem.getOwner()))) { + if (mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866 || mapitem.getMeso() > 0 || ii.isConsumeOnPickup(mapitem.getItemId()) || (hasSpaceInventory = InventoryManipulator.checkSpace(client, mapitem.getItemId(), mItem.getQuantity(), mItem.getOwner()))) { int mapId = this.getMapId(); if ((mapId > 209000000 && mapId < 209000016) || (mapId >= 990000500 && mapId <= 990000502)) {//happyville trees and guild PQ @@ -1974,7 +1974,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { showHint("You have earned #e#b" + nxGain + " NX#k#n. (" + this.getCashShop().getCash(1) + " NX)", 300); this.getMap().pickItemDrop(pickupPacket, mapitem); - } else if (MapleInventoryManipulator.addFromDrop(client, mItem, true)) { + } else if (InventoryManipulator.addFromDrop(client, mItem, true)) { this.getMap().pickItemDrop(pickupPacket, mapitem); } else { sendPacket(PacketCreator.enableActions()); @@ -2011,7 +2011,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (info != null && info.runOnPickup()) { itemScript = info; } else { - if (!MapleInventoryManipulator.addFromDrop(client, mItem, true)) { + if (!InventoryManipulator.addFromDrop(client, mItem, true)) { sendPacket(PacketCreator.enableActions()); return; } @@ -2023,7 +2023,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { showHint("You have earned #e#b" + nxGain + " NX#k#n. (" + this.getCashShop().getCash(1) + " NX)", 300); } else if (applyConsumeOnPickup(mItem.getItemId())) { - } else if (MapleInventoryManipulator.addFromDrop(client, mItem, true)) { + } else if (InventoryManipulator.addFromDrop(client, mItem, true)) { if (mItem.getItemId() == 4031868) { updateAriantScore(); } @@ -2980,7 +2980,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if(!toberemove.isEmpty()) { for (Item item : toberemove) { - MapleInventoryManipulator.removeFromSlot(client, inv.getType(), item.getPosition(), item.getQuantity(), true); + InventoryManipulator.removeFromSlot(client, inv.getType(), item.getPosition(), item.getQuantity(), true); } MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); @@ -2994,7 +2994,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } for (Integer itemid : toadd) { - MapleInventoryManipulator.addById(client, itemid, (short) 1); + InventoryManipulator.addById(client, itemid, (short) 1); } } @@ -5547,9 +5547,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (mpsi.getBundles() >= 2) { Item iItem = mpsi.getItem().copy(); iItem.setQuantity((short) (mpsi.getBundles() * iItem.getQuantity())); - MapleInventoryManipulator.addFromDrop(this.getClient(), iItem, false); + InventoryManipulator.addFromDrop(this.getClient(), iItem, false); } else if (mpsi.isExist()) { - MapleInventoryManipulator.addFromDrop(this.getClient(), mpsi.getItem(), true); + InventoryManipulator.addFromDrop(this.getClient(), mpsi.getItem(), true); } } mps.closeShop(); @@ -6474,8 +6474,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (YamlConfig.config.server.USE_PERFECT_PITCH && level >= 30) { //milestones? - if (MapleInventoryManipulator.checkSpace(client, 4310000, (short) 1, "")) { - MapleInventoryManipulator.addById(client, 4310000, (short) 1, "", -1); + if (InventoryManipulator.checkSpace(client, 4310000, (short) 1, "")) { + InventoryManipulator.addById(client, 4310000, (short) 1, "", -1); } } else if (level == 10) { Runnable r = new Runnable() { @@ -7571,7 +7571,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (possesed > 0 && !GameConstants.isDojo(getMapId())) { message("You have used a safety charm, so your EXP points have not been decreased."); - MapleInventoryManipulator.removeById(client, ItemConstants.getInventoryType(charmID[i]), charmID[i], 1, true, false); + InventoryManipulator.removeById(client, ItemConstants.getInventoryType(charmID[i]), charmID[i], 1, true, false); usedSafetyCharm = true; } else if (getJob() != MapleJob.BEGINNER) { //Hmm... if (!FieldLimit.NO_EXP_DECREASE.check(getMap().getFieldLimit())) { // thanks Conrad for noticing missing FieldLimit check @@ -9391,7 +9391,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (quantity <= iQuant && iQuant > 0) { - MapleInventoryManipulator.removeFromSlot(c, type, (byte) slot, quantity, false); + InventoryManipulator.removeFromSlot(c, type, (byte) slot, quantity, false); int recvMesos = ii.getPrice(itemid, quantity); if (recvMesos > 0) { gainMeso(recvMesos, false); @@ -9558,7 +9558,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statups.put(s.getKey(), newVal); } - MapleInventoryManipulator.removeFromSlot(c, type, (byte) slot, quantity, false); + InventoryManipulator.removeFromSlot(c, type, (byte) slot, quantity, false); } public void setShop(MapleShop shop) { diff --git a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java b/src/main/java/client/command/commands/gm2/ClearSlotCommand.java index aa3644c0b5..13b354b427 100644 --- a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java +++ b/src/main/java/client/command/commands/gm2/ClearSlotCommand.java @@ -28,7 +28,7 @@ import client.MapleClient; import client.command.Command; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; public class ClearSlotCommand extends Command { { @@ -49,31 +49,31 @@ public class ClearSlotCommand extends Command { Item tempItem = c.getPlayer().getInventory(InventoryType.EQUIP).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false); } for (int i = 0; i < 101; i++) { Item tempItem = c.getPlayer().getInventory(InventoryType.USE).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, (byte) i, tempItem.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.USE, (byte) i, tempItem.getQuantity(), false, false); } for (int i = 0; i < 101; i++) { Item tempItem = c.getPlayer().getInventory(InventoryType.ETC).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, InventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false); } for (int i = 0; i < 101; i++) { Item tempItem = c.getPlayer().getInventory(InventoryType.SETUP).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, InventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false); } for (int i = 0; i < 101; i++) { Item tempItem = c.getPlayer().getInventory(InventoryType.CASH).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, InventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("All Slots Cleared."); break; @@ -82,7 +82,7 @@ public class ClearSlotCommand extends Command { Item tempItem = c.getPlayer().getInventory(InventoryType.EQUIP).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Equipment Slot Cleared."); break; @@ -91,7 +91,7 @@ public class ClearSlotCommand extends Command { Item tempItem = c.getPlayer().getInventory(InventoryType.USE).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, (byte) i, tempItem.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.USE, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Use Slot Cleared."); break; @@ -100,7 +100,7 @@ public class ClearSlotCommand extends Command { Item tempItem = c.getPlayer().getInventory(InventoryType.SETUP).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, InventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Set-Up Slot Cleared."); break; @@ -109,7 +109,7 @@ public class ClearSlotCommand extends Command { Item tempItem = c.getPlayer().getInventory(InventoryType.ETC).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, InventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("ETC Slot Cleared."); break; @@ -118,7 +118,7 @@ public class ClearSlotCommand extends Command { Item tempItem = c.getPlayer().getInventory(InventoryType.CASH).getItem((byte) i); if (tempItem == null) continue; - MapleInventoryManipulator.removeFromSlot(c, InventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Cash Slot Cleared."); break; diff --git a/src/main/java/client/command/commands/gm2/ItemCommand.java b/src/main/java/client/command/commands/gm2/ItemCommand.java index 57518ca405..da502495c2 100644 --- a/src/main/java/client/command/commands/gm2/ItemCommand.java +++ b/src/main/java/client/command/commands/gm2/ItemCommand.java @@ -27,7 +27,7 @@ import client.MapleCharacter; import client.MapleClient; import client.command.Command; import client.inventory.Pet; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; import server.MapleItemInformationProvider; @@ -69,7 +69,7 @@ public class ItemCommand extends Command { long expiration = System.currentTimeMillis() + (days * 24 * 60 * 60 * 1000); int petid = Pet.createPet(itemId); - MapleInventoryManipulator.addById(c, itemId, quantity, player.getName(), petid, expiration); + InventoryManipulator.addById(c, itemId, quantity, player.getName(), petid, expiration); return; } else { player.yellowMessage("Pet Syntax: !item "); @@ -83,6 +83,6 @@ public class ItemCommand extends Command { flag |= ItemConstants.UNTRADEABLE; } - MapleInventoryManipulator.addById(c, itemId, quantity, player.getName(), -1, flag, -1); + InventoryManipulator.addById(c, itemId, quantity, player.getName(), -1, flag, -1); } } diff --git a/src/main/java/client/command/commands/gm4/ForceVacCommand.java b/src/main/java/client/command/commands/gm4/ForceVacCommand.java index cffafec896..c744e5ba1e 100644 --- a/src/main/java/client/command/commands/gm4/ForceVacCommand.java +++ b/src/main/java/client/command/commands/gm4/ForceVacCommand.java @@ -27,7 +27,7 @@ import client.MapleCharacter; import client.MapleClient; import client.command.Command; import client.inventory.Pet; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import server.maps.MapleMapItem; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; @@ -63,8 +63,8 @@ public class ForceVacCommand extends Command { if (petId == -1) { continue; } - MapleInventoryManipulator.addById(c, mapItem.getItem().getItemId(), mapItem.getItem().getQuantity(), null, petId); - } else if (MapleInventoryManipulator.addFromDrop(c, mapItem.getItem(), true)) { + InventoryManipulator.addById(c, mapItem.getItem().getItemId(), mapItem.getItem().getQuantity(), null, petId); + } else if (InventoryManipulator.addFromDrop(c, mapItem.getItem(), true)) { if (mapItem.getItemId() == 4031868) { player.updateAriantScore(); } diff --git a/src/main/java/client/command/commands/gm4/ProItemCommand.java b/src/main/java/client/command/commands/gm4/ProItemCommand.java index 49e1d4a872..ecfb612b1d 100644 --- a/src/main/java/client/command/commands/gm4/ProItemCommand.java +++ b/src/main/java/client/command/commands/gm4/ProItemCommand.java @@ -29,7 +29,7 @@ import client.command.Command; import client.inventory.Equip; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import constants.inventory.ItemConstants; import server.MapleItemInformationProvider; @@ -63,7 +63,7 @@ public class ProItemCommand extends Command { it.setOwner(player.getName()); hardsetItemStats((Equip) it, stat, spdjmp); - MapleInventoryManipulator.addFromDrop(c, it); + InventoryManipulator.addFromDrop(c, it); } else { player.dropMessage(6, "Make sure it's an equippable item."); } diff --git a/src/main/java/client/inventory/Inventory.java b/src/main/java/client/inventory/Inventory.java index 6371953553..4376ebc4cb 100644 --- a/src/main/java/client/inventory/Inventory.java +++ b/src/main/java/client/inventory/Inventory.java @@ -23,7 +23,7 @@ package client.inventory; import client.MapleCharacter; import client.MapleClient; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import constants.inventory.ItemConstants; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.factory.MonitoredReentrantLockFactory; @@ -497,7 +497,7 @@ public class Inventory implements Iterable { for (Integer itValue : it.getValue()) { int usedSlots = typesSlotsUsed.get(itemType); - int result = MapleInventoryManipulator.checkSpaceProgressively(c, it.getKey(), itValue, "", usedSlots, useProofInv); + int result = InventoryManipulator.checkSpaceProgressively(c, it.getKey(), itValue, "", usedSlots, useProofInv); boolean hasSpace = ((result % 2) != 0); if (!hasSpace) { @@ -583,7 +583,7 @@ public class Inventory implements Iterable { //System.out.print("inserting " + itemId.intValue() + " with type " + itemType + " qty " + it.getValue() + " owner '" + rcvOwners.get(it.getKey()) + "' current usedSlots:"); //for(Integer i : typesSlotsUsed) System.out.print(" " + i); - int result = MapleInventoryManipulator.checkSpaceProgressively(c, itemId, itValue, rcvOwners.get(it.getKey()), usedSlots, useProofInv); + int result = InventoryManipulator.checkSpaceProgressively(c, itemId, itValue, rcvOwners.get(it.getKey()), usedSlots, useProofInv); boolean hasSpace = ((result % 2) != 0); //System.out.print(" -> hasSpace: " + hasSpace + " RESULT : " + result + "\n"); diff --git a/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java b/src/main/java/client/inventory/manipulator/InventoryManipulator.java similarity index 94% rename from src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java rename to src/main/java/client/inventory/manipulator/InventoryManipulator.java index 1ee245e46c..1a76269d7a 100644 --- a/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java +++ b/src/main/java/client/inventory/manipulator/InventoryManipulator.java @@ -40,11 +40,10 @@ import java.util.Iterator; import java.util.List; /** - * * @author Matze * @author Ronan - improved check space feature and removed redundant object calls */ -public class MapleInventoryManipulator { +public class InventoryManipulator { public static boolean addById(MapleClient c, int itemId, short quantity) { return addById(c, itemId, quantity, null, -1, -1); @@ -65,7 +64,7 @@ public class MapleInventoryManipulator { public static boolean addById(MapleClient c, int itemId, short quantity, String owner, int petid, short flag, long expiration) { MapleCharacter chr = c.getPlayer(); InventoryType type = ItemConstants.getInventoryType(itemId); - + Inventory inv = chr.getInventory(type); inv.lockInventory(); try { @@ -74,7 +73,7 @@ public class MapleInventoryManipulator { inv.unlockInventory(); } } - + private static boolean addByIdInternal(MapleClient c, MapleCharacter chr, InventoryType type, Inventory inv, int itemId, short quantity, String owner, int petid, short flag, long expiration) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); if (!type.equals(InventoryType.EQUIP)) { @@ -117,7 +116,9 @@ public class MapleInventoryManipulator { nItem.setOwner(owner); } c.sendPacket(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); - if(sandboxItem) chr.setHasSandboxItem(); + if (sandboxItem) { + chr.setHasSandboxItem(); + } } else { c.sendPacket(PacketCreator.enableActions()); return false; @@ -134,7 +135,9 @@ public class MapleInventoryManipulator { return false; } c.sendPacket(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); - if(MapleInventoryManipulator.isSandboxItem(nItem)) chr.setHasSandboxItem(); + if (InventoryManipulator.isSandboxItem(nItem)) { + chr.setHasSandboxItem(); + } } } else if (quantity == 1) { Item nEquip = ii.getEquipById(itemId); @@ -150,17 +153,19 @@ public class MapleInventoryManipulator { return false; } c.sendPacket(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nEquip)))); - if(MapleInventoryManipulator.isSandboxItem(nEquip)) chr.setHasSandboxItem(); + if (InventoryManipulator.isSandboxItem(nEquip)) { + chr.setHasSandboxItem(); + } } else { throw new RuntimeException("Trying to create equip with non-one quantity"); } return true; } - + public static boolean addFromDrop(MapleClient c, Item item) { return addFromDrop(c, item, true); } - + public static boolean addFromDrop(MapleClient c, Item item, boolean show) { return addFromDrop(c, item, show, item.getPetId()); } @@ -168,7 +173,7 @@ public class MapleInventoryManipulator { public static boolean addFromDrop(MapleClient c, Item item, boolean show, int petId) { MapleCharacter chr = c.getPlayer(); InventoryType type = item.getInventoryType(); - + Inventory inv = chr.getInventory(type); inv.lockInventory(); try { @@ -177,7 +182,7 @@ public class MapleInventoryManipulator { inv.unlockInventory(); } } - + private static boolean addFromDropInternal(MapleClient c, MapleCharacter chr, InventoryType type, Inventory inv, Item item, boolean show, int petId) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); int itemid = item.getItemId(); @@ -227,7 +232,9 @@ public class MapleInventoryManipulator { nItem.setPosition(newSlot); item.setPosition(newSlot); c.sendPacket(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); - if (MapleInventoryManipulator.isSandboxItem(nItem)) chr.setHasSandboxItem(); + if (InventoryManipulator.isSandboxItem(nItem)) { + chr.setHasSandboxItem(); + } } } else { Item nItem = new Item(itemid, (short) 0, quantity, petId); @@ -243,7 +250,9 @@ public class MapleInventoryManipulator { nItem.setPosition(newSlot); item.setPosition(newSlot); c.sendPacket(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem)))); - if (MapleInventoryManipulator.isSandboxItem(nItem)) chr.setHasSandboxItem(); + if (InventoryManipulator.isSandboxItem(nItem)) { + chr.setHasSandboxItem(); + } c.sendPacket(PacketCreator.enableActions()); } } else if (quantity == 1) { @@ -255,7 +264,9 @@ public class MapleInventoryManipulator { } item.setPosition(newSlot); c.sendPacket(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, item)))); - if (MapleInventoryManipulator.isSandboxItem(item)) chr.setHasSandboxItem(); + if (InventoryManipulator.isSandboxItem(item)) { + chr.setHasSandboxItem(); + } } else { FilePrinter.printError(FilePrinter.ITEM, "Tried to pickup Equip id " + itemid + " containing more than 1 quantity --> " + quantity); c.sendPacket(PacketCreator.getInventoryFull()); @@ -267,17 +278,17 @@ public class MapleInventoryManipulator { } return true; } - + private static boolean haveItemWithId(Inventory inv, int itemid) { return inv.findById(itemid) != null; } - + public static boolean checkSpace(MapleClient c, int itemid, int quantity, String owner) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); InventoryType type = ItemConstants.getInventoryType(itemid); MapleCharacter chr = c.getPlayer(); Inventory inv = chr.getInventory(type); - + if (ii.isPickupRestricted(itemid)) { if (haveItemWithId(inv, itemid)) { return false; @@ -285,11 +296,11 @@ public class MapleInventoryManipulator { return false; } } - + if (!type.equals(InventoryType.EQUIP)) { short slotMax = ii.getSlotMax(c, itemid); List existing = inv.listById(itemid); - + final int numSlotsNeeded; if (ItemConstants.isRechargeable(itemid)) { numSlotsNeeded = 1; @@ -307,14 +318,14 @@ public class MapleInventoryManipulator { } } } - + if (slotMax > 0) { numSlotsNeeded = (int) (Math.ceil(((double) quantity) / slotMax)); } else { numSlotsNeeded = 1; } } - + return !inv.isFull(numSlotsNeeded - 1); } else { return !inv.isFull(); @@ -325,14 +336,14 @@ public class MapleInventoryManipulator { // return value --> bit0: if has space for this one; // value after: new slots filled; // assumption: equipments always have slotMax == 1. - + int returnValue; - + MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); InventoryType type = !useProofInv ? ItemConstants.getInventoryType(itemid) : InventoryType.CANHOLD; MapleCharacter chr = c.getPlayer(); Inventory inv = chr.getInventory(type); - + if (ii.isPickupRestricted(itemid)) { if (haveItemWithId(inv, itemid)) { return 0; @@ -340,16 +351,16 @@ public class MapleInventoryManipulator { return 0; // thanks Captain & Aika & Vcoc for pointing out inventory checkup on player trades missing out one-of-a-kind items. } } - + if (!type.equals(InventoryType.EQUIP)) { short slotMax = ii.getSlotMax(c, itemid); final int numSlotsNeeded; - + if (ItemConstants.isRechargeable(itemid)) { numSlotsNeeded = 1; } else { List existing = inv.listById(itemid); - + if (existing.size() > 0) // first update all existing slots to slotMax { for (Item eItem : existing) { @@ -363,14 +374,14 @@ public class MapleInventoryManipulator { } } } - + if (slotMax > 0) { numSlotsNeeded = (int) (Math.ceil(((double) quantity) / slotMax)); } else { numSlotsNeeded = 1; } } - + returnValue = ((numSlotsNeeded + usedSlots) << 1); returnValue += (numSlotsNeeded == 0 || !inv.isFullAfterSomeItems(numSlotsNeeded - 1, usedSlots)) ? 1 : 0; //System.out.print(" needed " + numSlotsNeeded + " used " + usedSlots + " rval " + returnValue); @@ -379,7 +390,7 @@ public class MapleInventoryManipulator { returnValue += (!inv.isFullAfterSomeItems(0, usedSlots)) ? 1 : 0; //System.out.print(" eqpneeded " + 1 + " used " + usedSlots + " rval " + returnValue); } - + return returnValue; } @@ -392,8 +403,8 @@ public class MapleInventoryManipulator { Inventory inv = chr.getInventory(type); Item item = inv.getItem(slot); boolean allowZero = consume && ItemConstants.isRechargeable(item.getItemId()); - - if(type == InventoryType.EQUIPPED) { + + if (type == InventoryType.EQUIPPED) { inv.lockInventory(); try { chr.unequippedItem((Equip) item); @@ -401,32 +412,32 @@ public class MapleInventoryManipulator { } finally { inv.unlockInventory(); } - + announceModifyInventory(c, item, fromDrop, allowZero); } else { int petid = item.getPetId(); if (petid > -1) { // thanks Vcoc for finding a d/c issue with equipped pets and pets remaining on DB here int petIdx = chr.getPetIndex(petid); - if(petIdx > -1) { + if (petIdx > -1) { Pet pet = chr.getPet(petIdx); chr.unequipPet(pet, true); } - + inv.removeItem(slot, quantity, allowZero); - if(type != InventoryType.CANHOLD) { + if (type != InventoryType.CANHOLD) { announceModifyInventory(c, item, fromDrop, allowZero); } - + // thanks Robin Schulz for noticing pet issues when moving pets out of inventory } else { inv.removeItem(slot, quantity, allowZero); - if(type != InventoryType.CANHOLD) { + if (type != InventoryType.CANHOLD) { announceModifyInventory(c, item, fromDrop, allowZero); } } } } - + private static void announceModifyInventory(MapleClient c, Item item, boolean fromDrop, boolean allowZero) { if (item.getQuantity() == 0 && !allowZero) { c.sendPacket(PacketCreator.modifyInventory(fromDrop, Collections.singletonList(new ModifyInventory(3, item)))); @@ -438,8 +449,8 @@ public class MapleInventoryManipulator { public static void removeById(MapleClient c, InventoryType type, int itemId, int quantity, boolean fromDrop, boolean consume) { int removeQuantity = quantity; Inventory inv = c.getPlayer().getInventory(type); - int slotLimit = type == InventoryType.EQUIPPED ? 128 : inv.getSlotLimit(); - + int slotLimit = type == InventoryType.EQUIPPED ? 128 : inv.getSlotLimit(); + for (short i = 0; i <= slotLimit; i++) { Item item = inv.getItem((short) (type == InventoryType.EQUIPPED ? -i : i)); if (item != null) { @@ -463,14 +474,14 @@ public class MapleInventoryManipulator { private static boolean isSameOwner(Item source, Item target) { return source.getOwner().equals(target.getOwner()); } - + public static void move(MapleClient c, InventoryType type, short src, short dst) { Inventory inv = c.getPlayer().getInventory(type); - + if (src < 0 || dst < 0) { return; } - if(dst > inv.getSlotLimit()) { + if (dst > inv.getSlotLimit()) { return; } MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); @@ -503,11 +514,11 @@ public class MapleInventoryManipulator { public static void equip(MapleClient c, short src, short dst) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - + MapleCharacter chr = c.getPlayer(); Inventory eqpInv = chr.getInventory(InventoryType.EQUIP); Inventory eqpdInv = chr.getInventory(InventoryType.EQUIPPED); - + Equip source = (Equip) eqpInv.getItem(src); if (source == null || !ii.canWearEquipment(chr, source, dst)) { c.sendPacket(PacketCreator.enableActions()); @@ -520,7 +531,7 @@ public class MapleInventoryManipulator { short flag = source.getFlag(); // thanks BHB for noticing flags missing after equipping these flag |= ItemConstants.UNTRADEABLE; source.setFlag(flag); - + itemChanged = true; } if (dst == -6) { // unequip the overall @@ -569,11 +580,11 @@ public class MapleInventoryManipulator { chr.getMount().setItemId(source.getItemId()); } } - + //1112413, 1112414, 1112405 (Lilin's Ring) source = (Equip) eqpInv.getItem(src); eqpInv.removeSlot(src); - + Equip target; eqpdInv.lockInventory(); try { @@ -591,9 +602,9 @@ public class MapleInventoryManipulator { mods.add(new ModifyInventory(3, source)); mods.add(new ModifyInventory(0, source.copy()));//to prevent crashes } - + source.setPosition(dst); - + eqpdInv.lockInventory(); try { if (source.getRingId() > -1) { @@ -604,7 +615,7 @@ public class MapleInventoryManipulator { } finally { eqpdInv.unlockInventory(); } - + if (target != null) { target.setPosition(src); eqpInv.addItemFromDB(target); @@ -612,7 +623,7 @@ public class MapleInventoryManipulator { if (chr.getBuffedValue(MapleBuffStat.BOOSTER) != null && ItemConstants.isWeapon(source.getItemId())) { chr.cancelBuffStats(MapleBuffStat.BOOSTER); } - + mods.add(new ModifyInventory(2, source, src)); c.sendPacket(PacketCreator.modifyInventory(true, mods)); chr.equipChanged(); @@ -622,7 +633,7 @@ public class MapleInventoryManipulator { MapleCharacter chr = c.getPlayer(); Inventory eqpInv = chr.getInventory(InventoryType.EQUIP); Inventory eqpdInv = chr.getInventory(InventoryType.EQUIPPED); - + Equip source = (Equip) eqpdInv.getItem(src); Equip target = (Equip) eqpInv.getItem(dst); if (dst < 0) { @@ -635,7 +646,7 @@ public class MapleInventoryManipulator { c.sendPacket(PacketCreator.getInventoryFull()); return; } - + eqpdInv.lockInventory(); try { if (source.getRingId() > -1) { @@ -646,7 +657,7 @@ public class MapleInventoryManipulator { } finally { eqpdInv.unlockInventory(); } - + if (target != null) { eqpInv.removeSlot(dst); } @@ -659,7 +670,7 @@ public class MapleInventoryManipulator { c.sendPacket(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(2, source, src)))); chr.equipChanged(); } - + private static boolean isDisappearingItemDrop(Item it) { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); if (ii.isDropRestricted(it.getItemId())) { @@ -667,55 +678,49 @@ public class MapleInventoryManipulator { } else if (ii.isCash(it.getItemId())) { if (YamlConfig.config.server.USE_ENFORCE_UNMERCHABLE_CASH) { // thanks Ari for noticing cash drops not available server-side return true; - } else if (ItemConstants.isPet(it.getItemId()) && YamlConfig.config.server.USE_ENFORCE_UNMERCHABLE_PET) { - return true; - } + } else return ItemConstants.isPet(it.getItemId()) && YamlConfig.config.server.USE_ENFORCE_UNMERCHABLE_PET; } else if (isDroppedItemRestricted(it)) { return true; - } else if (ItemConstants.isWeddingRing(it.getItemId())) { - return true; - } - - return false; + } else return ItemConstants.isWeddingRing(it.getItemId()); } public static void drop(MapleClient c, InventoryType type, short src, short quantity) { if (src < 0) { type = InventoryType.EQUIPPED; } - + MapleCharacter chr = c.getPlayer(); Inventory inv = chr.getInventory(type); Item source = inv.getItem(src); if (chr.getTrade() != null || chr.getMiniGame() != null || source == null) { //Only check needed would prob be merchants (to see if the player is in one) - return; + return; } int itemId = source.getItemId(); - + MapleMap map = chr.getMap(); if ((!ItemConstants.isRechargeable(itemId) && source.getQuantity() < quantity) || quantity < 0) { return; } - + int petid = source.getPetId(); if (petid > -1) { int petIdx = chr.getPetIndex(petid); - if(petIdx > -1) { + if (petIdx > -1) { Pet pet = chr.getPet(petIdx); chr.unequipPet(pet, true); } } - + Point dropPos = new Point(chr.getPosition()); if (quantity < source.getQuantity() && !ItemConstants.isRechargeable(itemId)) { Item target = source.copy(); target.setQuantity(quantity); source.setQuantity((short) (source.getQuantity() - quantity)); c.sendPacket(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, source)))); - + if (ItemConstants.isNewYearCardEtc(itemId)) { - if(itemId == 4300000) { + if (itemId == 4300000) { NewYearCardRecord.removeAllNewYearCard(true, chr); c.getAbstractPlayerInteraction().removeAll(4300000); } else { @@ -723,7 +728,7 @@ public class MapleInventoryManipulator { c.getAbstractPlayerInteraction().removeAll(4301000); } } - + if (isDisappearingItemDrop(target)) { map.disappearingItemDrop(chr, chr, target, dropPos); } else { @@ -741,7 +746,7 @@ public class MapleInventoryManipulator { } else { inv.removeSlot(src); } - + c.sendPacket(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(3, source)))); if (src < 0) { chr.equipChanged(); @@ -754,14 +759,14 @@ public class MapleInventoryManipulator { c.getAbstractPlayerInteraction().removeAll(4301000); } } - + if (isDisappearingItemDrop(source)) { map.disappearingItemDrop(chr, chr, source, dropPos); } else { map.spawnItemDrop(chr, chr, source, dropPos, true, true); } } - + int quantityNow = chr.getItemQuantity(itemId, false); if (itemId == chr.getItemEffect()) { if (quantityNow <= 0) { @@ -780,7 +785,7 @@ public class MapleInventoryManipulator { private static boolean isDroppedItemRestricted(Item it) { return YamlConfig.config.server.USE_ERASE_UNTRADEABLE_DROP && it.isUntradeable(); } - + public static boolean isSandboxItem(Item it) { return (it.getFlag() & ItemConstants.SANDBOX) == ItemConstants.SANDBOX; } diff --git a/src/main/java/client/processor/action/MakerProcessor.java b/src/main/java/client/processor/action/MakerProcessor.java index 4f589234f9..475b54fec5 100644 --- a/src/main/java/client/processor/action/MakerProcessor.java +++ b/src/main/java/client/processor/action/MakerProcessor.java @@ -24,7 +24,7 @@ import client.MapleClient; import client.inventory.Equip; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import config.YamlConfig; import constants.game.GameConstants; import constants.inventory.ItemConstants; @@ -182,7 +182,7 @@ public class MakerProcessor { default: if(toDisassemble != -1) { - MapleInventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (short) pos, (short) 1, false); + InventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (short) pos, (short) 1, false); } else { for (Pair pair : recipe.getReqItems()) { c.getAbstractPlayerInteraction().gainItem(pair.getLeft(), (short) -pair.getRight(), false); @@ -436,7 +436,7 @@ public class MakerProcessor { eqp = ii.randomizeUpgradeStats(eqp); } - MapleInventoryManipulator.addFromDrop(c, item, false, -1); + InventoryManipulator.addFromDrop(c, item, false, -1); return true; } } diff --git a/src/main/java/client/processor/action/PetAutopotProcessor.java b/src/main/java/client/processor/action/PetAutopotProcessor.java index 893a361367..fe2a221279 100644 --- a/src/main/java/client/processor/action/PetAutopotProcessor.java +++ b/src/main/java/client/processor/action/PetAutopotProcessor.java @@ -26,7 +26,7 @@ import client.MapleClient; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import config.YamlConfig; import server.MapleItemInformationProvider; import server.MapleStatEffect; @@ -150,7 +150,7 @@ public class PetAutopotProcessor { while (true) { short qtyToUse = (short) Math.min(qtyCount, toUse.getQuantity()); - MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, qtyToUse, false); + InventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, qtyToUse, false); curHp += (incHp * qtyToUse); curMp += (incMp * qtyToUse); diff --git a/src/main/java/client/processor/action/SpawnPetProcessor.java b/src/main/java/client/processor/action/SpawnPetProcessor.java index 0a74ec27f9..177a781425 100644 --- a/src/main/java/client/processor/action/SpawnPetProcessor.java +++ b/src/main/java/client/processor/action/SpawnPetProcessor.java @@ -24,7 +24,7 @@ import client.MapleClient; import client.SkillFactory; import client.inventory.InventoryType; import client.inventory.Pet; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import provider.MapleDataProvider; import provider.MapleDataProviderFactory; import provider.MapleDataTool; @@ -61,8 +61,8 @@ public class SpawnPetProcessor { return; } long expiration = chr.getInventory(InventoryType.CASH).getItem(slot).getExpiration(); - MapleInventoryManipulator.removeById(c, InventoryType.CASH, petid, (short) 1, false, false); - MapleInventoryManipulator.addById(c, evolveid, (short) 1, null, petId, expiration); + InventoryManipulator.removeById(c, InventoryType.CASH, petid, (short) 1, false, false); + InventoryManipulator.addById(c, evolveid, (short) 1, null, petId, expiration); c.sendPacket(PacketCreator.enableActions()); return; diff --git a/src/main/java/client/processor/npc/DueyProcessor.java b/src/main/java/client/processor/npc/DueyProcessor.java index e1ec57fb52..d153288b8b 100644 --- a/src/main/java/client/processor/npc/DueyProcessor.java +++ b/src/main/java/client/processor/npc/DueyProcessor.java @@ -30,7 +30,7 @@ import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.ItemFactory; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; @@ -254,9 +254,9 @@ public class DueyProcessor { } if (ItemConstants.isRechargeable(item.getItemId())) { - MapleInventoryManipulator.removeFromSlot(c, invType, itemPos, item.getQuantity(), true); + InventoryManipulator.removeFromSlot(c, invType, itemPos, item.getQuantity(), true); } else { - MapleInventoryManipulator.removeFromSlot(c, invType, itemPos, amount, true, false); + InventoryManipulator.removeFromSlot(c, invType, itemPos, amount, true, false); } item = item.copy(); @@ -324,7 +324,7 @@ public class DueyProcessor { } if (quick) { - MapleInventoryManipulator.removeById(c, InventoryType.CASH, 5330000, (short) 1, false, false); + InventoryManipulator.removeById(c, InventoryType.CASH, 5330000, (short) 1, false, false); } int packageId = createPackage(sendMesos, sendMessage, c.getPlayer().getName(), recipientCid, quick); @@ -409,7 +409,7 @@ public class DueyProcessor { return; } - if (!MapleInventoryManipulator.checkSpace(c, dpItem.getItemId(), dpItem.getQuantity(), dpItem.getOwner())) { + if (!InventoryManipulator.checkSpace(c, dpItem.getItemId(), dpItem.getQuantity(), dpItem.getOwner())) { int itemid = dpItem.getItemId(); if (MapleItemInformationProvider.getInstance().isPickupRestricted(itemid) && c.getPlayer().getInventory(ItemConstants.getInventoryType(itemid)).findById(itemid) != null) { c.sendPacket(PacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_RECEIVER_WITH_UNIQUE.getCode())); @@ -419,7 +419,7 @@ public class DueyProcessor { return; } else { - MapleInventoryManipulator.addFromDrop(c, dpItem, false); + InventoryManipulator.addFromDrop(c, dpItem, false); } } diff --git a/src/main/java/client/processor/npc/FredrickProcessor.java b/src/main/java/client/processor/npc/FredrickProcessor.java index 88728477a2..b611967588 100644 --- a/src/main/java/client/processor/npc/FredrickProcessor.java +++ b/src/main/java/client/processor/npc/FredrickProcessor.java @@ -29,7 +29,7 @@ import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.ItemFactory; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import net.server.Server; import net.server.world.World; import server.MapleItemInformationProvider; @@ -289,7 +289,7 @@ public class FredrickProcessor { for (Pair it : items) { Item item = it.getLeft(); - MapleInventoryManipulator.addFromDrop(chr.getClient(), item, false); + InventoryManipulator.addFromDrop(chr.getClient(), item, false); String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId()); FilePrinter.print(FilePrinter.FREDRICK + chr.getName() + ".txt", chr.getName() + " gained " + item.getQuantity() + " " + itemName + " (" + item.getItemId() + ")"); } diff --git a/src/main/java/client/processor/npc/StorageProcessor.java b/src/main/java/client/processor/npc/StorageProcessor.java index b501e413e0..234c71d7b8 100644 --- a/src/main/java/client/processor/npc/StorageProcessor.java +++ b/src/main/java/client/processor/npc/StorageProcessor.java @@ -27,7 +27,7 @@ import client.autoban.AutobanFactory; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; @@ -83,12 +83,12 @@ public class StorageProcessor { chr.gainMeso(-takeoutFee, false); } - if (MapleInventoryManipulator.checkSpace(c, item.getItemId(), item.getQuantity(), item.getOwner())) { + if (InventoryManipulator.checkSpace(c, item.getItemId(), item.getQuantity(), item.getOwner())) { if (storage.takeOut(item)) { chr.setUsedStorage(); MapleKarmaManipulator.toggleKarmaFlagToUntradeable(item); - MapleInventoryManipulator.addFromDrop(c, item, false); + InventoryManipulator.addFromDrop(c, item, false); String itemName = ii.getName(item.getItemId()); FilePrinter.print(FilePrinter.STORAGE + c.getAccountName() + ".txt", c.getPlayer().getName() + " took out " + item.getQuantity() + " " + itemName + " (" + item.getItemId() + ")"); @@ -142,7 +142,7 @@ public class StorageProcessor { quantity = item.getQuantity(); } - MapleInventoryManipulator.removeFromSlot(c, invType, slot, quantity, false); + InventoryManipulator.removeFromSlot(c, invType, slot, quantity, false); } else { c.sendPacket(PacketCreator.enableActions()); return; diff --git a/src/main/java/net/server/channel/handlers/AdminCommandHandler.java b/src/main/java/net/server/channel/handlers/AdminCommandHandler.java index bbc0c1745d..0213efd7df 100644 --- a/src/main/java/net/server/channel/handlers/AdminCommandHandler.java +++ b/src/main/java/net/server/channel/handlers/AdminCommandHandler.java @@ -25,7 +25,7 @@ import client.MapleCharacter; import client.MapleClient; import client.inventory.Inventory; import client.inventory.InventoryType; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; import server.MapleItemInformationProvider; @@ -65,7 +65,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler { Inventory in = c.getPlayer().getInventory(InventoryType.getByType(type)); for (short i = 1; i <= in.getSlotLimit(); i++) { //TODO What is the point of this loop? if (in.getItem(i) != null) { - MapleInventoryManipulator.removeFromSlot(c, InventoryType.getByType(type), i, in.getItem(i).getQuantity(), false); + InventoryManipulator.removeFromSlot(c, InventoryType.getByType(type), i, in.getItem(i).getQuantity(), false); } return; } diff --git a/src/main/java/net/server/channel/handlers/CashOperationHandler.java b/src/main/java/net/server/channel/handlers/CashOperationHandler.java index 80ad58f2fa..be313561de 100644 --- a/src/main/java/net/server/channel/handlers/CashOperationHandler.java +++ b/src/main/java/net/server/channel/handlers/CashOperationHandler.java @@ -28,7 +28,7 @@ import client.inventory.Equip; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; @@ -361,7 +361,7 @@ public final class CashOperationHandler extends AbstractPacketHandler { if (chr.getMeso() >= itemPrice) { if (chr.canHold(itemId)) { chr.gainMeso(-itemPrice, false); - MapleInventoryManipulator.addById(c, itemId, (short) 1, "", -1); + InventoryManipulator.addById(c, itemId, (short) 1, "", -1); c.sendPacket(PacketCreator.showBoughtQuestItem(itemId)); } } diff --git a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java b/src/main/java/net/server/channel/handlers/ChangeMapHandler.java index 1bf71d0a41..ce3df6a41f 100644 --- a/src/main/java/net/server/channel/handlers/ChangeMapHandler.java +++ b/src/main/java/net/server/channel/handlers/ChangeMapHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.inventory.InventoryType; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; import server.MapleTrade; @@ -94,7 +94,7 @@ public final class ChangeMapHandler extends AbstractPacketHandler { if (wheel && chr.haveItemWithId(5510000, false)) { // thanks lucasziron (lziron) for showing revivePlayer() triggering by Wheel - MapleInventoryManipulator.removeById(c, InventoryType.CASH, 5510000, 1, true, false); + InventoryManipulator.removeById(c, InventoryType.CASH, 5510000, 1, true, false); chr.sendPacket(PacketCreator.showWheelsLeft(chr.getItemQuantity(5510000, false))); chr.updateHp(50); diff --git a/src/main/java/net/server/channel/handlers/CouponCodeHandler.java b/src/main/java/net/server/channel/handlers/CouponCodeHandler.java index 66768ebc35..19398f43bd 100644 --- a/src/main/java/net/server/channel/handlers/CouponCodeHandler.java +++ b/src/main/java/net/server/channel/handlers/CouponCodeHandler.java @@ -26,7 +26,7 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; @@ -244,7 +244,7 @@ public final class CouponCodeHandler extends AbstractPacketHandler { cs.addToInventory(it); cashItems.add(it); } else { - MapleInventoryManipulator.addById(c, item, qty, "", -1); + InventoryManipulator.addById(c, item, qty, "", -1); items.add(new Pair<>((int) qty, item)); } break; diff --git a/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java b/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java index e941c7c0b8..289f26d549 100644 --- a/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java +++ b/src/main/java/net/server/channel/handlers/InventoryMergeHandler.java @@ -26,7 +26,7 @@ import client.MapleClient; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import config.YamlConfig; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -73,7 +73,7 @@ public final class InventoryMergeHandler extends AbstractPacketHandler { if(dstItem.getItemId() != srcItem.getItemId()) continue; if(dstItem.getQuantity() == ii.getSlotMax(c, inventory.getItem(dst).getItemId())) break; - MapleInventoryManipulator.move(c, inventoryType, src, dst); + InventoryManipulator.move(c, inventoryType, src, dst); } } @@ -94,7 +94,7 @@ public final class InventoryMergeHandler extends AbstractPacketHandler { } } if (itemSlot > 0) { - MapleInventoryManipulator.move(c, inventoryType, itemSlot, freeSlot); + InventoryManipulator.move(c, inventoryType, itemSlot, freeSlot); } else { sorted = true; } diff --git a/src/main/java/net/server/channel/handlers/ItemMoveHandler.java b/src/main/java/net/server/channel/handlers/ItemMoveHandler.java index 3dd2c46600..33ce799c11 100644 --- a/src/main/java/net/server/channel/handlers/ItemMoveHandler.java +++ b/src/main/java/net/server/channel/handlers/ItemMoveHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.MapleClient; import client.inventory.InventoryType; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; import tools.PacketCreator; @@ -47,13 +47,13 @@ public final class ItemMoveHandler extends AbstractPacketHandler { short quantity = p.readShort(); if (src < 0 && action > 0) { - MapleInventoryManipulator.unequip(c, src, action); + InventoryManipulator.unequip(c, src, action); } else if (action < 0) { - MapleInventoryManipulator.equip(c, src, action); + InventoryManipulator.equip(c, src, action); } else if (action == 0) { - MapleInventoryManipulator.drop(c, type, src, quantity); + InventoryManipulator.drop(c, type, src, quantity); } else { - MapleInventoryManipulator.move(c, type, src, action); + InventoryManipulator.move(c, type, src, action); } if (c.getPlayer().getMap().getHPDec() > 0) c.getPlayer().resetHpDecreaseTask(); diff --git a/src/main/java/net/server/channel/handlers/ItemRewardHandler.java b/src/main/java/net/server/channel/handlers/ItemRewardHandler.java index 554d12d55c..34448f996c 100644 --- a/src/main/java/net/server/channel/handlers/ItemRewardHandler.java +++ b/src/main/java/net/server/channel/handlers/ItemRewardHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleClient; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -53,7 +53,7 @@ public final class ItemRewardHandler extends AbstractPacketHandler { MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); Pair> rewards = ii.getItemReward(itemId); for (RewardItem reward : rewards.getRight()) { - if (!MapleInventoryManipulator.checkSpace(c, reward.itemid, reward.quantity, "")) { + if (!InventoryManipulator.checkSpace(c, reward.itemid, reward.quantity, "")) { c.sendPacket(PacketCreator.getShowInventoryFull()); break; } @@ -63,11 +63,11 @@ public final class ItemRewardHandler extends AbstractPacketHandler { if (reward.period != -1) { item.setExpiration(currentServerTime() + (reward.period * 60 * 60 * 10)); } - MapleInventoryManipulator.addFromDrop(c, item, false); + InventoryManipulator.addFromDrop(c, item, false); } else { - MapleInventoryManipulator.addById(c, reward.itemid, reward.quantity, "", -1); + InventoryManipulator.addById(c, reward.itemid, reward.quantity, "", -1); } - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, false, false); + InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, false, false); if (reward.worldmsg != null) { String msg = reward.worldmsg; msg.replaceAll("/name", c.getPlayer().getName()); diff --git a/src/main/java/net/server/channel/handlers/MTSHandler.java b/src/main/java/net/server/channel/handlers/MTSHandler.java index 2caaa48812..7dea9d0816 100644 --- a/src/main/java/net/server/channel/handlers/MTSHandler.java +++ b/src/main/java/net/server/channel/handlers/MTSHandler.java @@ -26,7 +26,7 @@ import client.MapleClient; import client.inventory.Equip; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -213,7 +213,7 @@ public final class MTSHandler extends AbstractPacketHandler { } ps.executeUpdate(); ps.close(); - MapleInventoryManipulator.removeFromSlot(c, invType, slot, quantity, false); + InventoryManipulator.removeFromSlot(c, invType, slot, quantity, false); con.close(); } catch (SQLException e) { @@ -343,7 +343,7 @@ public final class MTSHandler extends AbstractPacketHandler { pse.setInt(2, c.getPlayer().getId()); pse.executeUpdate(); } - MapleInventoryManipulator.addFromDrop(c, i, false); + InventoryManipulator.addFromDrop(c, i, false); c.enableCSActions(); c.sendPacket(getCart(c.getPlayer().getId())); c.sendPacket(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage())); diff --git a/src/main/java/net/server/channel/handlers/PetFoodHandler.java b/src/main/java/net/server/channel/handlers/PetFoodHandler.java index 40a6008b77..c77addc29b 100644 --- a/src/main/java/net/server/channel/handlers/PetFoodHandler.java +++ b/src/main/java/net/server/channel/handlers/PetFoodHandler.java @@ -28,7 +28,7 @@ import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.Pet; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.Server; @@ -80,7 +80,7 @@ public final class PetFoodHandler extends AbstractPacketHandler { } pet.gainClosenessFullness(chr, (pet.getFullness() <= 75) ? 1 : 0, 30, 1); // 25+ "emptyness" to get +1 closeness - MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, pos, (short) 1, false); + InventoryManipulator.removeFromSlot(c, InventoryType.USE, pos, (short) 1, false); } finally { useInv.unlockInventory(); } diff --git a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java b/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java index 1324672d32..a4e7c3e045 100644 --- a/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java @@ -27,7 +27,7 @@ import client.autoban.AutobanFactory; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; import constants.game.GameConstants; @@ -363,7 +363,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler { if (shop != null && shop.isOwner(chr)) { if(YamlConfig.config.server.USE_ERASE_PERMIT_ON_OPENSHOP) { try { - MapleInventoryManipulator.removeById(c, InventoryType.CASH, shop.getItemId(), 1, true, false); + InventoryManipulator.removeById(c, InventoryType.CASH, shop.getItemId(), 1, true, false); } catch(RuntimeException re) {} // fella does not have a player shop permit... } @@ -537,7 +537,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler { tradeItem.setPosition(targetSlot); if (trade.addItem(tradeItem)) { - MapleInventoryManipulator.removeFromSlot(c, ivType, item.getPosition(), quantity, true); + InventoryManipulator.removeFromSlot(c, ivType, item.getPosition(), quantity, true); trade.getChr().sendPacket(PacketCreator.getTradeItemAdd((byte) 0, tradeItem)); if (trade.getPartner() != null) { @@ -609,9 +609,9 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler { } if (ItemConstants.isRechargeable(ivItem.getItemId())) { - MapleInventoryManipulator.removeFromSlot(c, ivType, slot, ivItem.getQuantity(), true); + InventoryManipulator.removeFromSlot(c, ivType, slot, ivItem.getQuantity(), true); } else { - MapleInventoryManipulator.removeFromSlot(c, ivType, slot, (short) (bundles * perBundle), true); + InventoryManipulator.removeFromSlot(c, ivType, slot, (short) (bundles * perBundle), true); } c.sendPacket(PacketCreator.getPlayerShopItemUpdate(shop)); @@ -627,9 +627,9 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler { } if (ItemConstants.isRechargeable(ivItem.getItemId())) { - MapleInventoryManipulator.removeFromSlot(c, ivType, slot, ivItem.getQuantity(), true); + InventoryManipulator.removeFromSlot(c, ivType, slot, ivItem.getQuantity(), true); } else { - MapleInventoryManipulator.removeFromSlot(c, ivType, slot, (short) (bundles * perBundle), true); + InventoryManipulator.removeFromSlot(c, ivType, slot, (short) (bundles * perBundle), true); } c.sendPacket(PacketCreator.updateHiredMerchant(merchant, chr)); diff --git a/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java b/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java index aad60870cd..5181af62a0 100644 --- a/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java +++ b/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java @@ -5,7 +5,7 @@ import client.MapleClient; import client.MapleQuestStatus; import client.inventory.Inventory; import client.inventory.InventoryType; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; import server.MapleItemInformationProvider; @@ -55,7 +55,7 @@ public class RaiseIncExpHandler extends AbstractPacketHandler { return; } - MapleInventoryManipulator.removeFromSlot(c, InventoryType.getByType(inventorytype), slot, (short) 1, false, true); + InventoryManipulator.removeFromSlot(c, InventoryType.getByType(inventorytype), slot, (short) 1, false, true); } finally { inv.unlockInventory(); } diff --git a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java index 228cba91fa..23d032f1bb 100644 --- a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java +++ b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java @@ -26,7 +26,7 @@ import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.WeaponType; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import config.YamlConfig; import constants.game.GameConstants; import constants.inventory.ItemConstants; @@ -167,7 +167,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { } if(slot < 0) System.out.println(" Projectile to use was unable to be found."); - else MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, bulletConsume, false, true); + else InventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, bulletConsume, false, true); } } diff --git a/src/main/java/net/server/channel/handlers/RingActionHandler.java b/src/main/java/net/server/channel/handlers/RingActionHandler.java index 997c3a963e..a2cddaa4c4 100644 --- a/src/main/java/net/server/channel/handlers/RingActionHandler.java +++ b/src/main/java/net/server/channel/handlers/RingActionHandler.java @@ -27,7 +27,7 @@ import client.MapleRing; import client.inventory.Equip; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.processor.npc.DueyProcessor; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -116,11 +116,11 @@ public final class RingActionHandler extends AbstractPacketHandler { source.dropMessage(1, "You may only propose to a " + (source.getGender() == 1 ? "male" : "female") + "!"); source.sendPacket(WeddingPackets.OnMarriageResult((byte) 0)); return; - } else if (!MapleInventoryManipulator.checkSpace(c, newBoxId, 1, "")) { + } else if (!InventoryManipulator.checkSpace(c, newBoxId, 1, "")) { source.dropMessage(5, "You don't have a ETC slot available right now!"); source.sendPacket(WeddingPackets.OnMarriageResult((byte) 0)); return; - } else if (!MapleInventoryManipulator.checkSpace(target.getClient(), newBoxId + 1, 1, "")) { + } else if (!InventoryManipulator.checkSpace(target.getClient(), newBoxId + 1, 1, "")) { source.dropMessage(5, "The girl you proposed doesn't have a ETC slot available right now."); source.sendPacket(WeddingPackets.OnMarriageResult((byte) 0)); return; @@ -230,7 +230,7 @@ public final class RingActionHandler extends AbstractPacketHandler { int partnerMarriageitemid = marriageitemid + ((chr.getGender() == 0) ? 1 : -1); if(partner.haveItem(partnerMarriageitemid)) { - MapleInventoryManipulator.removeById(partner.getClient(), InventoryType.ETC, partnerMarriageitemid, (short) 1, false, false); + InventoryManipulator.removeById(partner.getClient(), InventoryType.ETC, partnerMarriageitemid, (short) 1, false, false); } //partner.sendPacket(Wedding.OnMarriageResult((byte) 0)); ok, how to gracefully unengage someone without the need to cc? @@ -240,7 +240,7 @@ public final class RingActionHandler extends AbstractPacketHandler { } if(chr.haveItem(marriageitemid)) { - MapleInventoryManipulator.removeById(chr.getClient(), InventoryType.ETC, marriageitemid, (short) 1, false, false); + InventoryManipulator.removeById(chr.getClient(), InventoryType.ETC, marriageitemid, (short) 1, false, false); } chr.dropMessage(5, "You have successfully break the engagement with " + MapleCharacter.getNameById(partnerid) + "."); @@ -279,14 +279,14 @@ public final class RingActionHandler extends AbstractPacketHandler { Equip ringEqp = (Equip) ringObj; ringEqp.setRingId(rings.getLeft()); player.addMarriageRing(MapleRing.loadFromDb(rings.getLeft())); - MapleInventoryManipulator.addFromDrop(player.getClient(), ringEqp, false, -1); + InventoryManipulator.addFromDrop(player.getClient(), ringEqp, false, -1); player.broadcastMarriageMessage(); ringObj = ii.getEquipById(marriageRingId); ringEqp = (Equip) ringObj; ringEqp.setRingId(rings.getRight()); partner.addMarriageRing(MapleRing.loadFromDb(rings.getRight())); - MapleInventoryManipulator.addFromDrop(partner.getClient(), ringEqp, false, -1); + InventoryManipulator.addFromDrop(partner.getClient(), ringEqp, false, -1); partner.broadcastMarriageMessage(); } @@ -327,13 +327,13 @@ public final class RingActionHandler extends AbstractPacketHandler { if (accepted) { final int newItemId = getBoxId(itemid); - if (!MapleInventoryManipulator.checkSpace(c, newItemId, 1, "") || !MapleInventoryManipulator.checkSpace(source.getClient(), newItemId, 1, "")) { + if (!InventoryManipulator.checkSpace(c, newItemId, 1, "") || !InventoryManipulator.checkSpace(source.getClient(), newItemId, 1, "")) { target.sendPacket(PacketCreator.enableActions()); return; } try { - MapleInventoryManipulator.removeById(source.getClient(), InventoryType.USE, itemid, 1, false, false); + InventoryManipulator.removeById(source.getClient(), InventoryType.USE, itemid, 1, false, false); int marriageId = c.getWorldServer().createRelationship(source.getId(), target.getId()); source.setPartnerId(target.getId()); // engage them (new marriageitemid, partnerid for both) @@ -342,8 +342,8 @@ public final class RingActionHandler extends AbstractPacketHandler { source.setMarriageItemId(newItemId); target.setMarriageItemId(newItemId + 1); - MapleInventoryManipulator.addById(source.getClient(), newItemId, (short) 1); - MapleInventoryManipulator.addById(c, (newItemId + 1), (short) 1); + InventoryManipulator.addById(source.getClient(), newItemId, (short) 1); + InventoryManipulator.addById(c, (newItemId + 1), (short) 1); source.sendPacket(WeddingPackets.OnMarriageResult(marriageId, source, false)); target.sendPacket(WeddingPackets.OnMarriageResult(marriageId, source, false)); @@ -405,7 +405,7 @@ public final class RingActionHandler extends AbstractPacketHandler { long expiration = cserv.getWeddingTicketExpireTime(resStatus + 1); MapleCharacter guestChr = c.getWorldServer().getPlayerStorage().getCharacterById(guest); - if(guestChr != null && MapleInventoryManipulator.checkSpace(guestChr.getClient(), newItemId, 1, "") && MapleInventoryManipulator.addById(guestChr.getClient(), newItemId, (short) 1, expiration)) { + if(guestChr != null && InventoryManipulator.checkSpace(guestChr.getClient(), newItemId, 1, "") && InventoryManipulator.addById(guestChr.getClient(), newItemId, (short) 1, expiration)) { guestChr.dropMessage(6, "[Wedding] You've been invited to " + groom + " and " + bride + "'s Wedding!"); } else { if(guestChr != null && guestChr.isLoggedinWorld()) { diff --git a/src/main/java/net/server/channel/handlers/ScrollHandler.java b/src/main/java/net/server/channel/handlers/ScrollHandler.java index 3b213fa283..232138ed39 100644 --- a/src/main/java/net/server/channel/handlers/ScrollHandler.java +++ b/src/main/java/net/server/channel/handlers/ScrollHandler.java @@ -27,7 +27,7 @@ import client.Skill; import client.SkillFactory; import client.inventory.*; import client.inventory.Equip.ScrollResult; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -128,10 +128,10 @@ public final class ScrollHandler extends AbstractPacketHandler { return; } - MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, wscroll.getPosition(), (short) 1, false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.USE, wscroll.getPosition(), (short) 1, false, false); } - MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, scroll.getPosition(), (short) 1, false); + InventoryManipulator.removeFromSlot(c, InventoryType.USE, scroll.getPosition(), (short) 1, false); } finally { useInventory.unlockInventory(); } diff --git a/src/main/java/net/server/channel/handlers/SkillBookHandler.java b/src/main/java/net/server/channel/handlers/SkillBookHandler.java index d48c959e8b..780bc19269 100644 --- a/src/main/java/net/server/channel/handlers/SkillBookHandler.java +++ b/src/main/java/net/server/channel/handlers/SkillBookHandler.java @@ -28,7 +28,7 @@ import client.SkillFactory; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; import server.MapleItemInformationProvider; @@ -76,7 +76,7 @@ public final class SkillBookHandler extends AbstractPacketHandler { return; } - MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); + InventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); } finally { inv.unlockInventory(); } diff --git a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java index 8e4239a574..a65c46894a 100644 --- a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java @@ -25,7 +25,7 @@ import client.*; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.status.MonsterStatus; import client.status.MonsterStatusEffect; import config.YamlConfig; @@ -109,7 +109,7 @@ public final class TakeDamageHandler extends AbstractPacketHandler { inv.lockInventory(); try { qty = Math.min(chr.countItem(loseItem.getId()), dropCount); - MapleInventoryManipulator.removeById(c, type, loseItem.getId(), qty, false, false); + InventoryManipulator.removeById(c, type, loseItem.getId(), qty, false, false); } finally { inv.unlockInventory(); } diff --git a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java index 564a71eddd..0a86643459 100644 --- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java @@ -25,7 +25,7 @@ import client.*; import client.creator.veteran.*; import client.inventory.*; import client.inventory.Equip.ScrollResult; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import client.processor.npc.DueyProcessor; import client.processor.stat.AssignAPProcessor; @@ -132,7 +132,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { } if (!success) { - MapleInventoryManipulator.addById(c, itemId, (short) 1); + InventoryManipulator.addById(c, itemId, (short) 1); c.sendPacket(PacketCreator.enableActions()); } } else if (itemType == 505) { // AP/SP reset @@ -243,7 +243,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { return; } if (getIncubatedItem(c, itemId)) { - MapleInventoryManipulator.removeFromSlot(c, InventoryType.getByType(inventory2), slot2, (short) 1, false); + InventoryManipulator.removeFromSlot(c, InventoryType.getByType(inventory2), slot2, (short) 1, false); remove(c, position, itemId); } return; @@ -570,7 +570,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { c.sendPacket(PacketCreator.sendVegaScroll(scrolled.getLevel() > curlevel ? 0x41 : 0x43)); //opcodes 0x42, 0x44: "this item cannot be used"; 0x39, 0x45: crashes - MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, uSlot, (short) 1, false); + InventoryManipulator.removeFromSlot(c, InventoryType.USE, uSlot, (short) 1, false); remove(c, position, itemId); final MapleClient client = c; @@ -612,7 +612,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { } } - MapleInventoryManipulator.removeFromSlot(c, InventoryType.CASH, position, (short) 1, true, false); + InventoryManipulator.removeFromSlot(c, InventoryType.CASH, position, (short) 1, true, false); } finally { cashInv.unlockInventory(); } @@ -630,7 +630,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { if (c.getPlayer().getInventory(InventoryType.getByType((byte) (id / 1000000))).isFull()) { return false; } - MapleInventoryManipulator.addById(c, id, (short) amount); + InventoryManipulator.addById(c, id, (short) amount); return true; } } diff --git a/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java b/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java index 8d60dc3d67..632ba6a686 100644 --- a/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCatchItemHandler.java @@ -25,7 +25,7 @@ import client.MapleCharacter; import client.MapleClient; import client.autoban.AutobanManager; import client.inventory.InventoryType; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -61,8 +61,8 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getId() == 9300101) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); - MapleInventoryManipulator.addById(c, 1902000, (short) 1, "", -1); + InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); + InventoryManipulator.addById(c, 1902000, (short) 1, "", -1); } c.sendPacket(PacketCreator.enableActions()); break; @@ -72,8 +72,8 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); - MapleInventoryManipulator.addById(c, 4031830, (short) 1, "", -1); + InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); + InventoryManipulator.addById(c, 4031830, (short) 1, "", -1); } else { abm.spam(10); c.sendPacket(PacketCreator.catchMessage(0)); @@ -90,8 +90,8 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (Math.random() < 0.5) { // 50% chance chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); - MapleInventoryManipulator.addById(c, 4031868, (short) 1, "", -1); + InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); + InventoryManipulator.addById(c, 4031868, (short) 1, "", -1); } else { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 0)); } @@ -112,8 +112,8 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); - MapleInventoryManipulator.addById(c, 4031887, (short) 1, "", -1); + InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); + InventoryManipulator.addById(c, 4031887, (short) 1, "", -1); } else { c.sendPacket(PacketCreator.catchMessage(0)); } @@ -125,8 +125,8 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); - MapleInventoryManipulator.addById(c, 2109001, (short) 1, "", -1); + InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); + InventoryManipulator.addById(c, 2109001, (short) 1, "", -1); } else { c.sendPacket(PacketCreator.catchMessage(0)); } @@ -138,8 +138,8 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); - MapleInventoryManipulator.addById(c, 2109002, (short) 1, "", -1); + InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); + InventoryManipulator.addById(c, 2109002, (short) 1, "", -1); } else { c.sendPacket(PacketCreator.catchMessage(0)); } @@ -151,8 +151,8 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); - MapleInventoryManipulator.addById(c, 2109003, (short) 1, "", -1); + InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); + InventoryManipulator.addById(c, 2109003, (short) 1, "", -1); } else { c.sendPacket(PacketCreator.catchMessage(0)); } @@ -164,8 +164,8 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); - MapleInventoryManipulator.addById(c, 4001169, (short) 1, "", -1); + InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); + InventoryManipulator.addById(c, 4001169, (short) 1, "", -1); } else { c.sendPacket(PacketCreator.catchMessage(0)); } @@ -178,8 +178,8 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { abm.spam(10); chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); - MapleInventoryManipulator.addById(c, 2022323, (short) 1, "", -1); + InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); + InventoryManipulator.addById(c, 2022323, (short) 1, "", -1); } else { chr.message("You cannot use the Fishing Net yet."); } @@ -201,8 +201,8 @@ public final class UseCatchItemHandler extends AbstractPacketHandler { if (mobHp != 0 && mob.getHp() < ((mob.getMaxHp() / 100) * mobHp)) { chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1)); mob.getMap().killMonster(mob, null, false); - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); - MapleInventoryManipulator.addById(c, itemGanho, (short) 1, "", -1); + InventoryManipulator.removeById(c, InventoryType.USE, itemId, 1, true, true); + InventoryManipulator.addById(c, itemGanho, (short) 1, "", -1); } else if (mob.getId() != 9500336) { if (mobHp != 0) { abm.spam(10); diff --git a/src/main/java/net/server/channel/handlers/UseItemHandler.java b/src/main/java/net/server/channel/handlers/UseItemHandler.java index 465001b069..6893be9aec 100644 --- a/src/main/java/net/server/channel/handlers/UseItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseItemHandler.java @@ -26,7 +26,7 @@ import client.MapleClient; import client.MapleDisease; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; @@ -107,7 +107,7 @@ public final class UseItemHandler extends AbstractPacketHandler { } private void remove(MapleClient c, short slot) { - MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); + InventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); c.sendPacket(PacketCreator.enableActions()); } } diff --git a/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java b/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java index 7f7681b9ab..7ddb4771e3 100644 --- a/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java +++ b/src/main/java/net/server/channel/handlers/UseMountFoodHandler.java @@ -27,7 +27,7 @@ import client.MapleMount; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import constants.game.ExpTable; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -73,7 +73,7 @@ public final class UseMountFoodHandler extends AbstractPacketHandler { mountLevelup = levelup; } - MapleInventoryManipulator.removeById(c, InventoryType.USE, itemid, 1, true, false); + InventoryManipulator.removeById(c, InventoryType.USE, itemid, 1, true, false); } } finally { useInv.unlockInventory(); diff --git a/src/main/java/net/server/channel/handlers/UseSolomonHandler.java b/src/main/java/net/server/channel/handlers/UseSolomonHandler.java index a3454e6842..a9c53af9f7 100644 --- a/src/main/java/net/server/channel/handlers/UseSolomonHandler.java +++ b/src/main/java/net/server/channel/handlers/UseSolomonHandler.java @@ -26,7 +26,7 @@ import client.MapleClient; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; import server.MapleItemInformationProvider; @@ -66,7 +66,7 @@ public final class UseSolomonHandler extends AbstractPacketHandler { return; } chr.addGachaExp((int) gachaexp); - MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); + InventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); } finally { inv.unlockInventory(); } diff --git a/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java b/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java index 87fef6afd5..7858cd4acd 100644 --- a/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java +++ b/src/main/java/net/server/channel/handlers/UseSummonBagHandler.java @@ -24,7 +24,7 @@ package net.server.channel.handlers; import client.MapleClient; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import net.AbstractPacketHandler; import net.packet.InPacket; import server.MapleItemInformationProvider; @@ -50,7 +50,7 @@ public final class UseSummonBagHandler extends AbstractPacketHandler { int itemId = p.readInt(); Item toUse = c.getPlayer().getInventory(InventoryType.USE).getItem(slot); if (toUse != null && toUse.getQuantity() > 0 && toUse.getItemId() == itemId) { - MapleInventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); + InventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false); int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(itemId); for (int[] toSpawnChild : toSpawn) { if (Randomizer.nextInt(100) < toSpawnChild[1]) { diff --git a/src/main/java/net/server/channel/handlers/WeddingHandler.java b/src/main/java/net/server/channel/handlers/WeddingHandler.java index fe79b7c6d7..105226d07f 100644 --- a/src/main/java/net/server/channel/handlers/WeddingHandler.java +++ b/src/main/java/net/server/channel/handlers/WeddingHandler.java @@ -12,7 +12,7 @@ import client.MapleClient; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; import constants.inventory.ItemConstants; @@ -69,7 +69,7 @@ public final class WeddingHandler extends AbstractPacketHandler { newItem = item.copy(); marriage.addGiftItem(groomWishlist, newItem); - MapleInventoryManipulator.removeFromSlot(c, type, slot, quantity, false, false); + InventoryManipulator.removeFromSlot(c, type, slot, quantity, false, false); MapleKarmaManipulator.toggleKarmaFlagToUntradeable(newItem); marriage.setIntProperty(groomWishlistProp, giftCount + 1); @@ -115,7 +115,7 @@ public final class WeddingHandler extends AbstractPacketHandler { marriage.removeGiftItem(groomWishlist, item); marriage.saveGiftItemsToDb(c, groomWishlist, chr.getId()); - MapleInventoryManipulator.addFromDrop(c, item, true); + InventoryManipulator.addFromDrop(c, item, true); c.sendPacket(WeddingPackets.onWeddingGiftResult((byte) 0xF, marriage.getWishlistItems(groomWishlist), marriage.getGiftItems(c, groomWishlist))); } else { @@ -135,7 +135,7 @@ public final class WeddingHandler extends AbstractPacketHandler { items.remove(itemPos); MapleMarriage.saveGiftItemsToDb(c, items, chr.getId()); - MapleInventoryManipulator.addFromDrop(c, item, true); + InventoryManipulator.addFromDrop(c, item, true); c.sendPacket(WeddingPackets.onWeddingGiftResult((byte) 0xF, Collections.singletonList(""), items)); } else { c.getPlayer().dropMessage(1, "Free a slot on your inventory before collecting this item."); diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index efe49b24fc..5a60820bc2 100644 --- a/src/main/java/scripting/AbstractPlayerInteraction.java +++ b/src/main/java/scripting/AbstractPlayerInteraction.java @@ -24,7 +24,7 @@ package scripting; import client.*; import client.MapleCharacter.DelayedQuestUpdate; import client.inventory.*; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import config.YamlConfig; import constants.game.GameConstants; import constants.inventory.ItemConstants; @@ -297,7 +297,7 @@ public class AbstractPlayerInteraction { prfInv.cloneContents(inv); for(Pair p : toRemove) { - MapleInventoryManipulator.removeById(c, InventoryType.CANHOLD, p.getLeft(), p.getRight(), false, false); + InventoryManipulator.removeById(c, InventoryType.CANHOLD, p.getLeft(), p.getRight(), false, false); } List> addItems = prepareProofInventoryItems(toAdd); @@ -532,7 +532,7 @@ public class AbstractPlayerInteraction { chr.getClient().getWorldServer().registerPetHunger(chr, chr.getPetIndex(evolved)); */ - MapleInventoryManipulator.removeFromSlot(c, InventoryType.CASH, target.getPosition(), (short) 1, false); + InventoryManipulator.removeFromSlot(c, InventoryType.CASH, target.getPosition(), (short) 1, false); return evolved; } @@ -588,7 +588,7 @@ public class AbstractPlayerInteraction { evolved.saveToDb(); } - //MapleInventoryManipulator.addById(c, id, (short) 1, null, petId, expires == -1 ? -1 : System.currentTimeMillis() + expires); + //InventoryManipulator.addById(c, id, (short) 1, null, petId, expires == -1 ? -1 : System.currentTimeMillis() + expires); } MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); @@ -618,21 +618,21 @@ public class AbstractPlayerInteraction { item.setExpiration(System.currentTimeMillis() + expires); } - if (!MapleInventoryManipulator.checkSpace(c, id, quantity, "")) { + if (!InventoryManipulator.checkSpace(c, id, quantity, "")) { c.getPlayer().dropMessage(1, "Your inventory is full. Please remove an item from your " + ItemConstants.getInventoryType(id).name() + " inventory."); return null; } if (ItemConstants.getInventoryType(id) == InventoryType.EQUIP) { if (randomStats) { - MapleInventoryManipulator.addFromDrop(c, ii.randomizeStats((Equip) item), false, petId); + InventoryManipulator.addFromDrop(c, ii.randomizeStats((Equip) item), false, petId); } else { - MapleInventoryManipulator.addFromDrop(c, item, false, petId); + InventoryManipulator.addFromDrop(c, item, false, petId); } } else { - MapleInventoryManipulator.addFromDrop(c, item, false, petId); + InventoryManipulator.addFromDrop(c, item, false, petId); } } else { - MapleInventoryManipulator.removeById(c, ItemConstants.getInventoryType(id), id, -quantity, true, false); + InventoryManipulator.removeById(c, ItemConstants.getInventoryType(id), id, -quantity, true, false); } if (showMessage) { c.sendPacket(PacketCreator.getShowItemGain(id, quantity, true)); @@ -750,9 +750,9 @@ public class AbstractPlayerInteraction { for (MapleCharacter chr : party) { MapleClient cl = chr.getClient(); if (quantity >= 0) { - MapleInventoryManipulator.addById(cl, id, quantity); + InventoryManipulator.addById(cl, id, quantity); } else { - MapleInventoryManipulator.removeById(cl, ItemConstants.getInventoryType(id), id, -quantity, true, false); + InventoryManipulator.removeById(cl, ItemConstants.getInventoryType(id), id, -quantity, true, false); } cl.sendPacket(PacketCreator.getShowItemGain(id, quantity, true)); } @@ -846,7 +846,7 @@ public class AbstractPlayerInteraction { Inventory iv = chr.getInventory(type); int possesed = iv.countById(id); if (possesed > 0) { - MapleInventoryManipulator.removeById(c, ItemConstants.getInventoryType(id), id, possesed, true, false); + InventoryManipulator.removeById(c, ItemConstants.getInventoryType(id), id, possesed, true, false); chr.sendPacket(PacketCreator.getShowItemGain(id, (short) -possesed, true)); } } @@ -860,13 +860,13 @@ public class AbstractPlayerInteraction { InventoryType invType = ItemConstants.getInventoryType(id); int possessed = cl.getPlayer().getInventory(invType).countById(id); if (possessed > 0) { - MapleInventoryManipulator.removeById(cl, ItemConstants.getInventoryType(id), id, possessed, true, false); + InventoryManipulator.removeById(cl, ItemConstants.getInventoryType(id), id, possessed, true, false); cl.sendPacket(PacketCreator.getShowItemGain(id, (short) -possessed, true)); } if(invType == InventoryType.EQUIP) { if(cl.getPlayer().getInventory(InventoryType.EQUIPPED).countById(id) > 0) { - MapleInventoryManipulator.removeById(cl, InventoryType.EQUIPPED, id, 1, true, false); + InventoryManipulator.removeById(cl, InventoryType.EQUIPPED, id, 1, true, false); cl.sendPacket(PacketCreator.getShowItemGain(id, (short) -1, true)); } } @@ -932,13 +932,13 @@ public class AbstractPlayerInteraction { public void removeEquipFromSlot(short slot) { Item tempItem = c.getPlayer().getInventory(InventoryType.EQUIPPED).getItem(slot); - MapleInventoryManipulator.removeFromSlot(c, InventoryType.EQUIPPED, slot, tempItem.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.EQUIPPED, slot, tempItem.getQuantity(), false, false); } public void gainAndEquip(int itemid, short slot) { final Item old = c.getPlayer().getInventory(InventoryType.EQUIPPED).getItem(slot); if (old != null) { - MapleInventoryManipulator.removeFromSlot(c, InventoryType.EQUIPPED, slot, old.getQuantity(), false, false); + InventoryManipulator.removeFromSlot(c, InventoryType.EQUIPPED, slot, old.getQuantity(), false, false); } final Item newItem = MapleItemInformationProvider.getInstance().getEquipById(itemid); newItem.setPosition(slot); diff --git a/src/main/java/server/MapleMarriage.java b/src/main/java/server/MapleMarriage.java index 52fc7fd55d..4fc85919b1 100644 --- a/src/main/java/server/MapleMarriage.java +++ b/src/main/java/server/MapleMarriage.java @@ -25,7 +25,7 @@ import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.ItemFactory; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import scripting.event.EventInstanceManager; import scripting.event.EventManager; import tools.DatabaseConnection; @@ -126,7 +126,7 @@ public class MapleMarriage extends EventInstanceManager { } for (Item item : gifts) { - MapleInventoryManipulator.addFromDrop(chr.getClient(), item, false); + InventoryManipulator.addFromDrop(chr.getClient(), item, false); } return true; diff --git a/src/main/java/server/MapleShop.java b/src/main/java/server/MapleShop.java index a8ab926393..5c53a8b2dd 100644 --- a/src/main/java/server/MapleShop.java +++ b/src/main/java/server/MapleShop.java @@ -25,7 +25,7 @@ import client.MapleClient; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.Pet; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import constants.inventory.ItemConstants; import tools.DatabaseConnection; import tools.PacketCreator; @@ -93,14 +93,14 @@ public class MapleShop { if (item.getPrice() > 0) { int amount = (int)Math.min((float) item.getPrice() * quantity, Integer.MAX_VALUE); if (c.getPlayer().getMeso() >= amount) { - if (MapleInventoryManipulator.checkSpace(c, itemId, quantity, "")) { + if (InventoryManipulator.checkSpace(c, itemId, quantity, "")) { if (!ItemConstants.isRechargeable(itemId)) { //Pets can't be bought from shops - MapleInventoryManipulator.addById(c, itemId, quantity, "", -1); + InventoryManipulator.addById(c, itemId, quantity, "", -1); c.getPlayer().gainMeso(-amount, false); } else { short slotMax = ii.getSlotMax(c, item.getItemId()); quantity = slotMax; - MapleInventoryManipulator.addById(c, itemId, quantity, "", -1); + InventoryManipulator.addById(c, itemId, quantity, "", -1); c.getPlayer().gainMeso(-item.getPrice(), false); } c.sendPacket(PacketCreator.shopTransaction((byte) 0)); @@ -114,15 +114,15 @@ public class MapleShop { int amount = (int)Math.min((float) item.getPitch() * quantity, Integer.MAX_VALUE); if (c.getPlayer().getInventory(InventoryType.ETC).countById(4310000) >= amount) { - if (MapleInventoryManipulator.checkSpace(c, itemId, quantity, "")) { + if (InventoryManipulator.checkSpace(c, itemId, quantity, "")) { if (!ItemConstants.isRechargeable(itemId)) { - MapleInventoryManipulator.addById(c, itemId, quantity, "", -1); - MapleInventoryManipulator.removeById(c, InventoryType.ETC, 4310000, amount, false, false); + InventoryManipulator.addById(c, itemId, quantity, "", -1); + InventoryManipulator.removeById(c, InventoryType.ETC, 4310000, amount, false, false); } else { short slotMax = ii.getSlotMax(c, item.getItemId()); quantity = slotMax; - MapleInventoryManipulator.addById(c, itemId, quantity, "", -1); - MapleInventoryManipulator.removeById(c, InventoryType.ETC, 4310000, amount, false, false); + InventoryManipulator.addById(c, itemId, quantity, "", -1); + InventoryManipulator.removeById(c, InventoryType.ETC, 4310000, amount, false, false); } c.sendPacket(PacketCreator.shopTransaction((byte) 0)); } else @@ -136,12 +136,12 @@ public class MapleShop { if (c.getPlayer().getMeso() + value >= cost) { int cardreduce = value - cost; int diff = cardreduce + c.getPlayer().getMeso(); - if (MapleInventoryManipulator.checkSpace(c, itemId, quantity, "")) { + if (InventoryManipulator.checkSpace(c, itemId, quantity, "")) { if (ItemConstants.isPet(itemId)) { int petid = Pet.createPet(itemId); - MapleInventoryManipulator.addById(c, itemId, quantity, "", petid, -1); + InventoryManipulator.addById(c, itemId, quantity, "", petid, -1); } else { - MapleInventoryManipulator.addById(c, itemId, quantity, "", -1, -1); + InventoryManipulator.addById(c, itemId, quantity, "", -1, -1); } c.getPlayer().gainMeso(diff, false); } else { @@ -196,7 +196,7 @@ public class MapleShop { Item item = c.getPlayer().getInventory(type).getItem(slot); if(canSell(item, quantity)) { quantity = getSellingQuantity(item, quantity); - MapleInventoryManipulator.removeFromSlot(c, type, (byte) slot, quantity, false); + InventoryManipulator.removeFromSlot(c, type, (byte) slot, quantity, false); MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); int recvMesos = ii.getPrice(item.getItemId(), quantity); diff --git a/src/main/java/server/MapleStatEffect.java b/src/main/java/server/MapleStatEffect.java index ec64e15dbd..2270fb665c 100644 --- a/src/main/java/server/MapleStatEffect.java +++ b/src/main/java/server/MapleStatEffect.java @@ -25,7 +25,7 @@ import client.*; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.status.MonsterStatus; import client.status.MonsterStatusEffect; import config.YamlConfig; @@ -879,7 +879,7 @@ public class MapleStatEffect { applyto.sendPacket(PacketCreator.enableActions()); return false; } - MapleInventoryManipulator.removeById(applyto.getClient(), ItemConstants.getInventoryType(itemCon), itemCon, itemConNo, false, true); + InventoryManipulator.removeById(applyto.getClient(), ItemConstants.getInventoryType(itemCon), itemCon, itemConNo, false, true); } } else { if (isResurrection()) { @@ -956,7 +956,7 @@ public class MapleStatEffect { if (projectile == null) { return false; } else { - MapleInventoryManipulator.removeFromSlot(applyto.getClient(), InventoryType.USE, projectile.getPosition(), projectileConsume, false, true); + InventoryManipulator.removeFromSlot(applyto.getClient(), InventoryType.USE, projectile.getPosition(), projectileConsume, false, true); } } finally { use.unlockInventory(); @@ -1014,7 +1014,7 @@ public class MapleStatEffect { door.getTarget().spawnDoor(door.getAreaDoor()); door.getTown().spawnDoor(door.getTownDoor()); } else { - MapleInventoryManipulator.addFromDrop(applyto.getClient(), new Item(4006000, (short) 0, (short) 1), false); + InventoryManipulator.addFromDrop(applyto.getClient(), new Item(4006000, (short) 0, (short) 1), false); if (door.getOwnerId() == -3) { applyto.dropMessage(5, "Mystic Door cannot be cast far from a spawn point. Nearest one is at " + door.getDoorStatus().getRight() + "pts " + door.getDoorStatus().getLeft()); diff --git a/src/main/java/server/MapleTrade.java b/src/main/java/server/MapleTrade.java index a8df4db60e..7ba3b1e4f5 100644 --- a/src/main/java/server/MapleTrade.java +++ b/src/main/java/server/MapleTrade.java @@ -25,7 +25,7 @@ import client.MapleCharacter; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import config.YamlConfig; import constants.game.GameConstants; @@ -120,7 +120,7 @@ public class MapleTrade { for (Item item : exchangeItems) { MapleKarmaManipulator.toggleKarmaFlagToUntradeable(item); - MapleInventoryManipulator.addFromDrop(chr.getClient(), item, show); + InventoryManipulator.addFromDrop(chr.getClient(), item, show); } if (exchangeMeso > 0) { @@ -150,7 +150,7 @@ public class MapleTrade { boolean show = YamlConfig.config.server.USE_DEBUG; for (Item item : items) { - MapleInventoryManipulator.addFromDrop(chr.getClient(), item, show); + InventoryManipulator.addFromDrop(chr.getClient(), item, show); } if (meso > 0) { chr.gainMeso(meso, show, true, show); diff --git a/src/main/java/server/maps/MapleHiredMerchant.java b/src/main/java/server/maps/MapleHiredMerchant.java index 8b63d0f0ab..8686ebee17 100644 --- a/src/main/java/server/maps/MapleHiredMerchant.java +++ b/src/main/java/server/maps/MapleHiredMerchant.java @@ -27,7 +27,7 @@ import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.ItemFactory; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import client.processor.npc.FredrickProcessor; import config.YamlConfig; @@ -226,7 +226,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { return; } - MapleInventoryManipulator.addFromDrop(chr.getClient(), iitem, true); + InventoryManipulator.addFromDrop(chr.getClient(), iitem, true); } removeFromSlot(slot); @@ -240,7 +240,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { } private static boolean canBuy(MapleClient c, Item newItem) { // thanks xiaokelvin (Conrad) for noticing a leaked test code here - return MapleInventoryManipulator.checkSpace(c, newItem.getItemId(), newItem.getQuantity(), newItem.getOwner()) && MapleInventoryManipulator.addFromDrop(c, newItem, false); + return InventoryManipulator.checkSpace(c, newItem.getItemId(), newItem.getQuantity(), newItem.getOwner()) && InventoryManipulator.addFromDrop(c, newItem, false); } private int getQuantityLeft(int itemid) { @@ -411,9 +411,9 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { for (MaplePlayerShopItem mpsi : copyItems) { if (mpsi.isExist()) { if (mpsi.getItem().getInventoryType().equals(InventoryType.EQUIP)) { - MapleInventoryManipulator.addFromDrop(c, mpsi.getItem(), false); + InventoryManipulator.addFromDrop(c, mpsi.getItem(), false); } else { - MapleInventoryManipulator.addById(c, mpsi.getItem().getItemId(), (short) (mpsi.getBundles() * mpsi.getItem().getQuantity()), mpsi.getItem().getOwner(), -1, mpsi.getItem().getFlag(), mpsi.getItem().getExpiration()); + InventoryManipulator.addById(c, mpsi.getItem().getItemId(), (short) (mpsi.getBundles() * mpsi.getItem().getQuantity()), mpsi.getItem().getOwner(), -1, mpsi.getItem().getFlag(), mpsi.getItem().getExpiration()); } } } diff --git a/src/main/java/server/maps/MaplePlayerShop.java b/src/main/java/server/maps/MaplePlayerShop.java index 8c463de2ab..4392633c8e 100644 --- a/src/main/java/server/maps/MaplePlayerShop.java +++ b/src/main/java/server/maps/MaplePlayerShop.java @@ -26,7 +26,7 @@ import client.MapleClient; import client.inventory.Inventory; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import client.inventory.manipulator.MapleKarmaManipulator; import net.packet.Packet; import net.server.audit.locks.MonitoredLockType; @@ -213,7 +213,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { } private static boolean canBuy(MapleClient c, Item newItem) { - return MapleInventoryManipulator.checkSpace(c, newItem.getItemId(), newItem.getQuantity(), newItem.getOwner()) && MapleInventoryManipulator.addFromDrop(c, newItem, false); + return InventoryManipulator.checkSpace(c, newItem.getItemId(), newItem.getQuantity(), newItem.getOwner()) && InventoryManipulator.addFromDrop(c, newItem, false); } public void takeItemBack(int slot, MapleCharacter chr) { @@ -230,7 +230,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject { return; } - MapleInventoryManipulator.addFromDrop(chr.getClient(), iitem, true); + InventoryManipulator.addFromDrop(chr.getClient(), iitem, true); } removeFromSlot(slot); diff --git a/src/main/java/server/minigame/MapleRockPaperScissor.java b/src/main/java/server/minigame/MapleRockPaperScissor.java index 5cf1d19e84..ff61c07f65 100644 --- a/src/main/java/server/minigame/MapleRockPaperScissor.java +++ b/src/main/java/server/minigame/MapleRockPaperScissor.java @@ -2,7 +2,7 @@ package server.minigame; import client.MapleClient; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import tools.PacketCreator; import tools.Randomizer; @@ -72,7 +72,7 @@ public class MapleRockPaperScissor{ public final void reward(final MapleClient c){ if(win){ - MapleInventoryManipulator.addFromDrop(c, new Item(4031332 + round, (short) 0, (short) 1), true); + InventoryManipulator.addFromDrop(c, new Item(4031332 + round, (short) 0, (short) 1), true); } c.getPlayer().setRPS(null); } diff --git a/src/main/java/server/quest/actions/ItemAction.java b/src/main/java/server/quest/actions/ItemAction.java index e54ca48b85..5aa703acc2 100644 --- a/src/main/java/server/quest/actions/ItemAction.java +++ b/src/main/java/server/quest/actions/ItemAction.java @@ -25,7 +25,7 @@ import client.MapleCharacter; import client.MapleClient; import client.inventory.InventoryType; import client.inventory.Item; -import client.inventory.manipulator.MapleInventoryManipulator; +import client.inventory.manipulator.InventoryManipulator; import constants.inventory.ItemConstants; import provider.MapleData; import provider.MapleDataTool; @@ -142,14 +142,14 @@ public class ItemAction extends MapleQuestAction { } } - MapleInventoryManipulator.removeById(chr.getClient(), type, itemid, quantity, true, false); + InventoryManipulator.removeById(chr.getClient(), type, itemid, quantity, true, false); chr.sendPacket(PacketCreator.getShowItemGain(itemid, (short) count, true)); } for(ItemData iEntry: giveItem) { int itemid = iEntry.getId(), count = iEntry.getCount(), period = iEntry.getPeriod(); // thanks Vcoc for noticing quest milestone item not getting removed from inventory after a while - MapleInventoryManipulator.addById(chr.getClient(), itemid, (short) count, "", -1, period > 0 ? (System.currentTimeMillis() + period * 60 * 1000) : -1); + InventoryManipulator.addById(chr.getClient(), itemid, (short) count, "", -1, period > 0 ? (System.currentTimeMillis() + period * 60 * 1000) : -1); chr.sendPacket(PacketCreator.getShowItemGain(itemid, (short) count, true)); } } @@ -212,7 +212,7 @@ public class ItemAction extends MapleQuestAction { for(Pair it: randomList) { int idx = it.getRight().getType() - 1; - result = MapleInventoryManipulator.checkSpaceProgressively(c, it.getLeft().getItemId(), it.getLeft().getQuantity(), "", rndUsed.get(idx), false); + result = InventoryManipulator.checkSpaceProgressively(c, it.getLeft().getItemId(), it.getLeft().getQuantity(), "", rndUsed.get(idx), false); if(result % 2 == 0) { announceInventoryLimit(Collections.singletonList(it.getLeft().getItemId()), chr); return false; @@ -307,7 +307,7 @@ public class ItemAction extends MapleQuestAction { return false; } - MapleInventoryManipulator.addById(chr.getClient(), item.getId(), (short) missingQty); + InventoryManipulator.addById(chr.getClient(), item.getId(), (short) missingQty); FilePrinter.print(FilePrinter.QUEST_RESTORE_ITEM, chr + " obtained " + itemid + " qty. " + missingQty + " from quest " + questID); } return true; From 065ef632ac33d0566e53a0a7d242acd93e4438ba Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 20:55:47 +0200 Subject: [PATCH 007/125] Rename and clean up MapleKarmaManipulator --- src/main/java/client/inventory/Item.java | 4 ++-- ...eKarmaManipulator.java => KarmaManipulator.java} | 13 ++++++------- .../java/client/processor/npc/DueyProcessor.java | 4 ++-- .../java/client/processor/npc/StorageProcessor.java | 6 +++--- .../channel/handlers/PlayerInteractionHandler.java | 4 ++-- .../server/channel/handlers/UseCashItemHandler.java | 6 +++--- .../net/server/channel/handlers/WeddingHandler.java | 4 ++-- src/main/java/server/MapleTrade.java | 4 ++-- src/main/java/server/maps/MapleHiredMerchant.java | 4 ++-- src/main/java/server/maps/MaplePlayerShop.java | 4 ++-- 10 files changed, 26 insertions(+), 27 deletions(-) rename src/main/java/client/inventory/manipulator/{MapleKarmaManipulator.java => KarmaManipulator.java} (96%) 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 { From 280e28163ca05f0859973a6afb7855d4d3512f94 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 20:58:28 +0200 Subject: [PATCH 008/125] Rename and clean up MapleKeyBinding --- src/main/java/client/MapleCharacter.java | 20 +++++++++---------- .../{MapleKeyBinding.java => KeyBinding.java} | 7 ++++--- .../channel/handlers/KeymapChangeHandler.java | 8 ++++---- .../handlers/PlayerLoggedinHandler.java | 6 +++--- src/main/java/tools/PacketCreator.java | 6 +++--- 5 files changed, 24 insertions(+), 23 deletions(-) rename src/main/java/client/keybind/{MapleKeyBinding.java => KeyBinding.java} (90%) diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/MapleCharacter.java index 7cc72a00d4..8b692784ca 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/MapleCharacter.java @@ -28,7 +28,7 @@ import client.inventory.*; import client.inventory.Equip.StatUpgrade; import client.inventory.manipulator.CashIdGenerator; import client.inventory.manipulator.InventoryManipulator; -import client.keybind.MapleKeyBinding; +import client.keybind.KeyBinding; import client.keybind.MapleQuickslotBinding; import client.newyear.NewYearCardRecord; import client.processor.action.PetAutopotProcessor; @@ -188,7 +188,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private Map diseaseExpires = new LinkedHashMap<>(); private Map> buffEffects = new LinkedHashMap<>(); // non-overriding buffs thanks to Ronan private Map buffExpires = new LinkedHashMap<>(); - private Map keymap = new LinkedHashMap<>(); + private Map keymap = new LinkedHashMap<>(); private Map summons = new LinkedHashMap<>(); private Map coolDowns = new LinkedHashMap<>(); private EnumMap> diseases = new EnumMap<>(MapleDisease.class); @@ -395,7 +395,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } for (int i = 0; i < selectedKey.length; i++) { - ret.keymap.put(selectedKey[i], new MapleKeyBinding(selectedType[i], selectedAction[i])); + ret.keymap.put(selectedKey[i], new KeyBinding(selectedType[i], selectedAction[i])); } @@ -1203,7 +1203,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(packet); } - public void changeKeybinding(int key, MapleKeyBinding keybinding) { + public void changeKeybinding(int key, KeyBinding keybinding) { if (keybinding.getType() != 0) { keymap.put(Integer.valueOf(key), keybinding); } else { @@ -5157,7 +5157,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return job.getId() / 1000; } - public Map getKeymap() { + public Map getKeymap() { return keymap; } @@ -7376,7 +7376,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { int key = rs.getInt("key"); int type = rs.getInt("type"); int action = rs.getInt("action"); - ret.keymap.put(key, new MapleKeyBinding(type, action)); + ret.keymap.put(key, new KeyBinding(type, action)); } } } @@ -8514,8 +8514,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { try (PreparedStatement psKey = con.prepareStatement("INSERT INTO keymap (characterid, `key`, `type`, `action`) VALUES (?, ?, ?, ?)")) { psKey.setInt(1, id); - Set> keybindingItems = Collections.unmodifiableSet(keymap.entrySet()); - for (Entry keybinding : keybindingItems) { + Set> keybindingItems = Collections.unmodifiableSet(keymap.entrySet()); + for (Entry keybinding : keybindingItems) { psKey.setInt(2, keybinding.getKey()); psKey.setInt(3, keybinding.getValue().getType()); psKey.setInt(4, keybinding.getValue().getAction()); @@ -9107,7 +9107,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { // autopot on HPMP deplete... thanks shavit for finding out D. Roar doesn't trigger autopot request if (hpchange < 0) { - MapleKeyBinding autohpPot = this.getKeymap().get(91); + KeyBinding autohpPot = this.getKeymap().get(91); if (autohpPot != null) { int autohpItemid = autohpPot.getAction(); float autohpAlert = this.getAutopotHpAlert(); @@ -9122,7 +9122,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (mpchange < 0) { - MapleKeyBinding autompPot = this.getKeymap().get(92); + KeyBinding autompPot = this.getKeymap().get(92); if (autompPot != null) { int autompItemid = autompPot.getAction(); float autompAlert = this.getAutopotMpAlert(); diff --git a/src/main/java/client/keybind/MapleKeyBinding.java b/src/main/java/client/keybind/KeyBinding.java similarity index 90% rename from src/main/java/client/keybind/MapleKeyBinding.java rename to src/main/java/client/keybind/KeyBinding.java index a2b3f23a44..4eecef4a71 100644 --- a/src/main/java/client/keybind/MapleKeyBinding.java +++ b/src/main/java/client/keybind/KeyBinding.java @@ -21,10 +21,11 @@ */ package client.keybind; -public class MapleKeyBinding { - private int type, action; +public class KeyBinding { + private final int type; + private final int action; - public MapleKeyBinding(int type, int action) { + public KeyBinding(int type, int action) { this.type = type; this.action = action; } diff --git a/src/main/java/net/server/channel/handlers/KeymapChangeHandler.java b/src/main/java/net/server/channel/handlers/KeymapChangeHandler.java index 8e471ac2e8..818eea6d0d 100644 --- a/src/main/java/net/server/channel/handlers/KeymapChangeHandler.java +++ b/src/main/java/net/server/channel/handlers/KeymapChangeHandler.java @@ -25,7 +25,7 @@ import client.MapleClient; import client.Skill; import client.SkillFactory; import client.inventory.InventoryType; -import client.keybind.MapleKeyBinding; +import client.keybind.KeyBinding; import constants.game.GameConstants; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -61,7 +61,7 @@ public final class KeymapChangeHandler extends AbstractPacketHandler { } } - c.getPlayer().changeKeybinding(key, new MapleKeyBinding(type, action)); + c.getPlayer().changeKeybinding(key, new KeyBinding(type, action)); } } else if(mode == 1) { // Auto HP Potion int itemID = p.readInt(); @@ -69,14 +69,14 @@ public final class KeymapChangeHandler extends AbstractPacketHandler { c.disconnect(false, false); // Don't let them send a packet with a use item they dont have. return; } - c.getPlayer().changeKeybinding(91, new MapleKeyBinding(7, itemID)); + c.getPlayer().changeKeybinding(91, new KeyBinding(7, itemID)); } else if(mode == 2) { // Auto MP Potion int itemID = p.readInt(); if(itemID != 0 && c.getPlayer().getInventory(InventoryType.USE).findById(itemID) == null) { c.disconnect(false, false); // Don't let them send a packet with a use item they dont have. return; } - c.getPlayer().changeKeybinding(92, new MapleKeyBinding(7, itemID)); + c.getPlayer().changeKeybinding(92, new KeyBinding(7, itemID)); } } } diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index b2015d9dd1..32f7562479 100644 --- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.*; import client.inventory.*; -import client.keybind.MapleKeyBinding; +import client.keybind.KeyBinding; import config.YamlConfig; import constants.game.GameConstants; import net.AbstractPacketHandler; @@ -225,10 +225,10 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler { player.sendMacros(); // pot bindings being passed through other characters on the account detected thanks to Croosade dev team - MapleKeyBinding autohpPot = player.getKeymap().get(91); + KeyBinding autohpPot = player.getKeymap().get(91); player.sendPacket(PacketCreator.sendAutoHpPot(autohpPot != null ? autohpPot.getAction() : 0)); - MapleKeyBinding autompPot = player.getKeymap().get(92); + KeyBinding autompPot = player.getKeymap().get(92); player.sendPacket(PacketCreator.sendAutoMpPot(autompPot != null ? autompPot.getAction() : 0)); player.getMap().addPlayer(player); diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index 0483153a84..8e7e6c80a1 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -24,7 +24,7 @@ import client.*; import client.MapleCharacter.SkillEntry; import client.inventory.*; import client.inventory.Equip.ScrollResult; -import client.keybind.MapleKeyBinding; +import client.keybind.KeyBinding; import client.keybind.MapleQuickslotBinding; import client.newyear.NewYearCardRecord; import client.status.MonsterStatus; @@ -3468,11 +3468,11 @@ public class PacketCreator { return p; } - public static Packet getKeymap(Map keybindings) { + public static Packet getKeymap(Map keybindings) { final OutPacket p = OutPacket.create(SendOpcode.KEYMAP); p.writeByte(0); for (int x = 0; x < 90; x++) { - MapleKeyBinding binding = keybindings.get(x); + KeyBinding binding = keybindings.get(x); if (binding != null) { p.writeByte(binding.getType()); p.writeInt(binding.getAction()); From 6ea9a57e9fdeb0d5e8a64d2223e579e510d269dd Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 20:59:45 +0200 Subject: [PATCH 009/125] Rename and clean up MapleQuickslotBinding --- src/main/java/client/MapleCharacter.java | 12 ++++----- ...slotBinding.java => QuickslotBinding.java} | 27 +++++++------------ .../QuickslotKeyMappedModifiedHandler.java | 8 +++--- src/main/java/tools/PacketCreator.java | 4 +-- 4 files changed, 21 insertions(+), 30 deletions(-) rename src/main/java/client/keybind/{MapleQuickslotBinding.java => QuickslotBinding.java} (73%) diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/MapleCharacter.java index 8b692784ca..126718b4b5 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/MapleCharacter.java @@ -29,7 +29,7 @@ import client.inventory.Equip.StatUpgrade; import client.inventory.manipulator.CashIdGenerator; import client.inventory.manipulator.InventoryManipulator; import client.keybind.KeyBinding; -import client.keybind.MapleQuickslotBinding; +import client.keybind.QuickslotBinding; import client.newyear.NewYearCardRecord; import client.processor.action.PetAutopotProcessor; import client.processor.npc.FredrickProcessor; @@ -193,7 +193,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private Map coolDowns = new LinkedHashMap<>(); private EnumMap> diseases = new EnumMap<>(MapleDisease.class); private byte[] m_aQuickslotLoaded; - private MapleQuickslotBinding m_pQuickslotKeyMapped; + private QuickslotBinding m_pQuickslotKeyMapped; private MapleDoor pdoor = null; private Map questExpirations = new LinkedHashMap<>(); private ScheduledFuture dragonBloodSchedule; @@ -1212,7 +1212,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void changeQuickslotKeybinding(byte[] aQuickslotKeyMapped) { - this.m_pQuickslotKeyMapped = new MapleQuickslotBinding(aQuickslotKeyMapped); + this.m_pQuickslotKeyMapped = new QuickslotBinding(aQuickslotKeyMapped); } public void broadcastStance(int newStance) { @@ -7433,7 +7433,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { try (final ResultSet pResultSet = pSelectQuickslotKeyMapped.executeQuery()) { if (pResultSet.next()) { ret.m_aQuickslotLoaded = LongTool.LongToBytes(pResultSet.getLong(1)); - ret.m_pQuickslotKeyMapped = new MapleQuickslotBinding(ret.m_aQuickslotLoaded); + ret.m_pQuickslotKeyMapped = new QuickslotBinding(ret.m_aQuickslotLoaded); } } } @@ -8780,10 +8780,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void sendQuickmap() { // send quickslots to user - MapleQuickslotBinding pQuickslotKeyMapped = this.m_pQuickslotKeyMapped; + QuickslotBinding pQuickslotKeyMapped = this.m_pQuickslotKeyMapped; if (pQuickslotKeyMapped == null) { - pQuickslotKeyMapped = new MapleQuickslotBinding(MapleQuickslotBinding.DEFAULT_QUICKSLOTS); + pQuickslotKeyMapped = new QuickslotBinding(QuickslotBinding.DEFAULT_QUICKSLOTS); } this.sendPacket(PacketCreator.QuickslotMappedInit(pQuickslotKeyMapped)); diff --git a/src/main/java/client/keybind/MapleQuickslotBinding.java b/src/main/java/client/keybind/QuickslotBinding.java similarity index 73% rename from src/main/java/client/keybind/MapleQuickslotBinding.java rename to src/main/java/client/keybind/QuickslotBinding.java index 71e9189c18..f4694c71fa 100644 --- a/src/main/java/client/keybind/MapleQuickslotBinding.java +++ b/src/main/java/client/keybind/QuickslotBinding.java @@ -5,34 +5,25 @@ import net.packet.OutPacket; import java.util.Arrays; /** - * * @author Shavit */ -public class MapleQuickslotBinding -{ +public class QuickslotBinding { public static final int QUICKSLOT_SIZE = 8; + public static final byte[] DEFAULT_QUICKSLOTS = {0x2A, 0x52, 0x47, 0x49, 0x1D, 0x53, 0x4F, 0x51}; - public static final byte[] DEFAULT_QUICKSLOTS = - { - 0x2A, 0x52, 0x47, 0x49, 0x1D, 0x53, 0x4F, 0x51 - }; - - private byte[] m_aQuickslotKeyMapped; + private final byte[] m_aQuickslotKeyMapped; // Initializes quickslot object for the user. // aKeys' length has to be 8. - public MapleQuickslotBinding(byte[] aKeys) - { - if(aKeys.length != QUICKSLOT_SIZE) - { + public QuickslotBinding(byte[] aKeys) { + if (aKeys.length != QUICKSLOT_SIZE) { throw new IllegalArgumentException(String.format("aKeys' size should be %d", QUICKSLOT_SIZE)); } this.m_aQuickslotKeyMapped = aKeys.clone(); } - public void encode(OutPacket p) - { + public void encode(OutPacket p) { // Quickslots are default. // The client will skip them and call CQuickslotKeyMappedMan::DefaultQuickslotKeyMap. if (Arrays.equals(this.m_aQuickslotKeyMapped, DEFAULT_QUICKSLOTS)) { @@ -42,16 +33,16 @@ public class MapleQuickslotBinding p.writeBool(true); - for(byte nKey : this.m_aQuickslotKeyMapped) { + for (byte nKey : this.m_aQuickslotKeyMapped) { // For some reason Nexon sends these as integers, similar to CFuncKeyMappedMan. // However there's no evidence any key can be above 0xFF anyhow. // Regardless, we need to encode an integer to avoid an error 38 crash; as CFuncKeyMapped::m_aQuickslotKeyMapped is int[8]. p.writeInt(nKey); } } - + public byte[] GetKeybindings() { return m_aQuickslotKeyMapped; } - + } \ No newline at end of file diff --git a/src/main/java/net/server/channel/handlers/QuickslotKeyMappedModifiedHandler.java b/src/main/java/net/server/channel/handlers/QuickslotKeyMappedModifiedHandler.java index 4958602dcf..3dfe5a42ad 100644 --- a/src/main/java/net/server/channel/handlers/QuickslotKeyMappedModifiedHandler.java +++ b/src/main/java/net/server/channel/handlers/QuickslotKeyMappedModifiedHandler.java @@ -1,7 +1,7 @@ package net.server.channel.handlers; import client.MapleClient; -import client.keybind.MapleQuickslotBinding; +import client.keybind.QuickslotBinding; import net.AbstractPacketHandler; import net.packet.InPacket; @@ -15,16 +15,16 @@ public class QuickslotKeyMappedModifiedHandler extends AbstractPacketHandler public void handlePacket(InPacket p, MapleClient c) { // Invalid size for the packet. - if(p.available() != MapleQuickslotBinding.QUICKSLOT_SIZE * Integer.BYTES || + if(p.available() != QuickslotBinding.QUICKSLOT_SIZE * Integer.BYTES || // not logged in-game c.getPlayer() == null) { return; } - byte[] aQuickslotKeyMapped = new byte[MapleQuickslotBinding.QUICKSLOT_SIZE]; + byte[] aQuickslotKeyMapped = new byte[QuickslotBinding.QUICKSLOT_SIZE]; - for(int i = 0; i < MapleQuickslotBinding.QUICKSLOT_SIZE; i++) + for(int i = 0; i < QuickslotBinding.QUICKSLOT_SIZE; i++) { aQuickslotKeyMapped[i] = (byte) p.readInt(); } diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index 8e7e6c80a1..d243c937d6 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -25,7 +25,7 @@ import client.MapleCharacter.SkillEntry; import client.inventory.*; import client.inventory.Equip.ScrollResult; import client.keybind.KeyBinding; -import client.keybind.MapleQuickslotBinding; +import client.keybind.QuickslotBinding; import client.newyear.NewYearCardRecord; import client.status.MonsterStatus; import client.status.MonsterStatusEffect; @@ -3484,7 +3484,7 @@ public class PacketCreator { return p; } - public static Packet QuickslotMappedInit(MapleQuickslotBinding pQuickslot) { + public static Packet QuickslotMappedInit(QuickslotBinding pQuickslot) { OutPacket p = OutPacket.create(SendOpcode.QUICKSLOT_INIT); pQuickslot.encode(p); return p; From 46bd0570d757bd55043ac750ec5e64d4e096d5ab Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:02:22 +0200 Subject: [PATCH 010/125] Rename and clean up MapleBuffStat --- scripts/npc/2081005.js | 4 +- scripts/npc/2103000.js | 4 +- scripts/npc/2111015.js | 4 +- scripts/portal/ariant_queens.js | 4 +- scripts/quest/3314.js | 4 +- scripts/quest/3514.js | 4 +- scripts/quest/3941.js | 4 +- .../{MapleBuffStat.java => BuffStat.java} | 28 +- src/main/java/client/MapleCharacter.java | 352 +++++++++--------- .../command/commands/gm3/CheckDmgCommand.java | 6 +- .../manipulator/InventoryManipulator.java | 6 +- .../handlers/AbstractDealDamageHandler.java | 34 +- .../handlers/CloseRangeDamageHandler.java | 28 +- .../channel/handlers/DamageSummonHandler.java | 4 +- .../channel/handlers/MagicDamageHandler.java | 4 +- .../handlers/PlayerMapTransitionHandler.java | 8 +- .../channel/handlers/RangedAttackHandler.java | 22 +- .../channel/handlers/TakeDamageHandler.java | 22 +- .../handlers/TouchMonsterDamageHandler.java | 6 +- src/main/java/server/MapleStatEffect.java | 220 +++++------ src/main/java/server/life/MapleMonster.java | 8 +- src/main/java/server/maps/MapleMap.java | 18 +- src/main/java/tools/PacketCreator.java | 68 ++-- 23 files changed, 431 insertions(+), 431 deletions(-) rename src/main/java/client/{MapleBuffStat.java => BuffStat.java} (92%) diff --git a/scripts/npc/2081005.js b/scripts/npc/2081005.js index 84f4be4467..35cf8035ac 100644 --- a/scripts/npc/2081005.js +++ b/scripts/npc/2081005.js @@ -26,8 +26,8 @@ var status = 0; var price = 100000; function isTransformed(ch) { - const MapleBuffStat = Java.type('client.MapleBuffStat'); - return ch.getBuffSource(MapleBuffStat.MORPH) == 2210003; + const BuffStat = Java.type('client.BuffStat'); + return ch.getBuffSource(BuffStat.MORPH) == 2210003; } function start() { diff --git a/scripts/npc/2103000.js b/scripts/npc/2103000.js index 3e386bcce7..c69c792dc4 100644 --- a/scripts/npc/2103000.js +++ b/scripts/npc/2103000.js @@ -22,8 +22,8 @@ function isTigunMorphed(ch) { - const MapleBuffStat = Java.type('client.MapleBuffStat'); - return ch.getBuffSource(MapleBuffStat.MORPH) == 2210005; + const BuffStat = Java.type('client.BuffStat'); + return ch.getBuffSource(BuffStat.MORPH) == 2210005; } function start() { diff --git a/scripts/npc/2111015.js b/scripts/npc/2111015.js index c6d54ae0ce..812d33690d 100644 --- a/scripts/npc/2111015.js +++ b/scripts/npc/2111015.js @@ -21,8 +21,8 @@ var status; function isPillUsed(ch) { - const MapleBuffStat = Java.type('client.MapleBuffStat'); - return ch.getBuffSource(MapleBuffStat.HPREC) == 2022198; + const BuffStat = Java.type('client.BuffStat'); + return ch.getBuffSource(BuffStat.HPREC) == 2022198; } function start() { diff --git a/scripts/portal/ariant_queens.js b/scripts/portal/ariant_queens.js index 67a0deb58c..053b2f23f7 100644 --- a/scripts/portal/ariant_queens.js +++ b/scripts/portal/ariant_queens.js @@ -19,8 +19,8 @@ */ function isTigunMorphed(ch) { - const MapleBuffStat = Java.type('client.MapleBuffStat'); - return ch.getBuffSource(MapleBuffStat.MORPH) == 2210005; + const BuffStat = Java.type('client.BuffStat'); + return ch.getBuffSource(BuffStat.MORPH) == 2210005; } function enter(pi) { diff --git a/scripts/quest/3314.js b/scripts/quest/3314.js index f54e2b99b0..f0c4746ade 100644 --- a/scripts/quest/3314.js +++ b/scripts/quest/3314.js @@ -21,8 +21,8 @@ var status = -1; function isPillUsed(ch) { - const MapleBuffStat = Java.type('client.MapleBuffStat'); - return ch.getBuffSource(MapleBuffStat.HPREC) == 2022198; + const BuffStat = Java.type('client.BuffStat'); + return ch.getBuffSource(BuffStat.HPREC) == 2022198; } function end(mode, type, selection) { diff --git a/scripts/quest/3514.js b/scripts/quest/3514.js index 2dd7a00afb..3568e9a35d 100644 --- a/scripts/quest/3514.js +++ b/scripts/quest/3514.js @@ -44,8 +44,8 @@ function start(mode, type, selection) { } function usedPotion(ch) { - const MapleBuffStat = Java.type('client.MapleBuffStat'); - return ch.getBuffSource(MapleBuffStat.HPREC) == 2022337; + const BuffStat = Java.type('client.BuffStat'); + return ch.getBuffSource(BuffStat.HPREC) == 2022337; } function end(mode, type, selection) { diff --git a/scripts/quest/3941.js b/scripts/quest/3941.js index f24af97ebd..12173499e1 100644 --- a/scripts/quest/3941.js +++ b/scripts/quest/3941.js @@ -21,8 +21,8 @@ */ function isTigunMorphed(ch) { - const MapleBuffStat = Java.type('client.MapleBuffStat'); - return ch.getBuffSource(MapleBuffStat.MORPH) == 2210005; + const BuffStat = Java.type('client.BuffStat'); + return ch.getBuffSource(BuffStat.MORPH) == 2210005; } var status = -1; diff --git a/src/main/java/client/MapleBuffStat.java b/src/main/java/client/BuffStat.java similarity index 92% rename from src/main/java/client/MapleBuffStat.java rename to src/main/java/client/BuffStat.java index a70a7e2bfe..70a692a204 100644 --- a/src/main/java/client/MapleBuffStat.java +++ b/src/main/java/client/BuffStat.java @@ -21,7 +21,7 @@ */ package client; -public enum MapleBuffStat { +public enum BuffStat { //SLOW(0x1L), MORPH(0x2L), RECOVERY(0x4L), @@ -42,21 +42,21 @@ public enum MapleBuffStat { GHOST_MORPH(0x20000L), AURA(0x40000L), CONFUSE(0x80000L), - + // ------ COUPON feature ------ COUPON_EXP1(0x100000L), COUPON_EXP2(0x200000L), COUPON_EXP3(0x400000L), COUPON_EXP4(0x400000L), COUPON_DRP1(0x800000L), COUPON_DRP2(0x1000000L), COUPON_DRP3(0x1000000L), - + // ------ monster card buffs, thanks to Arnah (Vertisy) ------ ITEM_UP_BY_ITEM(0x100000L), RESPECT_PIMMUNE(0x200000L), RESPECT_MIMMUNE(0x400000L), DEFENSE_ATT(0x800000L), DEFENSE_STATE(0x1000000L), - + HPREC(0x2000000L), MPREC(0x4000000L), BERSERK_FURY(0x8000000L), @@ -97,15 +97,15 @@ public enum MapleBuffStat { EXP_INCREASE(0x2000000000000000L), WEAKEN(0x4000000000000000L), MAP_PROTECTION(0x8000000000000000L), - + //all incorrect buffstats - SLOW(0x200000000L, true), - ELEMENTAL_RESET(0x200000000L, true), - MAGIC_SHIELD(0x400000000L, true), - MAGIC_RESISTANCE(0x800000000L, true), + SLOW(0x200000000L, true), + ELEMENTAL_RESET(0x200000000L, true), + MAGIC_SHIELD(0x400000000L, true), + MAGIC_RESISTANCE(0x800000000L, true), // needs Soul Stone //end incorrect buffstats - + WIND_WALK(0x400000000L, true), ARAN_COMBO(0x1000000000L, true), COMBO_DRAIN(0x2000000000L, true), @@ -116,19 +116,19 @@ public enum MapleBuffStat { ENERGY_CHARGE(0x4000000000000L, true), DASH2(0x8000000000000L, true), // correct (speed) DASH(0x10000000000000L, true), // correct (jump) - MONSTER_RIDING(0x20000000000000L, true), + MONSTER_RIDING(0x20000000000000L, true), SPEED_INFUSION(0x40000000000000L, true), HOMING_BEACON(0x80000000000000L, true); private final long i; private final boolean isFirst; - private MapleBuffStat(long i, boolean isFirst) { + BuffStat(long i, boolean isFirst) { this.i = i; this.isFirst = isFirst; } - private MapleBuffStat(long i) { + BuffStat(long i) { this.i = i; this.isFirst = false; } @@ -140,7 +140,7 @@ public enum MapleBuffStat { public boolean isFirst() { return isFirst; } - + @Override public String toString() { return name(); diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/MapleCharacter.java index 126718b4b5..5d436890ab 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/MapleCharacter.java @@ -183,10 +183,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private Map skills = new LinkedHashMap<>(); private Map activeCoupons = new LinkedHashMap<>(); private Map activeCouponRates = new LinkedHashMap<>(); - private EnumMap effects = new EnumMap<>(MapleBuffStat.class); - private Map buffEffectsCount = new LinkedHashMap<>(); + private EnumMap effects = new EnumMap<>(BuffStat.class); + private Map buffEffectsCount = new LinkedHashMap<>(); private Map diseaseExpires = new LinkedHashMap<>(); - private Map> buffEffects = new LinkedHashMap<>(); // non-overriding buffs thanks to Ronan + private Map> buffEffects = new LinkedHashMap<>(); // non-overriding buffs thanks to Ronan private Map buffExpires = new LinkedHashMap<>(); private Map keymap = new LinkedHashMap<>(); private Map summons = new LinkedHashMap<>(); @@ -755,7 +755,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setCombo(short count) { if (count < combocounter) { - cancelEffectFromBuffStat(MapleBuffStat.ARAN_COMBO); + cancelEffectFromBuffStat(BuffStat.ARAN_COMBO); } combocounter = (short) Math.min(30000, count); if (count > 0) { @@ -826,7 +826,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (!hide) { this.hidden = false; sendPacket(PacketCreator.getGMEffect(0x10, (byte) 0)); - List dsstat = Collections.singletonList(MapleBuffStat.DARKSIGHT); + List dsstat = Collections.singletonList(BuffStat.DARKSIGHT); getMap().broadcastGMMessage(this, PacketCreator.cancelForeignBuff(id, dsstat), false); getMap().broadcastSpawnPlayerMapObjectMessage(this, this, false); @@ -844,7 +844,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (!login) { getMap().broadcastNONGMMessage(this, PacketCreator.removePlayerFromMap(getId()), false); } - List> ldsstat = Collections.singletonList(new Pair(MapleBuffStat.DARKSIGHT, 0)); + List> ldsstat = Collections.singletonList(new Pair(BuffStat.DARKSIGHT, 0)); getMap().broadcastGMMessage(this, PacketCreator.giveForeignBuff(id, ldsstat), false); this.releaseControlledMonsters(); } @@ -870,7 +870,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - private void cancelPlayerBuffs(List buffstats) { + private void cancelPlayerBuffs(List buffstats) { if (client.getChannelServer().getPlayerStorage().getCharacterById(getId()) != null) { updateLocalStats(); sendPacket(PacketCreator.cancelBuff(buffstats)); @@ -1166,8 +1166,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { broadcastChangeJob(); if (GameConstants.hasSPTable(newJob) && newJob.getId() != 2001) { - if (getBuffedValue(MapleBuffStat.MONSTER_RIDING) != null) { - cancelBuffStats(MapleBuffStat.MONSTER_RIDING); + if (getBuffedValue(BuffStat.MONSTER_RIDING) != null) { + cancelBuffStats(BuffStat.MONSTER_RIDING); } createDragon(); } @@ -1437,8 +1437,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.lock(); chrLock.lock(); try { - for(Entry mbs : effects.entrySet()) { - if(mbs.getKey() == MapleBuffStat.MAP_PROTECTION) { + for(Entry mbs : effects.entrySet()) { + if(mbs.getKey() == BuffStat.MAP_PROTECTION) { byte value = (byte)mbs.getValue().value; if(value == 1 && ((returnMapid == 211000000 && thisMapid != 200082300) || returnMapid == 193000000)) { @@ -2072,7 +2072,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public boolean isRidingBattleship() { - Integer bv = getBuffedValue(MapleBuffStat.MONSTER_RIDING); + Integer bv = getBuffedValue(BuffStat.MONSTER_RIDING); return bv != null && bv.equals(Corsair.BATTLE_SHIP); } @@ -2088,7 +2088,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.skillCooldown(Corsair.BATTLE_SHIP, cooldown)); addCooldown(Corsair.BATTLE_SHIP, Server.getInstance().getCurrentTime(), (long)(cooldown * 1000)); removeCooldown(5221999); - cancelEffectFromBuffStat(MapleBuffStat.MONSTER_RIDING); + cancelEffectFromBuffStat(BuffStat.MONSTER_RIDING); } else { announceBattleshipHp(); addCooldown(5221999, 0, Long.MAX_VALUE); @@ -2501,7 +2501,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { extraRecoveryTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { - if (getBuffSource(MapleBuffStat.HPREC) == -1 && getBuffSource(MapleBuffStat.MPREC) == -1) { + if (getBuffSource(BuffStat.HPREC) == -1 && getBuffSource(BuffStat.MPREC) == -1) { stopExtraTask(); return; } @@ -3293,7 +3293,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return character; } - public Long getBuffedStarttime(MapleBuffStat effect) { + public Long getBuffedStarttime(BuffStat effect) { effLock.lock(); chrLock.lock(); try { @@ -3308,7 +3308,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - public Integer getBuffedValue(MapleBuffStat effect) { + public Integer getBuffedValue(BuffStat effect) { effLock.lock(); chrLock.lock(); try { @@ -3323,7 +3323,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - public int getBuffSource(MapleBuffStat stat) { + public int getBuffSource(BuffStat stat) { effLock.lock(); chrLock.lock(); try { @@ -3338,7 +3338,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - public MapleStatEffect getBuffEffect(MapleBuffStat stat) { + public MapleStatEffect getBuffEffect(BuffStat stat) { effLock.lock(); chrLock.lock(); try { @@ -3370,7 +3370,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.lock(); try { List ret = new ArrayList<>(); - for(Map bel : buffEffects.values()) { + for(Map bel : buffEffects.values()) { for(MapleBuffStatValueHolder mbsvh : bel.values()) { ret.add(mbsvh); } @@ -3389,7 +3389,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { long curtime = Server.getInstance().getCurrentTime(); Map ret = new LinkedHashMap<>(); - for(Map bel : buffEffects.values()) { + for(Map bel : buffEffects.values()) { for(MapleBuffStatValueHolder mbsvh : bel.values()) { int srcid = mbsvh.effect.getBuffSourceId(); if(!ret.containsKey(srcid)) { @@ -3404,12 +3404,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - public List> getAllActiveStatups() { + public List> getAllActiveStatups() { effLock.lock(); chrLock.lock(); try { - List> ret = new ArrayList<>(); - for (MapleBuffStat mbs : effects.keySet()) { + List> ret = new ArrayList<>(); + for (BuffStat mbs : effects.keySet()) { MapleBuffStatValueHolder mbsvh = effects.get(mbs); ret.add(new Pair<>(mbs, mbsvh.value)); } @@ -3451,14 +3451,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } - private List> getActiveStatupsFromSourceid(int sourceid) { // already under effLock & chrLock - List> ret = new ArrayList<>(); - List> singletonStatups = new ArrayList<>(); - for(Entry bel : buffEffects.get(sourceid).entrySet()) { - MapleBuffStat mbs = bel.getKey(); + private List> getActiveStatupsFromSourceid(int sourceid) { // already under effLock & chrLock + List> ret = new ArrayList<>(); + List> singletonStatups = new ArrayList<>(); + for(Entry bel : buffEffects.get(sourceid).entrySet()) { + BuffStat mbs = bel.getKey(); MapleBuffStatValueHolder mbsvh = effects.get(bel.getKey()); - Pair p; + Pair p; if(mbsvh != null) { p = new Pair<>(mbs, mbsvh.value); } else { @@ -3472,17 +3472,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - Collections.sort(ret, new Comparator>() { + Collections.sort(ret, new Comparator>() { @Override - public int compare(Pair p1, Pair p2) { + public int compare(Pair p1, Pair p2) { return p1.getLeft().compareTo(p2.getLeft()); } }); if (!singletonStatups.isEmpty()) { - Collections.sort(singletonStatups, new Comparator>() { + Collections.sort(singletonStatups, new Comparator>() { @Override - public int compare(Pair p1, Pair p2) { + public int compare(Pair p1, Pair p2) { return p1.getLeft().compareTo(p2.getLeft()); } }); @@ -3493,13 +3493,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return ret; } - private void addItemEffectHolder(Integer sourceid, long expirationtime, Map statups) { + private void addItemEffectHolder(Integer sourceid, long expirationtime, Map statups) { buffEffects.put(sourceid, statups); buffExpires.put(sourceid, expirationtime); } - private boolean removeEffectFromItemEffectHolder(Integer sourceid, MapleBuffStat buffStat) { - Map lbe = buffEffects.get(sourceid); + private boolean removeEffectFromItemEffectHolder(Integer sourceid, BuffStat buffStat) { + Map lbe = buffEffects.get(sourceid); if(lbe.remove(buffStat) != null) { buffEffectsCount.put(buffStat, (byte)(buffEffectsCount.get(buffStat) - 1)); @@ -3516,9 +3516,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } private void removeItemEffectHolder(Integer sourceid) { - Map be = buffEffects.remove(sourceid); + Map be = buffEffects.remove(sourceid); if(be != null) { - for(Entry bei : be.entrySet()) { + for(Entry bei : be.entrySet()) { buffEffectsCount.put(bei.getKey(), (byte)(buffEffectsCount.get(bei.getKey()) - 1)); } } @@ -3526,10 +3526,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { buffExpires.remove(sourceid); } - private void dropWorstEffectFromItemEffectHolder(MapleBuffStat mbs) { + private void dropWorstEffectFromItemEffectHolder(BuffStat mbs) { Integer min = Integer.MAX_VALUE; Integer srcid = -1; - for(Entry> bpl: buffEffects.entrySet()) { + for(Entry> bpl: buffEffects.entrySet()) { MapleBuffStatValueHolder mbsvh = bpl.getValue().get(mbs); if(mbsvh != null) { if(mbsvh.value < min) { @@ -3542,10 +3542,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { removeEffectFromItemEffectHolder(srcid, mbs); } - private MapleBuffStatValueHolder fetchBestEffectFromItemEffectHolder(MapleBuffStat mbs) { + private MapleBuffStatValueHolder fetchBestEffectFromItemEffectHolder(BuffStat mbs) { Pair max = new Pair<>(Integer.MIN_VALUE, 0); MapleBuffStatValueHolder mbsvh = null; - for(Entry> bpl: buffEffects.entrySet()) { + for(Entry> bpl: buffEffects.entrySet()) { MapleBuffStatValueHolder mbsvhi = bpl.getValue().get(mbs); if(mbsvhi != null) { if(!mbsvhi.effect.isActive(this)) { @@ -3568,7 +3568,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return mbsvh; } - private void extractBuffValue(int sourceid, MapleBuffStat stat) { + private void extractBuffValue(int sourceid, BuffStat stat) { chrLock.lock(); try { removeEffectFromItemEffectHolder(sourceid, stat); @@ -3583,14 +3583,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { try { System.out.println("-------------------"); System.out.println("CACHED BUFF COUNT: "); - for(Entry bpl : buffEffectsCount.entrySet()) { + for(Entry bpl : buffEffectsCount.entrySet()) { System.out.println(bpl.getKey() + ": " + bpl.getValue()); } System.out.println("-------------------"); System.out.println("CACHED BUFFS: "); - for(Entry> bpl : buffEffects.entrySet()) { + for(Entry> bpl : buffEffects.entrySet()) { System.out.print(bpl.getKey() + ": "); - for(Entry pble : bpl.getValue().entrySet()) { + for(Entry pble : bpl.getValue().entrySet()) { System.out.print(pble.getKey().name() + pble.getValue().value + ", "); } System.out.println(); @@ -3598,7 +3598,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { System.out.println("-------------------"); System.out.println("IN ACTION:"); - for(Entry bpl : effects.entrySet()) { + for(Entry bpl : effects.entrySet()) { System.out.println(bpl.getKey().name() + " -> " + MapleItemInformationProvider.getInstance().getName(bpl.getValue().effect.getSourceId())); } } finally { @@ -3611,7 +3611,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.lock(); chrLock.lock(); try { - for(Entry mbsl : buffEffectsCount.entrySet()) { + for(Entry mbsl : buffEffectsCount.entrySet()) { System.out.println(mbsl.getKey().name() + " -> " + mbsl.getValue()); } } finally { @@ -3625,9 +3625,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.lock(); chrLock.lock(); try { - cancelEffectFromBuffStat(MapleBuffStat.SUMMON); - cancelEffectFromBuffStat(MapleBuffStat.PUPPET); - cancelEffectFromBuffStat(MapleBuffStat.COMBO); + cancelEffectFromBuffStat(BuffStat.SUMMON); + cancelEffectFromBuffStat(BuffStat.PUPPET); + cancelEffectFromBuffStat(BuffStat.COMBO); effects.clear(); @@ -3644,8 +3644,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.lock(); chrLock.lock(); try { - for(Entry> bpl : buffEffects.entrySet()) { - for(Entry mbse : bpl.getValue().entrySet()) { + for(Entry> bpl : buffEffects.entrySet()) { + for(Entry mbse : bpl.getValue().entrySet()) { mseBuffs.put(mbse.getValue().effect, mbse.getValue().startTime); } } @@ -3660,8 +3660,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - private void dropBuffStats(List> effectsToCancel) { - for (Pair cancelEffectCancelTasks : effectsToCancel) { + private void dropBuffStats(List> effectsToCancel) { + for (Pair cancelEffectCancelTasks : effectsToCancel) { //boolean nestedCancel = false; chrLock.lock(); @@ -3685,18 +3685,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - private List> deregisterBuffStats(Map stats) { + private List> deregisterBuffStats(Map stats) { chrLock.lock(); try { - List> effectsToCancel = new ArrayList<>(stats.size()); - for (Entry stat : stats.entrySet()) { + List> effectsToCancel = new ArrayList<>(stats.size()); + for (Entry stat : stats.entrySet()) { int sourceid = stat.getValue().effect.getBuffSourceId(); if(!buffEffects.containsKey(sourceid)) { buffExpires.remove(sourceid); } - MapleBuffStat mbs = stat.getKey(); + BuffStat mbs = stat.getKey(); effectsToCancel.add(new Pair<>(mbs, stat.getValue())); MapleBuffStatValueHolder mbsvh = effects.get(mbs); @@ -3704,12 +3704,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { mbsvh.bestApplied = true; effects.remove(mbs); - if (mbs == MapleBuffStat.RECOVERY) { + if (mbs == BuffStat.RECOVERY) { if (recoveryTask != null) { recoveryTask.cancel(false); recoveryTask = null; } - } else if (mbs == MapleBuffStat.SUMMON || mbs == MapleBuffStat.PUPPET) { + } else if (mbs == BuffStat.SUMMON || mbs == BuffStat.PUPPET) { int summonId = mbsvh.effect.getSourceId(); MapleSummon summon = summons.get(summonId); @@ -3732,11 +3732,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - } else if (mbs == MapleBuffStat.DRAGONBLOOD) { + } else if (mbs == BuffStat.DRAGONBLOOD) { dragonBloodSchedule.cancel(false); dragonBloodSchedule = null; - } else if (mbs == MapleBuffStat.HPREC || mbs == MapleBuffStat.MPREC) { - if(mbs == MapleBuffStat.HPREC) { + } else if (mbs == BuffStat.HPREC || mbs == BuffStat.MPREC) { + if(mbs == BuffStat.HPREC) { extraHpRec = 0; } else { extraMpRec = 0; @@ -3792,7 +3792,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return ret; } - private static MapleStatEffect getEffectFromBuffSource(Map buffSource) { + private static MapleStatEffect getEffectFromBuffSource(Map buffSource) { try { return buffSource.entrySet().iterator().next().getValue().effect; } catch (Exception e) { @@ -3815,23 +3815,23 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void updateActiveEffects() { effLock.lock(); // thanks davidlafriniere, maple006, RedHat for pointing a deadlock occurring here try { - Set updatedBuffs = new LinkedHashSet<>(); + Set updatedBuffs = new LinkedHashSet<>(); Set activeEffects = new LinkedHashSet<>(); for (MapleBuffStatValueHolder mse : effects.values()) { activeEffects.add(mse.effect); } - for (Map buff : buffEffects.values()) { + for (Map buff : buffEffects.values()) { MapleStatEffect mse = getEffectFromBuffSource(buff); if (isUpdatingEffect(activeEffects, mse)) { - for (Pair p : mse.getStatups()) { + for (Pair p : mse.getStatups()) { updatedBuffs.add(p.getLeft()); } } } - for (MapleBuffStat mbs : updatedBuffs) { + for (BuffStat mbs : updatedBuffs) { effects.remove(mbs); } @@ -3841,18 +3841,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - private void updateEffects(Set removedStats) { + private void updateEffects(Set removedStats) { effLock.lock(); chrLock.lock(); try { - Set retrievedStats = new LinkedHashSet<>(); + Set retrievedStats = new LinkedHashSet<>(); - for (MapleBuffStat mbs : removedStats) { + for (BuffStat mbs : removedStats) { fetchBestEffectFromItemEffectHolder(mbs); MapleBuffStatValueHolder mbsvh = effects.get(mbs); if (mbsvh != null) { - for (Pair statup : mbsvh.effect.getStatups()) { + for (Pair statup : mbsvh.effect.getStatups()) { retrievedStats.add(statup.getLeft()); } } @@ -3866,7 +3866,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } private boolean cancelEffect(MapleStatEffect effect, boolean overwrite, long startTime, boolean firstCancel) { - Set removedStats = new LinkedHashSet<>(); + Set removedStats = new LinkedHashSet<>(); dropBuffStats(cancelEffectInternal(effect, overwrite, startTime, removedStats)); updateLocalStats(); updateEffects(removedStats); @@ -3874,9 +3874,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return !removedStats.isEmpty(); } - private List> cancelEffectInternal(MapleStatEffect effect, boolean overwrite, long startTime, Set removedStats) { - Map buffstats = null; - MapleBuffStat ombs; + private List> cancelEffectInternal(MapleStatEffect effect, boolean overwrite, long startTime, Set removedStats) { + Map buffstats = null; + BuffStat ombs; if (!overwrite) { // is removing the source effect, meaning every effect from this srcid is being purged buffstats = extractCurrentBuffStats(effect); } else if ((ombs = getSingletonStatupFromEffect(effect)) != null) { // removing all effects of a buff having non-shareable buff stat. @@ -3894,7 +3894,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { stopChairTask(); } - List> toCancel = deregisterBuffStats(buffstats); + List> toCancel = deregisterBuffStats(buffstats); if (effect.isMonsterRiding()) { this.getClient().getWorldServer().unregisterMountHunger(this); this.getMount().setActive(false); @@ -3907,7 +3907,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return toCancel; } - public void cancelEffectFromBuffStat(MapleBuffStat stat) { + public void cancelEffectFromBuffStat(BuffStat stat) { MapleBuffStatValueHolder effect; effLock.lock(); @@ -3923,14 +3923,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - public void cancelBuffStats(MapleBuffStat stat) { + public void cancelBuffStats(BuffStat stat) { effLock.lock(); try { List> cancelList = new LinkedList<>(); chrLock.lock(); try { - for(Entry> bel : this.buffEffects.entrySet()) { + for(Entry> bel : this.buffEffects.entrySet()) { MapleBuffStatValueHolder beli = bel.getValue().get(stat); if(beli != null) { cancelList.add(new Pair<>(bel.getKey(), beli)); @@ -3940,7 +3940,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } - Map buffStatList = new LinkedHashMap<>(); + Map buffStatList = new LinkedHashMap<>(); for(Pair p : cancelList) { buffStatList.put(stat, p.getRight()); extractBuffValue(p.getLeft(), stat); @@ -3953,14 +3953,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cancelPlayerBuffs(Arrays.asList(stat)); } - private Map extractCurrentBuffStats(MapleStatEffect effect) { + private Map extractCurrentBuffStats(MapleStatEffect effect) { chrLock.lock(); try { - Map stats = new LinkedHashMap<>(); - Map buffList = buffEffects.remove(effect.getBuffSourceId()); + Map stats = new LinkedHashMap<>(); + Map buffList = buffEffects.remove(effect.getBuffSourceId()); if(buffList != null) { - for (Entry stateffect : buffList.entrySet()) { + for (Entry stateffect : buffList.entrySet()) { stats.put(stateffect.getKey(), stateffect.getValue()); buffEffectsCount.put(stateffect.getKey(), (byte)(buffEffectsCount.get(stateffect.getKey()) - 1)); } @@ -3972,17 +3972,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - private Map extractLeastRelevantStatEffectsIfFull(MapleStatEffect effect) { - Map extractedStatBuffs = new LinkedHashMap<>(); + private Map extractLeastRelevantStatEffectsIfFull(MapleStatEffect effect) { + Map extractedStatBuffs = new LinkedHashMap<>(); chrLock.lock(); try { - Map stats = new LinkedHashMap<>(); - Map minStatBuffs = new LinkedHashMap<>(); + Map stats = new LinkedHashMap<>(); + Map minStatBuffs = new LinkedHashMap<>(); - for(Entry> mbsvhi : buffEffects.entrySet()) { - for(Entry mbsvhe : mbsvhi.getValue().entrySet()) { - MapleBuffStat mbs = mbsvhe.getKey(); + for(Entry> mbsvhi : buffEffects.entrySet()) { + for(Entry mbsvhe : mbsvhi.getValue().entrySet()) { + BuffStat mbs = mbsvhe.getKey(); Byte b = stats.get(mbs); if(b != null) { @@ -3997,18 +3997,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - Set effectStatups = new LinkedHashSet<>(); - for(Pair efstat : effect.getStatups()) { + Set effectStatups = new LinkedHashSet<>(); + for(Pair efstat : effect.getStatups()) { effectStatups.add(efstat.getLeft()); } - for(Entry it : stats.entrySet()) { + for(Entry it : stats.entrySet()) { boolean uniqueBuff = isSingletonStatup(it.getKey()); if(it.getValue() >= (!uniqueBuff ? YamlConfig.config.server.MAX_MONITORED_BUFFSTATS : 1) && effectStatups.contains(it.getKey())) { MapleBuffStatValueHolder mbsvh = minStatBuffs.get(it.getKey()); - Map lpbe = buffEffects.get(mbsvh.effect.getBuffSourceId()); + Map lpbe = buffEffects.get(mbsvh.effect.getBuffSourceId()); lpbe.remove(it.getKey()); buffEffectsCount.put(it.getKey(), (byte)(buffEffectsCount.get(it.getKey()) - 1)); @@ -4025,9 +4025,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return extractedStatBuffs; } - private void cancelInactiveBuffStats(Set retrievedStats, Set removedStats) { - List inactiveStats = new LinkedList<>(); - for (MapleBuffStat mbs : removedStats) { + private void cancelInactiveBuffStats(Set retrievedStats, Set removedStats) { + List inactiveStats = new LinkedList<>(); + for (BuffStat mbs : removedStats) { if (!retrievedStats.contains(mbs)) { inactiveStats.add(mbs); } @@ -4039,10 +4039,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - private static Map topologicalSortLeafStatCount(Map> buffStack) { + private static Map topologicalSortLeafStatCount(Map> buffStack) { Map leafBuffCount = new LinkedHashMap<>(); - for (Entry> e : buffStack.entrySet()) { + for (Entry> e : buffStack.entrySet()) { Stack mseStack = e.getValue(); if (mseStack.isEmpty()) { continue; @@ -4060,9 +4060,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return leafBuffCount; } - private static List topologicalSortRemoveLeafStats(Map> stackedBuffStats, Map> buffStack, Map leafStatCount) { + private static List topologicalSortRemoveLeafStats(Map> stackedBuffStats, Map> buffStack, Map leafStatCount) { List clearedStatEffects = new LinkedList<>(); - Set clearedStats = new LinkedHashSet<>(); + Set clearedStats = new LinkedHashSet<>(); for (Entry e : leafStatCount.entrySet()) { MapleStatEffect mse = e.getKey(); @@ -4070,13 +4070,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (stackedBuffStats.get(mse).size() <= e.getValue()) { clearedStatEffects.add(mse); - for (MapleBuffStat mbs : stackedBuffStats.get(mse)) { + for (BuffStat mbs : stackedBuffStats.get(mse)) { clearedStats.add(mbs); } } } - for (MapleBuffStat mbs : clearedStats) { + for (BuffStat mbs : clearedStats) { MapleStatEffect mse = buffStack.get(mbs).pop(); stackedBuffStats.get(mse).remove(mbs); } @@ -4084,8 +4084,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return clearedStatEffects; } - private static void topologicalSortRebaseLeafStats(Map> stackedBuffStats, Map> buffStack) { - for (Entry> e : buffStack.entrySet()) { + private static void topologicalSortRebaseLeafStats(Map> stackedBuffStats, Map> buffStack) { + for (Entry> e : buffStack.entrySet()) { Stack mseStack = e.getValue(); if (!mseStack.isEmpty()) { @@ -4095,12 +4095,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - private static List topologicalSortEffects(Map>> buffEffects) { - Map> stackedBuffStats = new LinkedHashMap<>(); - Map> buffStack = new LinkedHashMap<>(); + private static List topologicalSortEffects(Map>> buffEffects) { + Map> stackedBuffStats = new LinkedHashMap<>(); + Map> buffStack = new LinkedHashMap<>(); - for (Entry>> e : buffEffects.entrySet()) { - MapleBuffStat mbs = e.getKey(); + for (Entry>> e : buffEffects.entrySet()) { + BuffStat mbs = e.getKey(); Stack mbsStack = new Stack<>(); buffStack.put(mbs, mbsStack); @@ -4109,7 +4109,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { MapleStatEffect mse = emse.getLeft(); mbsStack.push(mse); - Set mbsStats = stackedBuffStats.get(mse); + Set mbsStats = stackedBuffStats.get(mse); if (mbsStats == null) { mbsStats = new LinkedHashSet<>(); stackedBuffStats.put(mse, mbsStats); @@ -4136,13 +4136,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } private static List sortEffectsList(Map updateEffectsList) { - Map>> buffEffects = new LinkedHashMap<>(); + Map>> buffEffects = new LinkedHashMap<>(); for (Entry p : updateEffectsList.entrySet()) { MapleStatEffect mse = p.getKey(); - for (Pair statup : mse.getStatups()) { - MapleBuffStat stat = statup.getLeft(); + for (Pair statup : mse.getStatups()) { + BuffStat stat = statup.getLeft(); List> statBuffs = buffEffects.get(stat); if (statBuffs == null) { @@ -4162,14 +4162,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } }; - for (Entry>> statBuffs : buffEffects.entrySet()) { + for (Entry>> statBuffs : buffEffects.entrySet()) { Collections.sort(statBuffs.getValue(), cmp); } return topologicalSortEffects(buffEffects); } - private List>> propagatePriorityBuffEffectUpdates(Set retrievedStats) { + private List>> propagatePriorityBuffEffectUpdates(Set retrievedStats) { List>> priorityUpdateEffects = new LinkedList<>(); Map yokeStats = new LinkedHashMap<>(); @@ -4183,8 +4183,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { MapleStatEffect mse = mbsvh.effect; int buffSourceId = mse.getBuffSourceId(); if (isPriorityBuffSourceid(buffSourceId) && !hasActiveBuff(buffSourceId)) { - for (Pair ps : mse.getStatups()) { - MapleBuffStat mbs = ps.getLeft(); + for (Pair ps : mse.getStatups()) { + BuffStat mbs = ps.getLeft(); if (retrievedStats.contains(mbs)) { MapleBuffStatValueHolder mbsvhe = effects.get(mbs); @@ -4207,14 +4207,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return priorityUpdateEffects; } - private void propagateBuffEffectUpdates(Map> retrievedEffects, Set retrievedStats, Set removedStats) { + private void propagateBuffEffectUpdates(Map> retrievedEffects, Set retrievedStats, Set removedStats) { cancelInactiveBuffStats(retrievedStats, removedStats); if (retrievedStats.isEmpty()) { return; } - Map> maxBuffValue = new LinkedHashMap<>(); - for(MapleBuffStat mbs : retrievedStats) { + Map> maxBuffValue = new LinkedHashMap<>(); + for(BuffStat mbs : retrievedStats) { MapleBuffStatValueHolder mbsvh = effects.get(mbs); if(mbsvh != null) { retrievedEffects.put(mbsvh.effect.getBuffSourceId(), new Pair<>(mbsvh.effect, mbsvh.startTime)); @@ -4237,15 +4237,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { for(MapleStatEffect mse : mseList) { int maxEffectiveStatup = Integer.MIN_VALUE; - for(Pair st : mse.getStatups()) { - MapleBuffStat mbs = st.getLeft(); + for(Pair st : mse.getStatups()) { + BuffStat mbs = st.getLeft(); boolean relevantStatup = true; - if(mbs == MapleBuffStat.WATK) { // not relevant for mages + if(mbs == BuffStat.WATK) { // not relevant for mages if(mageJob) { relevantStatup = false; } - } else if(mbs == MapleBuffStat.MATK) { // not relevant for non-mages + } else if(mbs == BuffStat.MATK) { // not relevant for non-mages if(!mageJob) { relevantStatup = false; } @@ -4283,11 +4283,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { toUpdateEffects.add(new Pair<>(mse.getBuffSourceId(), retrievedEffects.get(mse.getBuffSourceId()))); } - List> activeStatups = new LinkedList<>(); + List> activeStatups = new LinkedList<>(); for(Pair> lmse: toUpdateEffects) { Pair msel = lmse.getRight(); - for(Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { + for(Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { activeStatups.add(statup); } @@ -4299,7 +4299,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { for(Pair> lmse: priorityEffects) { Pair msel = lmse.getRight(); - for(Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { + for(Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { activeStatups.add(statup); } @@ -4308,15 +4308,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (this.isRidingBattleship()) { - List> statups = new ArrayList<>(1); - statups.add(new Pair<>(MapleBuffStat.MONSTER_RIDING, 0)); + List> statups = new ArrayList<>(1); + statups.add(new Pair<>(BuffStat.MONSTER_RIDING, 0)); this.sendPacket(PacketCreator.giveBuff(1932000, 5221006, statups)); this.announceBattleshipHp(); } } - private static MapleBuffStat getSingletonStatupFromEffect(MapleStatEffect mse) { - for(Pair mbs : mse.getStatups()) { + private static BuffStat getSingletonStatupFromEffect(MapleStatEffect mse) { + for(Pair mbs : mse.getStatups()) { if(isSingletonStatup(mbs.getLeft())) { return mbs.getLeft(); } @@ -4325,7 +4325,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return null; } - private static boolean isSingletonStatup(MapleBuffStat mbs) { + private static boolean isSingletonStatup(BuffStat mbs) { switch(mbs) { //HPREC and MPREC are supposed to be singleton case COUPON_EXP1: case COUPON_EXP2: @@ -4367,7 +4367,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - private void addItemEffectHolderCount(MapleBuffStat stat) { + private void addItemEffectHolderCount(BuffStat stat) { Byte val = buffEffectsCount.get(stat); if (val != null) { val = (byte) (val + 1); @@ -4441,7 +4441,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { recoveryTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { - if (getBuffSource(MapleBuffStat.RECOVERY) == -1) { + if (getBuffSource(BuffStat.RECOVERY) == -1) { chrLock.lock(); try { if (recoveryTask != null) { @@ -4491,10 +4491,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.lock(); try { Integer sourceid = effect.getBuffSourceId(); - Map toDeploy; - Map appliedStatups = new LinkedHashMap<>(); + Map toDeploy; + Map appliedStatups = new LinkedHashMap<>(); - for(Pair ps : effect.getStatups()) { + for(Pair ps : effect.getStatups()) { appliedStatups.put(ps.getLeft(), new MapleBuffStatValueHolder(effect, starttime, ps.getRight())); } @@ -4502,8 +4502,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if(YamlConfig.config.server.USE_BUFF_MOST_SIGNIFICANT) { toDeploy = new LinkedHashMap<>(); Map> retrievedEffects = new LinkedHashMap<>(); - Set retrievedStats = new LinkedHashSet<>(); - for (Entry statup : appliedStatups.entrySet()) { + Set retrievedStats = new LinkedHashSet<>(); + for (Entry statup : appliedStatups.entrySet()) { MapleBuffStatValueHolder mbsvh = effects.get(statup.getKey()); MapleBuffStatValueHolder statMbsvh = statup.getValue(); @@ -4512,7 +4512,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { toDeploy.put(statup.getKey(), statMbsvh); } else { if(!isSingletonStatup(statup.getKey())) { - for(Pair mbs : mbsvh.effect.getStatups()) { + for(Pair mbs : mbsvh.effect.getStatups()) { retrievedStats.add(mbs.getLeft()); } } @@ -4523,10 +4523,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } // should also propagate update from buffs shared with priority sourceids - Set updated = appliedStatups.keySet(); + Set updated = appliedStatups.keySet(); for (MapleBuffStatValueHolder mbsvh : this.getAllStatups()) { if (isPriorityBuffSourceid(mbsvh.effect.getBuffSourceId())) { - for (Pair p : mbsvh.effect.getStatups()) { + for (Pair p : mbsvh.effect.getStatups()) { if (updated.contains(p.getLeft())) { retrievedStats.add(p.getLeft()); } @@ -4536,7 +4536,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if(!isSilent) { addItemEffectHolder(sourceid, expirationtime, appliedStatups); - for (Entry statup : toDeploy.entrySet()) { + for (Entry statup : toDeploy.entrySet()) { effects.put(statup.getKey(), statup.getValue()); } @@ -4544,18 +4544,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { retrievedEffects.put(sourceid, new Pair<>(effect, starttime)); } - propagateBuffEffectUpdates(retrievedEffects, retrievedStats, new LinkedHashSet()); + propagateBuffEffectUpdates(retrievedEffects, retrievedStats, new LinkedHashSet()); } } else { - for (Entry statup : appliedStatups.entrySet()) { + for (Entry statup : appliedStatups.entrySet()) { addItemEffectHolderCount(statup.getKey()); } - toDeploy = (active ? appliedStatups : new LinkedHashMap()); + toDeploy = (active ? appliedStatups : new LinkedHashMap()); } addItemEffectHolder(sourceid, expirationtime, appliedStatups); - for (Entry statup : toDeploy.entrySet()) { + for (Entry statup : toDeploy.entrySet()) { effects.put(statup.getKey(), statup.getValue()); } } finally { @@ -4936,12 +4936,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { float rate = 100.0f; if (itemid == 0) { - MapleStatEffect mseMeso = getBuffEffect(MapleBuffStat.MESO_UP_BY_ITEM); + MapleStatEffect mseMeso = getBuffEffect(BuffStat.MESO_UP_BY_ITEM); if (mseMeso != null) { rate += mseMeso.getCardRate(mapid, itemid); } } else { - MapleStatEffect mseItem = getBuffEffect(MapleBuffStat.ITEM_UP_BY_ITEM); + MapleStatEffect mseItem = getBuffEffect(BuffStat.ITEM_UP_BY_ITEM); if (mseItem != null) { rate += mseItem.getCardRate(mapid, itemid); } @@ -5846,7 +5846,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return Collections.unmodifiableList(ret); } - public MapleStatEffect getStatForBuff(MapleBuffStat effect) { + public MapleStatEffect getStatForBuff(BuffStat effect) { effLock.lock(); chrLock.lock(); try { @@ -5954,8 +5954,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (energybar > 10000) { energybar = 10000; } - List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.ENERGY_CHARGE, energybar)); - setBuffedValue(MapleBuffStat.ENERGY_CHARGE, energybar); + List> stat = Collections.singletonList(new Pair<>(BuffStat.ENERGY_CHARGE, energybar)); + setBuffedValue(BuffStat.ENERGY_CHARGE, energybar); sendPacket(PacketCreator.giveBuff(energybar, 0, stat)); sendPacket(PacketCreator.showOwnBuffEffect(energycharge.getId(), 2)); getMap().broadcastPacket(this, PacketCreator.showBuffEffect(id, energycharge.getId(), 2)); @@ -5968,8 +5968,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { @Override public void run() { energybar = 0; - List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.ENERGY_CHARGE, energybar)); - setBuffedValue(MapleBuffStat.ENERGY_CHARGE, energybar); + List> stat = Collections.singletonList(new Pair<>(BuffStat.ENERGY_CHARGE, energybar)); + setBuffedValue(BuffStat.ENERGY_CHARGE, energybar); sendPacket(PacketCreator.giveBuff(energybar, 0, stat)); getMap().broadcastPacket(chr, PacketCreator.cancelForeignFirstDebuff(id, ((long) 1) << 50)); } @@ -5980,9 +5980,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void handleOrbconsume() { int skillid = isCygnus() ? DawnWarrior.COMBO : Crusader.COMBO; Skill combo = SkillFactory.getSkill(skillid); - List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.COMBO, 1)); - setBuffedValue(MapleBuffStat.COMBO, 1); - sendPacket(PacketCreator.giveBuff(skillid, combo.getEffect(getSkillLevel(combo)).getDuration() + (int) ((getBuffedStarttime(MapleBuffStat.COMBO) - System.currentTimeMillis())), stat)); + List> stat = Collections.singletonList(new Pair<>(BuffStat.COMBO, 1)); + setBuffedValue(BuffStat.COMBO, 1); + sendPacket(PacketCreator.giveBuff(skillid, combo.getEffect(getSkillLevel(combo)).getDuration() + (int) ((getBuffedStarttime(BuffStat.COMBO) - System.currentTimeMillis())), stat)); getMap().broadcastMessage(this, PacketCreator.giveForeignBuff(getId(), stat), false); } @@ -6142,7 +6142,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return true; } - public boolean isBuffFrom(MapleBuffStat stat, Skill skill) { + public boolean isBuffFrom(BuffStat stat, Skill skill) { effLock.lock(); chrLock.lock(); try { @@ -7596,12 +7596,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - if (getBuffedValue(MapleBuffStat.MORPH) != null) { - cancelEffectFromBuffStat(MapleBuffStat.MORPH); + if (getBuffedValue(BuffStat.MORPH) != null) { + cancelEffectFromBuffStat(BuffStat.MORPH); } - if (getBuffedValue(MapleBuffStat.MONSTER_RIDING) != null) { - cancelEffectFromBuffStat(MapleBuffStat.MONSTER_RIDING); + if (getBuffedValue(BuffStat.MONSTER_RIDING) != null) { + cancelEffectFromBuffStat(BuffStat.MONSTER_RIDING); } unsitChairInternal(); @@ -7750,11 +7750,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { localmagic = Math.min(localmagic, 2000); - Integer hbhp = getBuffedValue(MapleBuffStat.HYPERBODYHP); + Integer hbhp = getBuffedValue(BuffStat.HYPERBODYHP); if (hbhp != null) { localmaxhp += (hbhp.doubleValue() / 100) * localmaxhp; } - Integer hbmp = getBuffedValue(MapleBuffStat.HYPERBODYMP); + Integer hbmp = getBuffedValue(BuffStat.HYPERBODYMP); if (hbmp != null) { localmaxmp += (hbmp.doubleValue() / 100) * localmaxmp; } @@ -7762,7 +7762,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { localmaxhp = Math.min(30000, localmaxhp); localmaxmp = Math.min(30000, localmaxmp); - MapleStatEffect combo = getBuffEffect(MapleBuffStat.ARAN_COMBO); + MapleStatEffect combo = getBuffEffect(BuffStat.ARAN_COMBO); if (combo != null) { localwatk += combo.getX(); } @@ -7773,7 +7773,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { localwatk += ceffect.getWatk(); } - Integer mwarr = getBuffedValue(MapleBuffStat.MAPLE_WARRIOR); + Integer mwarr = getBuffedValue(BuffStat.MAPLE_WARRIOR); if (mwarr != null) { localstr += getStr() * mwarr / 100; localdex += getDex() * mwarr / 100; @@ -7795,21 +7795,21 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } - Integer watkbuff = getBuffedValue(MapleBuffStat.WATK); + Integer watkbuff = getBuffedValue(BuffStat.WATK); if (watkbuff != null) { localwatk += watkbuff.intValue(); } - Integer matkbuff = getBuffedValue(MapleBuffStat.MATK); + Integer matkbuff = getBuffedValue(BuffStat.MATK); if (matkbuff != null) { localmagic += matkbuff.intValue(); } /* - Integer speedbuff = getBuffedValue(MapleBuffStat.SPEED); + Integer speedbuff = getBuffedValue(BuffStat.SPEED); if (speedbuff != null) { localspeed += speedbuff.intValue(); } - Integer jumpbuff = getBuffedValue(MapleBuffStat.JUMP); + Integer jumpbuff = getBuffedValue(BuffStat.JUMP); if (jumpbuff != null) { localjump += jumpbuff.intValue(); } @@ -8831,7 +8831,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.updateBuddyCapacity(capacity)); } - public void setBuffedValue(MapleBuffStat effect, int value) { + public void setBuffedValue(BuffStat effect, int value) { effLock.lock(); chrLock.lock(); try { @@ -10080,7 +10080,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (this.isHidden()) { - List> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.DARKSIGHT, 0)); + List> dsstat = Collections.singletonList(new Pair<>(BuffStat.DARKSIGHT, 0)); getMap().broadcastGMMessage(this, PacketCreator.giveForeignBuff(getId(), dsstat), false); } } diff --git a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java b/src/main/java/client/command/commands/gm3/CheckDmgCommand.java index 1f7ad273c5..b708812e21 100644 --- a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java +++ b/src/main/java/client/command/commands/gm3/CheckDmgCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleBuffStat; +import client.BuffStat; import client.MapleCharacter; import client.MapleClient; import client.command.Command; @@ -39,8 +39,8 @@ public class CheckDmgCommand extends Command { MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { int maxBase = victim.calculateMaxBaseDamage(victim.getTotalWatk()); - Integer watkBuff = victim.getBuffedValue(MapleBuffStat.WATK); - Integer matkBuff = victim.getBuffedValue(MapleBuffStat.MATK); + Integer watkBuff = victim.getBuffedValue(BuffStat.WATK); + Integer matkBuff = victim.getBuffedValue(BuffStat.MATK); int blessing = victim.getSkillLevel(10000000 * player.getJobType() + 12); if (watkBuff == null) watkBuff = 0; if (matkBuff == null) matkBuff = 0; diff --git a/src/main/java/client/inventory/manipulator/InventoryManipulator.java b/src/main/java/client/inventory/manipulator/InventoryManipulator.java index 1a76269d7a..2b103b9952 100644 --- a/src/main/java/client/inventory/manipulator/InventoryManipulator.java +++ b/src/main/java/client/inventory/manipulator/InventoryManipulator.java @@ -21,7 +21,7 @@ */ package client.inventory.manipulator; -import client.MapleBuffStat; +import client.BuffStat; import client.MapleCharacter; import client.MapleClient; import client.inventory.*; @@ -620,8 +620,8 @@ public class InventoryManipulator { target.setPosition(src); eqpInv.addItemFromDB(target); } - if (chr.getBuffedValue(MapleBuffStat.BOOSTER) != null && ItemConstants.isWeapon(source.getItemId())) { - chr.cancelBuffStats(MapleBuffStat.BOOSTER); + if (chr.getBuffedValue(BuffStat.BOOSTER) != null && ItemConstants.isWeapon(source.getItemId())) { + chr.cancelBuffStats(BuffStat.BOOSTER); } mods.add(new ModifyInventory(2, source, src)); diff --git a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java index 8dd0bdd8af..a9f309bf5e 100644 --- a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java @@ -248,12 +248,12 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { } totDamage += totDamageToOneMonster; monster.aggroMonsterDamage(player, totDamageToOneMonster); - if (player.getBuffedValue(MapleBuffStat.PICKPOCKET) != null && (attack.skill == 0 || attack.skill == Rogue.DOUBLE_STAB || attack.skill == Bandit.SAVAGE_BLOW || attack.skill == ChiefBandit.ASSAULTER || attack.skill == ChiefBandit.BAND_OF_THIEVES || attack.skill == Shadower.ASSASSINATE || attack.skill == Shadower.TAUNT || attack.skill == Shadower.BOOMERANG_STEP)) { + if (player.getBuffedValue(BuffStat.PICKPOCKET) != null && (attack.skill == 0 || attack.skill == Rogue.DOUBLE_STAB || attack.skill == Bandit.SAVAGE_BLOW || attack.skill == ChiefBandit.ASSAULTER || attack.skill == ChiefBandit.BAND_OF_THIEVES || attack.skill == Shadower.ASSASSINATE || attack.skill == Shadower.TAUNT || attack.skill == Shadower.BOOMERANG_STEP)) { Skill pickpocket = SkillFactory.getSkill(ChiefBandit.PICKPOCKET); int picklv = (player.isGM()) ? pickpocket.getMaxLevel() : player.getSkillLevel(pickpocket); if(picklv > 0) { int delay = 0; - final int maxmeso = player.getBuffedValue(MapleBuffStat.PICKPOCKET); + final int maxmeso = player.getBuffedValue(BuffStat.PICKPOCKET); for (Integer eachd : onedList) { eachd += Integer.MAX_VALUE; @@ -312,7 +312,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { } if (player.isAran()) { - if (player.getBuffedValue(MapleBuffStat.WK_CHARGE) != null) { + if (player.getBuffedValue(BuffStat.WK_CHARGE) != null) { Skill snowCharge = SkillFactory.getSkill(Aran.SNOW_CHARGE); if (totDamageToOneMonster > 0) { MonsterStatusEffect monsterStatusEffect = new MonsterStatusEffect(Collections.singletonMap(MonsterStatus.SPEED, snowCharge.getEffect(player.getSkillLevel(snowCharge)).getX()), snowCharge, null, false); @@ -320,21 +320,21 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { } } } - if (player.getBuffedValue(MapleBuffStat.HAMSTRING) != null) { + if (player.getBuffedValue(BuffStat.HAMSTRING) != null) { Skill hamstring = SkillFactory.getSkill(Bowmaster.HAMSTRING); if (hamstring.getEffect(player.getSkillLevel(hamstring)).makeChanceResult()) { MonsterStatusEffect monsterStatusEffect = new MonsterStatusEffect(Collections.singletonMap(MonsterStatus.SPEED, hamstring.getEffect(player.getSkillLevel(hamstring)).getX()), hamstring, null, false); monster.applyStatus(player, monsterStatusEffect, false, hamstring.getEffect(player.getSkillLevel(hamstring)).getY() * 1000); } } - if (player.getBuffedValue(MapleBuffStat.SLOW) != null) { + if (player.getBuffedValue(BuffStat.SLOW) != null) { Skill slow = SkillFactory.getSkill(Evan.SLOW); if (slow.getEffect(player.getSkillLevel(slow)).makeChanceResult()) { MonsterStatusEffect monsterStatusEffect = new MonsterStatusEffect(Collections.singletonMap(MonsterStatus.SPEED, slow.getEffect(player.getSkillLevel(slow)).getX()), slow, null, false); monster.applyStatus(player, monsterStatusEffect, false, slow.getEffect(player.getSkillLevel(slow)).getY() * 60 * 1000); } } - if (player.getBuffedValue(MapleBuffStat.BLIND) != null) { + if (player.getBuffedValue(BuffStat.BLIND) != null) { Skill blind = SkillFactory.getSkill(Marksman.BLIND); if (blind.getEffect(player.getSkillLevel(blind)).makeChanceResult()) { MonsterStatusEffect monsterStatusEffect = new MonsterStatusEffect(Collections.singletonMap(MonsterStatus.ACC, blind.getEffect(player.getSkillLevel(blind)).getX()), blind, null, false); @@ -344,7 +344,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { if (job == 121 || job == 122) { for (int charge = 1211005; charge < 1211007; charge++) { Skill chargeSkill = SkillFactory.getSkill(charge); - if (player.isBuffFrom(MapleBuffStat.WK_CHARGE, chargeSkill)) { + if (player.isBuffFrom(BuffStat.WK_CHARGE, chargeSkill)) { if (totDamageToOneMonster > 0) { if (charge == WhiteKnight.BW_ICE_CHARGE || charge == WhiteKnight.SWORD_ICE_CHARGE) { monster.setTempEffectiveness(Element.ICE, ElementalEffectiveness.WEAK, chargeSkill.getEffect(player.getSkillLevel(chargeSkill)).getY() * 1000); @@ -360,7 +360,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { if (job == 122) { for (int charge = 1221003; charge < 1221004; charge++) { Skill chargeSkill = SkillFactory.getSkill(charge); - if (player.isBuffFrom(MapleBuffStat.WK_CHARGE, chargeSkill)) { + if (player.isBuffFrom(BuffStat.WK_CHARGE, chargeSkill)) { if (totDamageToOneMonster > 0) { monster.setTempEffectiveness(Element.HOLY, ElementalEffectiveness.WEAK, chargeSkill.getEffect(player.getSkillLevel(chargeSkill)).getY() * 1000); break; @@ -368,9 +368,9 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { } } } - } else if (player.getBuffedValue(MapleBuffStat.COMBO_DRAIN) != null) { + } else if (player.getBuffedValue(BuffStat.COMBO_DRAIN) != null) { Skill skill; - if (player.getBuffedValue(MapleBuffStat.COMBO_DRAIN) != null) { + if (player.getBuffedValue(BuffStat.COMBO_DRAIN) != null) { skill = SkillFactory.getSkill(21100005); player.addHP(((totDamage * skill.getEffect(player.getSkillLevel(skill)).getX()) / 100)); } @@ -660,7 +660,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { } } - Integer comboBuff = chr.getBuffedValue(MapleBuffStat.COMBO); + Integer comboBuff = chr.getBuffedValue(BuffStat.COMBO); if(comboBuff != null && comboBuff > 0) { int oid = chr.isCygnus() ? DawnWarrior.COMBO : Crusader.COMBO; int advcomboid = chr.isCygnus() ? DawnWarrior.ADVANCED_COMBO : Hero.ADVANCED_COMBO; @@ -720,7 +720,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { canCrit = true; } - if(chr.getBuffEffect(MapleBuffStat.SHARP_EYES) != null) { + if(chr.getBuffEffect(BuffStat.SHARP_EYES) != null) { // Any class that has sharp eyes can crit. Also, since it stacks with normal crit go ahead // and calc it in. @@ -729,7 +729,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { } boolean shadowPartner = false; - if(chr.getBuffEffect(MapleBuffStat.SHADOWPARTNER) != null) { + if(chr.getBuffEffect(BuffStat.SHADOWPARTNER) != null) { shadowPartner = true; } @@ -744,10 +744,10 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { List allDamageNumbers = new ArrayList<>(); MapleMonster monster = chr.getMap().getMonsterByOid(oid); - if(chr.getBuffEffect(MapleBuffStat.WK_CHARGE) != null) { + if(chr.getBuffEffect(BuffStat.WK_CHARGE) != null) { // Charge, so now we need to check elemental effectiveness - int sourceID = chr.getBuffSource(MapleBuffStat.WK_CHARGE); - int level = chr.getBuffedValue(MapleBuffStat.WK_CHARGE); + int sourceID = chr.getBuffSource(BuffStat.WK_CHARGE); + int level = chr.getBuffedValue(BuffStat.WK_CHARGE); if(monster != null) { if(sourceID == WhiteKnight.BW_FIRE_CHARGE || sourceID == WhiteKnight.SWORD_FIRE_CHARGE) { if(monster.getStats().getEffectiveness(Element.FIRE) == ElementalEffectiveness.WEAK) { @@ -775,7 +775,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { if(ret.skill != 0) { Skill skill = SkillFactory.getSkill(ret.skill); - if(skill.getElement() != Element.NEUTRAL && chr.getBuffedValue(MapleBuffStat.ELEMENTAL_RESET) == null) { + if(skill.getElement() != Element.NEUTRAL && chr.getBuffedValue(BuffStat.ELEMENTAL_RESET) == null) { // The skill has an element effect, so we need to factor that in. if(monster != null) { ElementalEffectiveness eff = monster.getElementalEffectiveness(skill.getElement()); diff --git a/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java b/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java index 7b638a6b95..d7322ff8f0 100644 --- a/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java @@ -47,8 +47,8 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler { chr.getAutobanManager().spam(8);*/ AttackInfo attack = parseDamage(p, chr, false, false); - if (chr.getBuffEffect(MapleBuffStat.MORPH) != null) { - if(chr.getBuffEffect(MapleBuffStat.MORPH).isMorphWithoutAttack()) { + if (chr.getBuffEffect(BuffStat.MORPH) != null) { + if(chr.getBuffEffect(BuffStat.MORPH).isMorphWithoutAttack()) { // How are they attacking when the client won't let them? chr.getClient().disconnect(false, false); return; @@ -64,7 +64,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler { chr.getMap().broadcastMessage(chr, PacketCreator.closeRangeAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, attack.allDamage, attack.speed, attack.direction, attack.display), false, true); int numFinisherOrbs = 0; - Integer comboBuff = chr.getBuffedValue(MapleBuffStat.COMBO); + Integer comboBuff = chr.getBuffedValue(BuffStat.COMBO); if (GameConstants.isFinisherSkill(attack.skill)) { if (comboBuff != null) { numFinisherOrbs = comboBuff - 1; @@ -72,7 +72,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler { chr.handleOrbconsume(); } else if (attack.numAttacked > 0) { if (attack.skill != 1111008 && comboBuff != null) { - int orbcount = chr.getBuffedValue(MapleBuffStat.COMBO); + int orbcount = chr.getBuffedValue(BuffStat.COMBO); int oid = chr.isCygnus() ? DawnWarrior.COMBO : Crusader.COMBO; int advcomboid = chr.isCygnus() ? DawnWarrior.ADVANCED_COMBO : Hero.ADVANCED_COMBO; Skill combo = SkillFactory.getSkill(oid); @@ -101,9 +101,9 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler { if(olv <= 0) olv = SkillFactory.getSkill(oid).getMaxLevel(); int duration = combo.getEffect(olv).getDuration(); - List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.COMBO, neworbcount)); - chr.setBuffedValue(MapleBuffStat.COMBO, neworbcount); - duration -= (int) (currentServerTime() - chr.getBuffedStarttime(MapleBuffStat.COMBO)); + List> stat = Collections.singletonList(new Pair<>(BuffStat.COMBO, neworbcount)); + chr.setBuffedValue(BuffStat.COMBO, neworbcount); + duration -= (int) (currentServerTime() - chr.getBuffedStarttime(BuffStat.COMBO)); c.sendPacket(PacketCreator.giveBuff(oid, duration, stat)); chr.getMap().broadcastMessage(chr, PacketCreator.giveForeignBuff(chr.getId(), stat), false); } @@ -130,7 +130,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler { advcharge_prob = SkillFactory.getSkill(1220010).getEffect(advcharge_level).makeChanceResult(); } if (!advcharge_prob) { - chr.cancelEffectFromBuffStat(MapleBuffStat.WK_CHARGE); + chr.cancelEffectFromBuffStat(BuffStat.WK_CHARGE); } } int attackCount = 1; @@ -160,12 +160,12 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler { } } } - if ((chr.getSkillLevel(SkillFactory.getSkill(NightWalker.VANISH)) > 0 || chr.getSkillLevel(SkillFactory.getSkill(Rogue.DARK_SIGHT)) > 0) && chr.getBuffedValue(MapleBuffStat.DARKSIGHT) != null) {// && chr.getBuffSource(MapleBuffStat.DARKSIGHT) != 9101004 - chr.cancelEffectFromBuffStat(MapleBuffStat.DARKSIGHT); - chr.cancelBuffStats(MapleBuffStat.DARKSIGHT); - } else if(chr.getSkillLevel(SkillFactory.getSkill(WindArcher.WIND_WALK)) > 0 && chr.getBuffedValue(MapleBuffStat.WIND_WALK) != null) { - chr.cancelEffectFromBuffStat(MapleBuffStat.WIND_WALK); - chr.cancelBuffStats(MapleBuffStat.WIND_WALK); + if ((chr.getSkillLevel(SkillFactory.getSkill(NightWalker.VANISH)) > 0 || chr.getSkillLevel(SkillFactory.getSkill(Rogue.DARK_SIGHT)) > 0) && chr.getBuffedValue(BuffStat.DARKSIGHT) != null) {// && chr.getBuffSource(BuffStat.DARKSIGHT) != 9101004 + chr.cancelEffectFromBuffStat(BuffStat.DARKSIGHT); + chr.cancelBuffStats(BuffStat.DARKSIGHT); + } else if(chr.getSkillLevel(SkillFactory.getSkill(WindArcher.WIND_WALK)) > 0 && chr.getBuffedValue(BuffStat.WIND_WALK) != null) { + chr.cancelEffectFromBuffStat(BuffStat.WIND_WALK); + chr.cancelBuffStats(BuffStat.WIND_WALK); } applyAttack(attack, chr, attackCount); diff --git a/src/main/java/net/server/channel/handlers/DamageSummonHandler.java b/src/main/java/net/server/channel/handlers/DamageSummonHandler.java index 22c49277e7..ff97fe7ff6 100644 --- a/src/main/java/net/server/channel/handlers/DamageSummonHandler.java +++ b/src/main/java/net/server/channel/handlers/DamageSummonHandler.java @@ -21,7 +21,7 @@ */ package net.server.channel.handlers; -import client.MapleBuffStat; +import client.BuffStat; import client.MapleCharacter; import client.MapleClient; import net.AbstractPacketHandler; @@ -46,7 +46,7 @@ public final class DamageSummonHandler extends AbstractPacketHandler { summon.addHP(-damage); if (summon.getHP() <= 0) { - player.cancelEffectFromBuffStat(MapleBuffStat.PUPPET); + player.cancelEffectFromBuffStat(BuffStat.PUPPET); } player.getMap().broadcastMessage(player, PacketCreator.damageSummon(player.getId(), oid, damage, monsterIdFrom), summon.getPosition()); } diff --git a/src/main/java/net/server/channel/handlers/MagicDamageHandler.java b/src/main/java/net/server/channel/handlers/MagicDamageHandler.java index 00549b7aa1..cc740f6495 100644 --- a/src/main/java/net/server/channel/handlers/MagicDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/MagicDamageHandler.java @@ -46,8 +46,8 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler { AttackInfo attack = parseDamage(p, chr, false, true); - if (chr.getBuffEffect(MapleBuffStat.MORPH) != null) { - if(chr.getBuffEffect(MapleBuffStat.MORPH).isMorphWithoutAttack()) { + if (chr.getBuffEffect(BuffStat.MORPH) != null) { + if(chr.getBuffEffect(BuffStat.MORPH).isMorphWithoutAttack()) { // How are they attacking when the client won't let them? chr.getClient().disconnect(false, false); return; diff --git a/src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java b/src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java index 0d5078792a..3349e94575 100644 --- a/src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java @@ -20,7 +20,7 @@ package net.server.channel.handlers; -import client.MapleBuffStat; +import client.BuffStat; import client.MapleCharacter; import client.MapleClient; import net.AbstractPacketHandler; @@ -44,11 +44,11 @@ public final class PlayerMapTransitionHandler extends AbstractPacketHandler { MapleCharacter chr = c.getPlayer(); chr.setMapTransitionComplete(); - int beaconid = chr.getBuffSource(MapleBuffStat.HOMING_BEACON); + int beaconid = chr.getBuffSource(BuffStat.HOMING_BEACON); if (beaconid != -1) { - chr.cancelBuffStats(MapleBuffStat.HOMING_BEACON); + chr.cancelBuffStats(BuffStat.HOMING_BEACON); - final List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.HOMING_BEACON, 0)); + final List> stat = Collections.singletonList(new Pair<>(BuffStat.HOMING_BEACON, 0)); chr.sendPacket(PacketCreator.giveBuff(1, beaconid, stat)); } diff --git a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java index 23d032f1bb..001a00a419 100644 --- a/src/main/java/net/server/channel/handlers/RangedAttackHandler.java +++ b/src/main/java/net/server/channel/handlers/RangedAttackHandler.java @@ -53,8 +53,8 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { AttackInfo attack = parseDamage(p, chr, true, false); - if (chr.getBuffEffect(MapleBuffStat.MORPH) != null) { - if(chr.getBuffEffect(MapleBuffStat.MORPH).isMorphWithoutAttack()) { + if (chr.getBuffEffect(BuffStat.MORPH) != null) { + if(chr.getBuffEffect(BuffStat.MORPH).isMorphWithoutAttack()) { // How are they attacking when the client won't let them? chr.getClient().disconnect(false, false); return; @@ -119,7 +119,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { } } } - boolean hasShadowPartner = chr.getBuffedValue(MapleBuffStat.SHADOWPARTNER) != null; + boolean hasShadowPartner = chr.getBuffedValue(BuffStat.SHADOWPARTNER) != null; if (hasShadowPartner) { bulletCount *= 2; } @@ -156,8 +156,8 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { } } } - boolean soulArrow = chr.getBuffedValue(MapleBuffStat.SOULARROW) != null; - boolean shadowClaw = chr.getBuffedValue(MapleBuffStat.SHADOW_CLAW) != null; + boolean soulArrow = chr.getBuffedValue(BuffStat.SOULARROW) != null; + boolean shadowClaw = chr.getBuffedValue(BuffStat.SHADOW_CLAW) != null; if (projectile != 0) { if (!soulArrow && !shadowClaw && attack.skill != 11101004 && attack.skill != 15111007 && attack.skill != 14101006) { short bulletConsume = bulletCount; @@ -215,12 +215,12 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler { } } - if (chr.getSkillLevel(SkillFactory.getSkill(NightWalker.VANISH)) > 0 && chr.getBuffedValue(MapleBuffStat.DARKSIGHT) != null && attack.numAttacked > 0 && chr.getBuffSource(MapleBuffStat.DARKSIGHT) != 9101004) { - chr.cancelEffectFromBuffStat(MapleBuffStat.DARKSIGHT); - chr.cancelBuffStats(MapleBuffStat.DARKSIGHT); - } else if(chr.getSkillLevel(SkillFactory.getSkill(WindArcher.WIND_WALK)) > 0 && chr.getBuffedValue(MapleBuffStat.WIND_WALK) != null && attack.numAttacked > 0) { - chr.cancelEffectFromBuffStat(MapleBuffStat.WIND_WALK); - chr.cancelBuffStats(MapleBuffStat.WIND_WALK); + if (chr.getSkillLevel(SkillFactory.getSkill(NightWalker.VANISH)) > 0 && chr.getBuffedValue(BuffStat.DARKSIGHT) != null && attack.numAttacked > 0 && chr.getBuffSource(BuffStat.DARKSIGHT) != 9101004) { + chr.cancelEffectFromBuffStat(BuffStat.DARKSIGHT); + chr.cancelBuffStats(BuffStat.DARKSIGHT); + } else if(chr.getSkillLevel(SkillFactory.getSkill(WindArcher.WIND_WALK)) > 0 && chr.getBuffedValue(BuffStat.WIND_WALK) != null && attack.numAttacked > 0) { + chr.cancelEffectFromBuffStat(BuffStat.WIND_WALK); + chr.cancelBuffStats(BuffStat.WIND_WALK); } applyAttack(attack, chr, bulletCount); diff --git a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java index a65c46894a..824320b02f 100644 --- a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java @@ -87,7 +87,7 @@ public final class TakeDamageHandler extends AbstractPacketHandler { if (damage > 0) { loseItems = attacker.getStats().loseItem(); if (loseItems != null) { - if (chr.getBuffEffect(MapleBuffStat.AURA) == null) { + if (chr.getBuffEffect(BuffStat.AURA) == null) { InventoryType type; final int playerpos = chr.getPosition().x; byte d = 1; @@ -157,12 +157,12 @@ public final class TakeDamageHandler extends AbstractPacketHandler { } attacker.setMp(attacker.getMp() - attackInfo.getMpCon()); - if (chr.getBuffedValue(MapleBuffStat.MANA_REFLECTION) != null && damage > 0 && !attacker.isBoss()) { + if (chr.getBuffedValue(BuffStat.MANA_REFLECTION) != null && damage > 0 && !attacker.isBoss()) { int jobid = chr.getJob().getId(); if (jobid == 212 || jobid == 222 || jobid == 232) { int id = jobid * 10000 + 1002; Skill manaReflectSkill = SkillFactory.getSkill(id); - if (chr.isBuffFrom(MapleBuffStat.MANA_REFLECTION, manaReflectSkill) && chr.getSkillLevel(manaReflectSkill) > 0 && manaReflectSkill.getEffect(chr.getSkillLevel(manaReflectSkill)).makeChanceResult()) { + if (chr.isBuffFrom(BuffStat.MANA_REFLECTION, manaReflectSkill) && chr.getSkillLevel(manaReflectSkill) > 0 && manaReflectSkill.getEffect(chr.getSkillLevel(manaReflectSkill)).makeChanceResult()) { int bouncedamage = (damage * manaReflectSkill.getEffect(chr.getSkillLevel(manaReflectSkill)).getX() / 100); if (bouncedamage > attacker.getMaxHp() / 5) { bouncedamage = attacker.getMaxHp() / 5; @@ -196,15 +196,15 @@ public final class TakeDamageHandler extends AbstractPacketHandler { if (damage > 0 && !chr.isHidden()) { if (attacker != null) { if (damagefrom == -1) { - if (chr.getBuffedValue(MapleBuffStat.POWERGUARD) != null) { // PG works on bosses, but only at half of the rate. - int bouncedamage = (int) (damage * (chr.getBuffedValue(MapleBuffStat.POWERGUARD).doubleValue() / (attacker.isBoss() ? 200 : 100))); + if (chr.getBuffedValue(BuffStat.POWERGUARD) != null) { // PG works on bosses, but only at half of the rate. + int bouncedamage = (int) (damage * (chr.getBuffedValue(BuffStat.POWERGUARD).doubleValue() / (attacker.isBoss() ? 200 : 100))); bouncedamage = Math.min(bouncedamage, attacker.getMaxHp() / 10); damage -= bouncedamage; map.damageMonster(chr, attacker, bouncedamage); map.broadcastMessage(chr, PacketCreator.damageMonster(oid, bouncedamage), false, true); attacker.aggroMonsterDamage(chr, bouncedamage); } - MapleStatEffect bPressure = chr.getBuffEffect(MapleBuffStat.BODY_PRESSURE); // thanks Atoot for noticing an issue on Body Pressure neutralise + MapleStatEffect bPressure = chr.getBuffEffect(BuffStat.BODY_PRESSURE); // thanks Atoot for noticing an issue on Body Pressure neutralise if (bPressure != null) { Skill skill = SkillFactory.getSkill(Aran.BODY_PRESSURE); if (!attacker.alreadyBuffedStats().contains(MonsterStatus.NEUTRALISE)) { @@ -215,7 +215,7 @@ public final class TakeDamageHandler extends AbstractPacketHandler { } } - MapleStatEffect cBarrier = chr.getBuffEffect(MapleBuffStat.COMBO_BARRIER); // thanks BHB for noticing Combo Barrier buff not working + MapleStatEffect cBarrier = chr.getBuffEffect(BuffStat.COMBO_BARRIER); // thanks BHB for noticing Combo Barrier buff not working if (cBarrier != null) { damage *= (cBarrier.getX() / 1000.0); } @@ -238,9 +238,9 @@ public final class TakeDamageHandler extends AbstractPacketHandler { damage *= Math.ceil(highDef.getEffect(hdLevel).getX() / 1000.0); } } - Integer mesoguard = chr.getBuffedValue(MapleBuffStat.MESOGUARD); - if (chr.getBuffedValue(MapleBuffStat.MAGIC_GUARD) != null && mpattack == 0) { - int mploss = (int) (damage * (chr.getBuffedValue(MapleBuffStat.MAGIC_GUARD).doubleValue() / 100.0)); + Integer mesoguard = chr.getBuffedValue(BuffStat.MESOGUARD); + if (chr.getBuffedValue(BuffStat.MAGIC_GUARD) != null && mpattack == 0) { + int mploss = (int) (damage * (chr.getBuffedValue(BuffStat.MAGIC_GUARD).doubleValue() / 100.0)); int hploss = damage - mploss; int curmp = chr.getMp(); @@ -255,7 +255,7 @@ public final class TakeDamageHandler extends AbstractPacketHandler { int mesoloss = (int) (damage * (mesoguard.doubleValue() / 100.0)); if (chr.getMeso() < mesoloss) { chr.gainMeso(-chr.getMeso(), false); - chr.cancelBuffStats(MapleBuffStat.MESOGUARD); + chr.cancelBuffStats(BuffStat.MESOGUARD); } else { chr.gainMeso(-mesoloss, false); } diff --git a/src/main/java/net/server/channel/handlers/TouchMonsterDamageHandler.java b/src/main/java/net/server/channel/handlers/TouchMonsterDamageHandler.java index b256844fa0..f6587d93c8 100644 --- a/src/main/java/net/server/channel/handlers/TouchMonsterDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/TouchMonsterDamageHandler.java @@ -21,16 +21,16 @@ */ package net.server.channel.handlers; -import client.MapleBuffStat; -import client.MapleClient; +import client.BuffStat; import client.MapleCharacter; +import client.MapleClient; import net.packet.InPacket; public final class TouchMonsterDamageHandler extends AbstractDealDamageHandler { @Override public final void handlePacket(InPacket p, MapleClient c) { MapleCharacter chr = c.getPlayer(); - if (chr.getEnergyBar() == 15000 || chr.getBuffedValue(MapleBuffStat.BODY_PRESSURE) != null) { + if (chr.getEnergyBar() == 15000 || chr.getBuffedValue(BuffStat.BODY_PRESSURE) != null) { applyAttack(parseDamage(p, chr, false, false), c.getPlayer(), 1); } } diff --git a/src/main/java/server/MapleStatEffect.java b/src/main/java/server/MapleStatEffect.java index 2270fb665c..e08d2b8329 100644 --- a/src/main/java/server/MapleStatEffect.java +++ b/src/main/java/server/MapleStatEffect.java @@ -71,7 +71,7 @@ public class MapleStatEffect { private int cp, nuffSkill; private List cureDebuffs; private boolean skill; - private List> statups; + private List> statups; private Map monsterStatus; private int x, y, mobCount, moneyCon, cooldown, morphId = 0, ghost, fatigue, berserk, booster; private double prop; @@ -153,7 +153,7 @@ public class MapleStatEffect { return loadFromData(source, itemid, false, false); } - private static void addBuffStatPairToListIfNotZero(List> list, MapleBuffStat buffstat, Integer val) { + private static void addBuffStatPairToListIfNotZero(List> list, BuffStat buffstat, Integer val) { if (val != 0) { list.add(new Pair<>(buffstat, val)); } @@ -235,7 +235,7 @@ public class MapleStatEffect { ret.overTime = overTime; } - ArrayList> statups = new ArrayList<>(); + ArrayList> statups = new ArrayList<>(); ret.watk = (short) MapleDataTool.getInt("pad", source, 0); ret.wdef = (short) MapleDataTool.getInt("pdd", source, 0); ret.matk = (short) MapleDataTool.getInt("mad", source, 0); @@ -247,10 +247,10 @@ public class MapleStatEffect { ret.jump = (short) MapleDataTool.getInt("jump", source, 0); ret.barrier = MapleDataTool.getInt("barrier", source, 0); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.AURA, ret.barrier); + addBuffStatPairToListIfNotZero(statups, BuffStat.AURA, ret.barrier); ret.mapProtection = mapProtection(sourceid); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.MAP_PROTECTION, (int) ret.mapProtection); + addBuffStatPairToListIfNotZero(statups, BuffStat.MAP_PROTECTION, (int) ret.mapProtection); if (ret.overTime && ret.getSummonMovementType() == null) { if (!skill) { @@ -258,8 +258,8 @@ public class MapleStatEffect { ret.berserk = MapleDataTool.getInt("berserk", source, 0); ret.booster = MapleDataTool.getInt("booster", source, 0); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.BERSERK, ret.berserk); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.BOOSTER, ret.booster); + addBuffStatPairToListIfNotZero(statups, BuffStat.BERSERK, ret.berserk); + addBuffStatPairToListIfNotZero(statups, BuffStat.BOOSTER, ret.booster); } else if (isDojoBuff(sourceid) || isHpMpRecovery(sourceid)) { ret.mhpR = (byte) MapleDataTool.getInt("mhpR", source, 0); @@ -267,39 +267,39 @@ public class MapleStatEffect { ret.mmpR = (byte) MapleDataTool.getInt("mmpR", source, 0); ret.mmpRRate = (short) (MapleDataTool.getInt("mmpRRate", source, 0) * 100); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.HPREC, (int) ret.mhpR); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.MPREC, (int) ret.mmpR); + addBuffStatPairToListIfNotZero(statups, BuffStat.HPREC, (int) ret.mhpR); + addBuffStatPairToListIfNotZero(statups, BuffStat.MPREC, (int) ret.mmpR); } else if (isRateCoupon(sourceid)) { switch (MapleDataTool.getInt("expR", source, 0)) { case 1: - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.COUPON_EXP1, 1); + addBuffStatPairToListIfNotZero(statups, BuffStat.COUPON_EXP1, 1); break; case 2: - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.COUPON_EXP2, 1); + addBuffStatPairToListIfNotZero(statups, BuffStat.COUPON_EXP2, 1); break; case 3: - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.COUPON_EXP3, 1); + addBuffStatPairToListIfNotZero(statups, BuffStat.COUPON_EXP3, 1); break; case 4: - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.COUPON_EXP4, 1); + addBuffStatPairToListIfNotZero(statups, BuffStat.COUPON_EXP4, 1); break; } switch (MapleDataTool.getInt("drpR", source, 0)) { case 1: - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.COUPON_DRP1, 1); + addBuffStatPairToListIfNotZero(statups, BuffStat.COUPON_DRP1, 1); break; case 2: - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.COUPON_DRP2, 1); + addBuffStatPairToListIfNotZero(statups, BuffStat.COUPON_DRP2, 1); break; case 3: - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.COUPON_DRP3, 1); + addBuffStatPairToListIfNotZero(statups, BuffStat.COUPON_DRP3, 1); break; } } else if (isMonsterCard(sourceid)) { @@ -330,13 +330,13 @@ public class MapleStatEffect { } if (MapleDataTool.getInt("mesoupbyitem", source, 0) != 0) { - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.MESO_UP_BY_ITEM, 4); + addBuffStatPairToListIfNotZero(statups, BuffStat.MESO_UP_BY_ITEM, 4); prob = MapleDataTool.getInt("prob", source, 1); } int itemupType = MapleDataTool.getInt("itemupbyitem", source, 0); if (itemupType != 0) { - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.ITEM_UP_BY_ITEM, 4); + addBuffStatPairToListIfNotZero(statups, BuffStat.ITEM_UP_BY_ITEM, 4); prob = MapleDataTool.getInt("prob", source, 1); switch (itemupType) { @@ -351,47 +351,47 @@ public class MapleStatEffect { } if (MapleDataTool.getInt("respectPimmune", source, 0) != 0) { - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.RESPECT_PIMMUNE, 4); + addBuffStatPairToListIfNotZero(statups, BuffStat.RESPECT_PIMMUNE, 4); } if (MapleDataTool.getInt("respectMimmune", source, 0) != 0) { - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.RESPECT_MIMMUNE, 4); + addBuffStatPairToListIfNotZero(statups, BuffStat.RESPECT_MIMMUNE, 4); } if (MapleDataTool.getString("defenseAtt", source, null) != null) { - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.DEFENSE_ATT, 4); + addBuffStatPairToListIfNotZero(statups, BuffStat.DEFENSE_ATT, 4); } if (MapleDataTool.getString("defenseState", source, null) != null) { - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.DEFENSE_STATE, 4); + addBuffStatPairToListIfNotZero(statups, BuffStat.DEFENSE_STATE, 4); } int thaw = MapleDataTool.getInt("thaw", source, 0); if (thaw != 0) { - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.MAP_PROTECTION, thaw > 0 ? 1 : 2); + addBuffStatPairToListIfNotZero(statups, BuffStat.MAP_PROTECTION, thaw > 0 ? 1 : 2); } ret.cardStats = new CardItemupStats(itemupCode, prob, areas, inParty); } else if (isExpIncrease(sourceid)) { - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.EXP_INCREASE, MapleDataTool.getInt("expinc", source, 0)); + addBuffStatPairToListIfNotZero(statups, BuffStat.EXP_INCREASE, MapleDataTool.getInt("expinc", source, 0)); } } else { if (isMapChair(sourceid)) { - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.MAP_CHAIR, 1); + addBuffStatPairToListIfNotZero(statups, BuffStat.MAP_CHAIR, 1); } else if ((sourceid == Beginner.NIMBLE_FEET || sourceid == Noblesse.NIMBLE_FEET || sourceid == Evan.NIMBLE_FEET || sourceid == Legend.AGILE_BODY) && YamlConfig.config.server.USE_ULTRA_NIMBLE_FEET == true) { ret.jump = (short) (ret.speed * 4); ret.speed *= 15; } } - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.WATK, (int) ret.watk); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.WDEF, (int) ret.wdef); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.MATK, (int) ret.matk); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.MDEF, (int) ret.mdef); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.ACC, (int) ret.acc); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.AVOID, (int) ret.avoid); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.SPEED, (int) ret.speed); - addBuffStatPairToListIfNotZero(statups, MapleBuffStat.JUMP, (int) ret.jump); + addBuffStatPairToListIfNotZero(statups, BuffStat.WATK, (int) ret.watk); + addBuffStatPairToListIfNotZero(statups, BuffStat.WDEF, (int) ret.wdef); + addBuffStatPairToListIfNotZero(statups, BuffStat.MATK, (int) ret.matk); + addBuffStatPairToListIfNotZero(statups, BuffStat.MDEF, (int) ret.mdef); + addBuffStatPairToListIfNotZero(statups, BuffStat.ACC, (int) ret.acc); + addBuffStatPairToListIfNotZero(statups, BuffStat.AVOID, (int) ret.avoid); + addBuffStatPairToListIfNotZero(statups, BuffStat.SPEED, (int) ret.speed); + addBuffStatPairToListIfNotZero(statups, BuffStat.JUMP, (int) ret.jump); } MapleData ltd = source.getChildByPath("lt"); @@ -430,13 +430,13 @@ public class MapleStatEffect { case Noblesse.RECOVERY: case Legend.RECOVERY: case Evan.RECOVERY: - statups.add(new Pair<>(MapleBuffStat.RECOVERY, x)); + statups.add(new Pair<>(BuffStat.RECOVERY, x)); break; case Beginner.ECHO_OF_HERO: case Noblesse.ECHO_OF_HERO: case Legend.ECHO_OF_HERO: case Evan.ECHO_OF_HERO: - statups.add(new Pair<>(MapleBuffStat.ECHO_OF_HERO, ret.x)); + statups.add(new Pair<>(BuffStat.ECHO_OF_HERO, ret.x)); break; case Beginner.MONSTER_RIDER: case Noblesse.MONSTER_RIDER: @@ -456,27 +456,27 @@ public class MapleStatEffect { case Beginner.BALROG_MOUNT: case Noblesse.BALROG_MOUNT: case Legend.BALROG_MOUNT: - statups.add(new Pair<>(MapleBuffStat.MONSTER_RIDING, sourceid)); + statups.add(new Pair<>(BuffStat.MONSTER_RIDING, sourceid)); break; case Beginner.INVINCIBLE_BARRIER: case Noblesse.INVINCIBLE_BARRIER: case Legend.INVICIBLE_BARRIER: case Evan.INVINCIBLE_BARRIER: - statups.add(new Pair<>(MapleBuffStat.DIVINE_BODY, 1)); + statups.add(new Pair<>(BuffStat.DIVINE_BODY, 1)); break; case Fighter.POWER_GUARD: case Page.POWER_GUARD: - statups.add(new Pair<>(MapleBuffStat.POWERGUARD, x)); + statups.add(new Pair<>(BuffStat.POWERGUARD, x)); break; case Spearman.HYPER_BODY: case GM.HYPER_BODY: case SuperGM.HYPER_BODY: - statups.add(new Pair<>(MapleBuffStat.HYPERBODYHP, x)); - statups.add(new Pair<>(MapleBuffStat.HYPERBODYMP, ret.y)); + statups.add(new Pair<>(BuffStat.HYPERBODYHP, x)); + statups.add(new Pair<>(BuffStat.HYPERBODYMP, ret.y)); break; case Crusader.COMBO: case DawnWarrior.COMBO: - statups.add(new Pair<>(MapleBuffStat.COMBO, 1)); + statups.add(new Pair<>(BuffStat.COMBO, 1)); break; case WhiteKnight.BW_FIRE_CHARGE: case WhiteKnight.BW_ICE_CHARGE: @@ -488,130 +488,130 @@ public class MapleStatEffect { case Paladin.SWORD_HOLY_CHARGE: case DawnWarrior.SOUL_CHARGE: case ThunderBreaker.LIGHTNING_CHARGE: - statups.add(new Pair<>(MapleBuffStat.WK_CHARGE, x)); + statups.add(new Pair<>(BuffStat.WK_CHARGE, x)); break; case DragonKnight.DRAGON_BLOOD: - statups.add(new Pair<>(MapleBuffStat.DRAGONBLOOD, ret.x)); + statups.add(new Pair<>(BuffStat.DRAGONBLOOD, ret.x)); break; case Hero.STANCE: case Paladin.STANCE: case DarkKnight.STANCE: case Aran.FREEZE_STANDING: - statups.add(new Pair<>(MapleBuffStat.STANCE, iprop)); + statups.add(new Pair<>(BuffStat.STANCE, iprop)); break; case DawnWarrior.FINAL_ATTACK: case WindArcher.FINAL_ATTACK: - statups.add(new Pair<>(MapleBuffStat.FINALATTACK, x)); + statups.add(new Pair<>(BuffStat.FINALATTACK, x)); break; // MAGICIAN case Magician.MAGIC_GUARD: case BlazeWizard.MAGIC_GUARD: case Evan.MAGIC_GUARD: - statups.add(new Pair<>(MapleBuffStat.MAGIC_GUARD, x)); + statups.add(new Pair<>(BuffStat.MAGIC_GUARD, x)); break; case Cleric.INVINCIBLE: - statups.add(new Pair<>(MapleBuffStat.INVINCIBLE, x)); + statups.add(new Pair<>(BuffStat.INVINCIBLE, x)); break; case Priest.HOLY_SYMBOL: case SuperGM.HOLY_SYMBOL: - statups.add(new Pair<>(MapleBuffStat.HOLY_SYMBOL, x)); + statups.add(new Pair<>(BuffStat.HOLY_SYMBOL, x)); break; case FPArchMage.INFINITY: case ILArchMage.INFINITY: case Bishop.INFINITY: - statups.add(new Pair<>(MapleBuffStat.INFINITY, x)); + statups.add(new Pair<>(BuffStat.INFINITY, x)); break; case FPArchMage.MANA_REFLECTION: case ILArchMage.MANA_REFLECTION: case Bishop.MANA_REFLECTION: - statups.add(new Pair<>(MapleBuffStat.MANA_REFLECTION, 1)); + statups.add(new Pair<>(BuffStat.MANA_REFLECTION, 1)); break; case Bishop.HOLY_SHIELD: - statups.add(new Pair<>(MapleBuffStat.HOLY_SHIELD, x)); + statups.add(new Pair<>(BuffStat.HOLY_SHIELD, x)); break; case BlazeWizard.ELEMENTAL_RESET: case Evan.ELEMENTAL_RESET: - statups.add(new Pair<>(MapleBuffStat.ELEMENTAL_RESET, x)); + statups.add(new Pair<>(BuffStat.ELEMENTAL_RESET, x)); break; case Evan.MAGIC_SHIELD: - statups.add(new Pair<>(MapleBuffStat.MAGIC_SHIELD, x)); + statups.add(new Pair<>(BuffStat.MAGIC_SHIELD, x)); break; case Evan.MAGIC_RESISTANCE: - statups.add(new Pair<>(MapleBuffStat.MAGIC_RESISTANCE, x)); + statups.add(new Pair<>(BuffStat.MAGIC_RESISTANCE, x)); break; case Evan.SLOW: - statups.add(new Pair<>(MapleBuffStat.SLOW, x)); + statups.add(new Pair<>(BuffStat.SLOW, x)); // BOWMAN case Priest.MYSTIC_DOOR: case Hunter.SOUL_ARROW: case Crossbowman.SOUL_ARROW: case WindArcher.SOUL_ARROW: - statups.add(new Pair<>(MapleBuffStat.SOULARROW, x)); + statups.add(new Pair<>(BuffStat.SOULARROW, x)); break; case Ranger.PUPPET: case Sniper.PUPPET: case WindArcher.PUPPET: case Outlaw.OCTOPUS: case Corsair.WRATH_OF_THE_OCTOPI: - statups.add(new Pair<>(MapleBuffStat.PUPPET, 1)); + statups.add(new Pair<>(BuffStat.PUPPET, 1)); break; case Bowmaster.CONCENTRATE: - statups.add(new Pair<>(MapleBuffStat.CONCENTRATE, x)); + statups.add(new Pair<>(BuffStat.CONCENTRATE, x)); break; case Bowmaster.HAMSTRING: - statups.add(new Pair<>(MapleBuffStat.HAMSTRING, x)); + statups.add(new Pair<>(BuffStat.HAMSTRING, x)); monsterStatus.put(MonsterStatus.SPEED, x); break; case Marksman.BLIND: - statups.add(new Pair<>(MapleBuffStat.BLIND, x)); + statups.add(new Pair<>(BuffStat.BLIND, x)); monsterStatus.put(MonsterStatus.ACC, x); break; case Bowmaster.SHARP_EYES: case Marksman.SHARP_EYES: - statups.add(new Pair<>(MapleBuffStat.SHARP_EYES, ret.x << 8 | ret.y)); + statups.add(new Pair<>(BuffStat.SHARP_EYES, ret.x << 8 | ret.y)); break; case WindArcher.WIND_WALK: - statups.add(new Pair<>(MapleBuffStat.WIND_WALK, x)); + statups.add(new Pair<>(BuffStat.WIND_WALK, x)); //break; thanks Vcoc for noticing WW not showing for other players when changing maps case Rogue.DARK_SIGHT: case NightWalker.DARK_SIGHT: - statups.add(new Pair<>(MapleBuffStat.DARKSIGHT, x)); + statups.add(new Pair<>(BuffStat.DARKSIGHT, x)); break; case Hermit.MESO_UP: - statups.add(new Pair<>(MapleBuffStat.MESOUP, x)); + statups.add(new Pair<>(BuffStat.MESOUP, x)); break; case Hermit.SHADOW_PARTNER: case NightWalker.SHADOW_PARTNER: - statups.add(new Pair<>(MapleBuffStat.SHADOWPARTNER, x)); + statups.add(new Pair<>(BuffStat.SHADOWPARTNER, x)); break; case ChiefBandit.MESO_GUARD: - statups.add(new Pair<>(MapleBuffStat.MESOGUARD, x)); + statups.add(new Pair<>(BuffStat.MESOGUARD, x)); break; case ChiefBandit.PICKPOCKET: - statups.add(new Pair<>(MapleBuffStat.PICKPOCKET, x)); + statups.add(new Pair<>(BuffStat.PICKPOCKET, x)); break; case NightLord.SHADOW_STARS: - statups.add(new Pair<>(MapleBuffStat.SHADOW_CLAW, 0)); + statups.add(new Pair<>(BuffStat.SHADOW_CLAW, 0)); break; // PIRATE case Pirate.DASH: case ThunderBreaker.DASH: case Beginner.SPACE_DASH: case Noblesse.SPACE_DASH: - statups.add(new Pair<>(MapleBuffStat.DASH2, ret.x)); - statups.add(new Pair<>(MapleBuffStat.DASH, ret.y)); + statups.add(new Pair<>(BuffStat.DASH2, ret.x)); + statups.add(new Pair<>(BuffStat.DASH, ret.y)); break; case Corsair.SPEED_INFUSION: case Buccaneer.SPEED_INFUSION: case ThunderBreaker.SPEED_INFUSION: - statups.add(new Pair<>(MapleBuffStat.SPEED_INFUSION, x)); + statups.add(new Pair<>(BuffStat.SPEED_INFUSION, x)); break; case Outlaw.HOMING_BEACON: case Corsair.BULLSEYE: - statups.add(new Pair<>(MapleBuffStat.HOMING_BEACON, x)); + statups.add(new Pair<>(BuffStat.HOMING_BEACON, x)); break; case ThunderBreaker.SPARK: - statups.add(new Pair<>(MapleBuffStat.SPARK, x)); + statups.add(new Pair<>(BuffStat.SPARK, x)); break; // MULTIPLE case Aran.POLEARM_BOOSTER: @@ -638,7 +638,7 @@ public class MapleStatEffect { case Beginner.POWER_EXPLOSION: case Noblesse.POWER_EXPLOSION: case Legend.POWER_EXPLOSION: - statups.add(new Pair<>(MapleBuffStat.BOOSTER, x)); + statups.add(new Pair<>(BuffStat.BOOSTER, x)); break; case Hero.MAPLE_WARRIOR: case Paladin.MAPLE_WARRIOR: @@ -654,17 +654,17 @@ public class MapleStatEffect { case Buccaneer.MAPLE_WARRIOR: case Aran.MAPLE_WARRIOR: case Evan.MAPLE_WARRIOR: - statups.add(new Pair<>(MapleBuffStat.MAPLE_WARRIOR, ret.x)); + statups.add(new Pair<>(BuffStat.MAPLE_WARRIOR, ret.x)); break; // SUMMON case Ranger.SILVER_HAWK: case Sniper.GOLDEN_EAGLE: - statups.add(new Pair<>(MapleBuffStat.SUMMON, 1)); + statups.add(new Pair<>(BuffStat.SUMMON, 1)); monsterStatus.put(MonsterStatus.STUN, 1); break; case FPArchMage.ELQUINES: case Marksman.FROST_PREY: - statups.add(new Pair<>(MapleBuffStat.SUMMON, 1)); + statups.add(new Pair<>(BuffStat.SUMMON, 1)); monsterStatus.put(MonsterStatus.FREEZE, 1); break; case Priest.SUMMON_DRAGON: @@ -679,7 +679,7 @@ public class MapleStatEffect { case NightWalker.DARKNESS: case ThunderBreaker.LIGHTNING: case BlazeWizard.IFRIT: - statups.add(new Pair<>(MapleBuffStat.SUMMON, 1)); + statups.add(new Pair<>(BuffStat.SUMMON, 1)); break; // ----------------------------- MONSTER STATUS ---------------------------------- // case Crusader.ARMOR_CRASH: @@ -774,32 +774,32 @@ public class MapleStatEffect { monsterStatus.put(MonsterStatus.PHANTOM_IMPRINT, x); //ARAN case Aran.COMBO_ABILITY: - statups.add(new Pair<>(MapleBuffStat.ARAN_COMBO, 100)); + statups.add(new Pair<>(BuffStat.ARAN_COMBO, 100)); break; case Aran.COMBO_BARRIER: - statups.add(new Pair<>(MapleBuffStat.COMBO_BARRIER, ret.x)); + statups.add(new Pair<>(BuffStat.COMBO_BARRIER, ret.x)); break; case Aran.COMBO_DRAIN: - statups.add(new Pair<>(MapleBuffStat.COMBO_DRAIN, ret.x)); + statups.add(new Pair<>(BuffStat.COMBO_DRAIN, ret.x)); break; case Aran.SMART_KNOCKBACK: - statups.add(new Pair<>(MapleBuffStat.SMART_KNOCKBACK, ret.x)); + statups.add(new Pair<>(BuffStat.SMART_KNOCKBACK, ret.x)); break; case Aran.BODY_PRESSURE: - statups.add(new Pair<>(MapleBuffStat.BODY_PRESSURE, ret.x)); + statups.add(new Pair<>(BuffStat.BODY_PRESSURE, ret.x)); break; case Aran.SNOW_CHARGE: - statups.add(new Pair<>(MapleBuffStat.WK_CHARGE, ret.duration)); + statups.add(new Pair<>(BuffStat.WK_CHARGE, ret.duration)); break; default: break; } } if (ret.isMorph()) { - statups.add(new Pair<>(MapleBuffStat.MORPH, ret.getMorph())); + statups.add(new Pair<>(BuffStat.MORPH, ret.getMorph())); } if (ret.ghost > 0 && !skill) { - statups.add(new Pair<>(MapleBuffStat.GHOST_MORPH, ret.ghost)); + statups.add(new Pair<>(BuffStat.GHOST_MORPH, ret.ghost)); } ret.monsterStatus = monsterStatus; statups.trimToSize(); @@ -966,9 +966,9 @@ public class MapleStatEffect { if (overTime || isCygnusFA() || summonMovementType != null) { if (summonMovementType != null && pos != null) { if (summonMovementType.getValue() == summonMovementType.STATIONARY.getValue()) { - applyto.cancelBuffStats(MapleBuffStat.PUPPET); + applyto.cancelBuffStats(BuffStat.PUPPET); } else { - applyto.cancelBuffStats(MapleBuffStat.SUMMON); + applyto.cancelBuffStats(BuffStat.SUMMON); } applyto.sendPacket(PacketCreator.enableActions()); @@ -1024,7 +1024,7 @@ public class MapleStatEffect { applyto.dropMessage(5, "There are no door portals available for the town at this moment. Try again later."); } - applyto.cancelBuffStats(MapleBuffStat.SOULARROW); // cancel door buff + applyto.cancelBuffStats(BuffStat.SOULARROW); // cancel door buff } } else if (isMist()) { Rectangle bounds = calculateBoundingBox(sourceid == NightWalker.POISON_BOMB ? pos : applyfrom.getPosition(), applyfrom.isFacingLeft()); @@ -1182,7 +1182,7 @@ public class MapleStatEffect { } public final void applyComboBuff(final MapleCharacter applyto, int combo) { - final List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.ARAN_COMBO, combo)); + final List> stat = Collections.singletonList(new Pair<>(BuffStat.ARAN_COMBO, combo)); applyto.sendPacket(PacketCreator.giveBuff(sourceid, 99999, stat)); final long starttime = Server.getInstance().getCurrentTime(); @@ -1192,14 +1192,14 @@ public class MapleStatEffect { } public final void applyBeaconBuff(final MapleCharacter applyto, int objectid) { // thanks Thora & Hyun for reporting an issue with homing beacon autoflagging mobs when changing maps - final List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.HOMING_BEACON, objectid)); + final List> stat = Collections.singletonList(new Pair<>(BuffStat.HOMING_BEACON, objectid)); applyto.sendPacket(PacketCreator.giveBuff(1, sourceid, stat)); final long starttime = Server.getInstance().getCurrentTime(); applyto.registerEffect(this, starttime, Long.MAX_VALUE, false); } - public void updateBuffEffect(MapleCharacter target, List> activeStats, long starttime) { + public void updateBuffEffect(MapleCharacter target, List> activeStats, long starttime) { int localDuration = getBuffLocalDuration(); localDuration = alchemistModifyVal(target, localDuration, false); @@ -1218,7 +1218,7 @@ public class MapleStatEffect { applyto.cancelEffect(this, true, -1); } - List> localstatups = statups; + List> localstatups = statups; int localDuration = getBuffLocalDuration(); int localsourceid = sourceid; int seconds = localDuration / 1000; @@ -1250,11 +1250,11 @@ public class MapleStatEffect { localDuration = sourceid; localsourceid = ridingMountId; - localstatups = Collections.singletonList(new Pair<>(MapleBuffStat.MONSTER_RIDING, 0)); + localstatups = Collections.singletonList(new Pair<>(BuffStat.MONSTER_RIDING, 0)); } else if (isSkillMorph()) { for (int i = 0; i < localstatups.size(); i++) { - if (localstatups.get(i).getLeft().equals(MapleBuffStat.MORPH)) { - localstatups.set(i, new Pair<>(MapleBuffStat.MORPH, getMorph(applyto))); + if (localstatups.get(i).getLeft().equals(BuffStat.MORPH)) { + localstatups.set(i, new Pair<>(BuffStat.MORPH, getMorph(applyto))); break; } } @@ -1278,16 +1278,16 @@ public class MapleStatEffect { buff = PacketCreator.givePirateBuff(localstatups, sourceid, seconds); mbuff = PacketCreator.giveForeignPirateBuff(applyto.getId(), sourceid, seconds, localstatups); } else if (isDs()) { - List> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.DARKSIGHT, 0)); + List> dsstat = Collections.singletonList(new Pair<>(BuffStat.DARKSIGHT, 0)); mbuff = PacketCreator.giveForeignBuff(applyto.getId(), dsstat); } else if (isWw()) { - List> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.WIND_WALK, 0)); + List> dsstat = Collections.singletonList(new Pair<>(BuffStat.WIND_WALK, 0)); mbuff = PacketCreator.giveForeignBuff(applyto.getId(), dsstat); } else if (isCombo()) { - Integer comboCount = applyto.getBuffedValue(MapleBuffStat.COMBO); + Integer comboCount = applyto.getBuffedValue(BuffStat.COMBO); if (comboCount == null) comboCount = 0; - List> cbstat = Collections.singletonList(new Pair<>(MapleBuffStat.COMBO, comboCount)); + List> cbstat = Collections.singletonList(new Pair<>(BuffStat.COMBO, comboCount)); buff = PacketCreator.giveBuff((skill ? sourceid : -sourceid), localDuration, cbstat); mbuff = PacketCreator.giveForeignBuff(applyto.getId(), cbstat); } else if (isMonsterRiding()) { @@ -1302,18 +1302,18 @@ public class MapleStatEffect { mbuff = PacketCreator.showMonsterRiding(applyto.getId(), givemount); localDuration = duration; } else if (isShadowPartner()) { - List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.SHADOWPARTNER, 0)); + List> stat = Collections.singletonList(new Pair<>(BuffStat.SHADOWPARTNER, 0)); mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat); } else if (isSoulArrow()) { - List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.SOULARROW, 0)); + List> stat = Collections.singletonList(new Pair<>(BuffStat.SOULARROW, 0)); mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat); } else if (isEnrage()) { applyto.handleOrbconsume(); } else if (isMorph()) { - List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.MORPH, getMorph(applyto))); + List> stat = Collections.singletonList(new Pair<>(BuffStat.MORPH, getMorph(applyto))); mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat); } else if (isAriantShield()) { - List> stat = Collections.singletonList(new Pair<>(MapleBuffStat.AURA, 1)); + List> stat = Collections.singletonList(new Pair<>(BuffStat.AURA, 1)); mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat); } @@ -1405,10 +1405,10 @@ public class MapleStatEffect { } } mpchange -= mpCon * mod; - if (applyfrom.getBuffedValue(MapleBuffStat.INFINITY) != null) { + if (applyfrom.getBuffedValue(BuffStat.INFINITY) != null) { mpchange = 0; - } else if (applyfrom.getBuffedValue(MapleBuffStat.CONCENTRATE) != null) { - mpchange -= (int) (mpchange * (applyfrom.getBuffedValue(MapleBuffStat.CONCENTRATE).doubleValue() / 100)); + } else if (applyfrom.getBuffedValue(BuffStat.CONCENTRATE) != null) { + mpchange -= (int) (mpchange * (applyfrom.getBuffedValue(BuffStat.CONCENTRATE).doubleValue() / 100)); } } } @@ -1683,8 +1683,8 @@ public class MapleStatEffect { return false; } - for (Pair p : statups) { - if (p.getLeft().equals(MapleBuffStat.WK_CHARGE)) { + for (Pair p : statups) { + if (p.getLeft().equals(BuffStat.WK_CHARGE)) { return true; } } @@ -1854,7 +1854,7 @@ public class MapleStatEffect { return duration; } - public List> getStatups() { + public List> getStatups() { return statups; } diff --git a/src/main/java/server/life/MapleMonster.java b/src/main/java/server/life/MapleMonster.java index 9907157041..0a1008fee0 100644 --- a/src/main/java/server/life/MapleMonster.java +++ b/src/main/java/server/life/MapleMonster.java @@ -670,7 +670,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { float multiplier = 1.0f; // thanks Prophecy & Aika for finding out Holy Symbol not being applied on party bonuses - Integer holySymbol = attacker.getBuffedValue(MapleBuffStat.HOLY_SYMBOL); + Integer holySymbol = attacker.getBuffedValue(BuffStat.HOLY_SYMBOL); if (holySymbol != null) { if (YamlConfig.config.server.USE_FULL_HOLY_SYMBOL) { // thanks Mordred, xinyifly, AyumiLove, andy33 for noticing HS hands out 20% of its potential on less than 3 players multiplier *= (1.0 + (holySymbol.doubleValue() / 100.0)); @@ -711,7 +711,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { personalExp = 0.0f; } - Integer expBonus = attacker.getBuffedValue(MapleBuffStat.EXP_INCREASE); + Integer expBonus = attacker.getBuffedValue(BuffStat.EXP_INCREASE); if (expBonus != null) { // exp increase player buff found thanks to HighKey21 personalExp += expBonus; } @@ -1797,7 +1797,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { } public boolean isCharacterPuppetInVicinity(MapleCharacter chr) { - MapleStatEffect mse = chr.getBuffEffect(MapleBuffStat.PUPPET); + MapleStatEffect mse = chr.getBuffEffect(BuffStat.PUPPET); if (mse != null) { MapleSummon summon = chr.getSummonByKey(mse.getSourceId()); @@ -2139,7 +2139,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { return; } - MapleStatEffect puppetEffect = chrController.getBuffEffect(MapleBuffStat.PUPPET); + MapleStatEffect puppetEffect = chrController.getBuffEffect(BuffStat.PUPPET); if (puppetEffect != null) { MapleSummon puppet = chrController.getSummonByKey(puppetEffect.getSourceId()); diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index d0b3a49f6d..45e0179769 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -21,7 +21,7 @@ */ package server.maps; -import client.MapleBuffStat; +import client.BuffStat; import client.MapleCharacter; import client.MapleClient; import client.autoban.AutobanFactory; @@ -648,8 +648,8 @@ public class MapleMap { int mesos = Randomizer.nextInt(de.Maximum - de.Minimum) + de.Minimum; if (mesos > 0) { - if (chr.getBuffedValue(MapleBuffStat.MESOUP) != null) { - mesos = (int) (mesos * chr.getBuffedValue(MapleBuffStat.MESOUP).doubleValue() / 100.0); + if (chr.getBuffedValue(BuffStat.MESOUP) != null) { + mesos = (int) (mesos * chr.getBuffedValue(BuffStat.MESOUP).doubleValue() / 100.0); } mesos = mesos * chr.getMesoRate(); if (mesos <= 0) { @@ -2389,9 +2389,9 @@ public class MapleMap { msm.runMapScript(chr.getClient(), "onUserEnter/" + onUserEnter, false); } - if (FieldLimit.CANNOTUSEMOUNTS.check(fieldLimit) && chr.getBuffedValue(MapleBuffStat.MONSTER_RIDING) != null) { - chr.cancelEffectFromBuffStat(MapleBuffStat.MONSTER_RIDING); - chr.cancelBuffStats(MapleBuffStat.MONSTER_RIDING); + if (FieldLimit.CANNOTUSEMOUNTS.check(fieldLimit) && chr.getBuffedValue(BuffStat.MONSTER_RIDING) != null) { + chr.cancelEffectFromBuffStat(BuffStat.MONSTER_RIDING); + chr.cancelBuffStats(BuffStat.MONSTER_RIDING); } if (mapid == 200090060) { // To Rien @@ -2494,7 +2494,7 @@ public class MapleMap { broadcastGMSpawnPlayerMapObjectMessage(chr, chr, true); chr.sendPacket(PacketCreator.getGMEffect(0x10, (byte) 1)); - List> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.DARKSIGHT, 0)); + List> dsstat = Collections.singletonList(new Pair<>(BuffStat.DARKSIGHT, 0)); broadcastGMMessage(chr, PacketCreator.giveForeignBuff(chr.getId(), dsstat), false); } else { broadcastSpawnPlayerMapObjectMessage(chr, chr, true); @@ -2534,7 +2534,7 @@ public class MapleMap { } } - MapleStatEffect summonStat = chr.getStatForBuff(MapleBuffStat.SUMMON); + MapleStatEffect summonStat = chr.getStatForBuff(BuffStat.SUMMON); if (summonStat != null) { MapleSummon summon = chr.getSummonByKey(summonStat.getSourceId()); summon.setPosition(chr.getPosition()); @@ -2700,7 +2700,7 @@ public class MapleMap { for (MapleSummon summon : new ArrayList<>(chr.getSummonsValues())) { if (summon.isStationary()) { - chr.cancelEffectFromBuffStat(MapleBuffStat.PUPPET); + chr.cancelEffectFromBuffStat(BuffStat.PUPPET); } else { removeMapObject(summon); } diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index d243c937d6..76bfaa4a59 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -1797,32 +1797,32 @@ public class PacketCreator { p.writeShort(0); //v83 p.writeByte(0xFC); p.writeByte(1); - if (chr.getBuffedValue(MapleBuffStat.MORPH) != null) { + if (chr.getBuffedValue(BuffStat.MORPH) != null) { p.writeInt(2); } else { p.writeInt(0); } long buffmask = 0; Integer buffvalue = null; - if ((chr.getBuffedValue(MapleBuffStat.DARKSIGHT) != null || chr.getBuffedValue(MapleBuffStat.WIND_WALK) != null) && !chr.isHidden()) { - buffmask |= MapleBuffStat.DARKSIGHT.getValue(); + if ((chr.getBuffedValue(BuffStat.DARKSIGHT) != null || chr.getBuffedValue(BuffStat.WIND_WALK) != null) && !chr.isHidden()) { + buffmask |= BuffStat.DARKSIGHT.getValue(); } - if (chr.getBuffedValue(MapleBuffStat.COMBO) != null) { - buffmask |= MapleBuffStat.COMBO.getValue(); - buffvalue = Integer.valueOf(chr.getBuffedValue(MapleBuffStat.COMBO)); + if (chr.getBuffedValue(BuffStat.COMBO) != null) { + buffmask |= BuffStat.COMBO.getValue(); + buffvalue = Integer.valueOf(chr.getBuffedValue(BuffStat.COMBO)); } - if (chr.getBuffedValue(MapleBuffStat.SHADOWPARTNER) != null) { - buffmask |= MapleBuffStat.SHADOWPARTNER.getValue(); + if (chr.getBuffedValue(BuffStat.SHADOWPARTNER) != null) { + buffmask |= BuffStat.SHADOWPARTNER.getValue(); } - if (chr.getBuffedValue(MapleBuffStat.SOULARROW) != null) { - buffmask |= MapleBuffStat.SOULARROW.getValue(); + if (chr.getBuffedValue(BuffStat.SOULARROW) != null) { + buffmask |= BuffStat.SOULARROW.getValue(); } - if (chr.getBuffedValue(MapleBuffStat.MORPH) != null) { - buffvalue = Integer.valueOf(chr.getBuffedValue(MapleBuffStat.MORPH)); + if (chr.getBuffedValue(BuffStat.MORPH) != null) { + buffvalue = Integer.valueOf(chr.getBuffedValue(BuffStat.MORPH)); } p.writeInt((int) ((buffmask >> 32) & 0xffffffffL)); if (buffvalue != null) { - if (chr.getBuffedValue(MapleBuffStat.MORPH) != null) { //TEST + if (chr.getBuffedValue(BuffStat.MORPH) != null) { //TEST p.writeShort(buffvalue); } else { p.writeByte(buffvalue.byteValue()); @@ -1835,7 +1835,7 @@ public class PacketCreator { p.writeShort(0); p.skip(4); - boolean dashBuff = chr.getBuffedValue(MapleBuffStat.DASH) != null; + boolean dashBuff = chr.getBuffedValue(BuffStat.DASH) != null; // Dash Speed p.writeInt(dashBuff ? 1 << 24 : 0); p.skip(11); @@ -1847,7 +1847,7 @@ public class PacketCreator { p.writeByte(0); // Monster Riding - Integer bv = chr.getBuffedValue(MapleBuffStat.MONSTER_RIDING); + Integer bv = chr.getBuffedValue(BuffStat.MONSTER_RIDING); if (bv != null) { MapleMount mount = chr.getMount(); if (mount != null) { @@ -2754,7 +2754,7 @@ public class PacketCreator { /** * It is important that statups is in the correct order (see declaration - * order in MapleBuffStat) since this method doesn't do automagical + * order in BuffStat) since this method doesn't do automagical * reordering. * * @param buffid @@ -2763,12 +2763,12 @@ public class PacketCreator { * @return */ //1F 00 00 00 00 00 03 00 00 40 00 00 00 E0 00 00 00 00 00 00 00 00 E0 01 8E AA 4F 00 00 C2 EB 0B E0 01 8E AA 4F 00 00 C2 EB 0B 0C 00 8E AA 4F 00 00 C2 EB 0B 44 02 8E AA 4F 00 00 C2 EB 0B 44 02 8E AA 4F 00 00 C2 EB 0B 00 00 E0 7A 1D 00 8E AA 4F 00 00 00 00 00 00 00 00 03 - public static Packet giveBuff(int buffid, int bufflength, List> statups) { + public static Packet giveBuff(int buffid, int bufflength, List> statups) { final OutPacket p = OutPacket.create(SendOpcode.GIVE_BUFF); boolean special = false; writeLongMask(p, statups); - for (Pair statup : statups) { - if (statup.getLeft().equals(MapleBuffStat.MONSTER_RIDING) || statup.getLeft().equals(MapleBuffStat.HOMING_BEACON)) { + for (Pair statup : statups) { + if (statup.getLeft().equals(BuffStat.MONSTER_RIDING) || statup.getLeft().equals(BuffStat.HOMING_BEACON)) { special = true; } p.writeShort(statup.getRight().shortValue()); @@ -2794,7 +2794,7 @@ public class PacketCreator { public static Packet showMonsterRiding(int cid, MapleMount mount) { //Gtfo with this, this is just giveForeignBuff final OutPacket p = OutPacket.create(SendOpcode.GIVE_FOREIGN_BUFF); p.writeInt(cid); - p.writeLong(MapleBuffStat.MONSTER_RIDING.getValue()); + p.writeLong(BuffStat.MONSTER_RIDING.getValue()); p.writeLong(0); p.writeShort(0); p.writeInt(mount.getItemId()); @@ -2806,7 +2806,7 @@ public class PacketCreator { } /* p.writeInt(cid); writeLongMask(mplew, statups); - for (Pair statup : statups) { + for (Pair statup : statups) { if (morph) { p.writeInt(statup.getRight().intValue()); } else { @@ -2956,11 +2956,11 @@ public class PacketCreator { return p; } - public static Packet giveForeignBuff(int chrId, List> statups) { + public static Packet giveForeignBuff(int chrId, List> statups) { OutPacket p = OutPacket.create(SendOpcode.GIVE_FOREIGN_BUFF); p.writeInt(chrId); writeLongMask(p, statups); - for (Pair statup : statups) { + for (Pair statup : statups) { p.writeShort(statup.getRight().shortValue()); } p.writeInt(0); @@ -2968,24 +2968,24 @@ public class PacketCreator { return p; } - public static Packet cancelForeignBuff(int chrId, List statups) { + public static Packet cancelForeignBuff(int chrId, List statups) { OutPacket p = OutPacket.create(SendOpcode.CANCEL_FOREIGN_BUFF); p.writeInt(chrId); writeLongMaskFromList(p, statups); return p; } - public static Packet cancelBuff(List statups) { + public static Packet cancelBuff(List statups) { OutPacket p = OutPacket.create(SendOpcode.CANCEL_BUFF); writeLongMaskFromList(p, statups); p.writeByte(1);//? return p; } - private static void writeLongMask(final OutPacket p, List> statups) { + private static void writeLongMask(final OutPacket p, List> statups) { long firstmask = 0; long secondmask = 0; - for (Pair statup : statups) { + for (Pair statup : statups) { if (statup.getLeft().isFirst()) { firstmask |= statup.getLeft().getValue(); } else { @@ -2996,10 +2996,10 @@ public class PacketCreator { p.writeLong(secondmask); } - private static void writeLongMaskFromList(OutPacket p, List statups) { + private static void writeLongMaskFromList(OutPacket p, List statups) { long firstmask = 0; long secondmask = 0; - for (MapleBuffStat statup : statups) { + for (BuffStat statup : statups) { if (statup.isFirst()) { firstmask |= statup.getValue(); } else { @@ -3087,7 +3087,7 @@ public class PacketCreator { } // packet found thanks to Ronan - public static Packet giveForeignWKChargeEffect(int cid, int buffid, List> statups) { + public static Packet giveForeignWKChargeEffect(int cid, int buffid, List> statups) { OutPacket p = OutPacket.create(SendOpcode.GIVE_FOREIGN_BUFF); p.writeInt(cid); writeLongMask(p, statups); @@ -5312,12 +5312,12 @@ public class PacketCreator { return p; } - public static Packet givePirateBuff(List> statups, int buffid, int duration) { + public static Packet givePirateBuff(List> statups, int buffid, int duration) { OutPacket p = OutPacket.create(SendOpcode.GIVE_BUFF); boolean infusion = buffid == Buccaneer.SPEED_INFUSION || buffid == ThunderBreaker.SPEED_INFUSION || buffid == Corsair.SPEED_INFUSION; writeLongMask(p, statups); p.writeShort(0); - for (Pair stat : statups) { + for (Pair stat : statups) { p.writeInt(stat.getRight().shortValue()); p.writeInt(buffid); p.skip(infusion ? 10 : 5); @@ -5327,13 +5327,13 @@ public class PacketCreator { return p; } - public static Packet giveForeignPirateBuff(int cid, int buffid, int time, List> statups) { + public static Packet giveForeignPirateBuff(int cid, int buffid, int time, List> statups) { OutPacket p = OutPacket.create(SendOpcode.GIVE_FOREIGN_BUFF); boolean infusion = buffid == Buccaneer.SPEED_INFUSION || buffid == ThunderBreaker.SPEED_INFUSION || buffid == Corsair.SPEED_INFUSION; p.writeInt(cid); writeLongMask(p, statups); p.writeShort(0); - for (Pair statup : statups) { + for (Pair statup : statups) { p.writeInt(statup.getRight().shortValue()); p.writeInt(buffid); p.skip(infusion ? 10 : 5); From 7dc3a2159a9a92125a638983af4b9cf99e64f851 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:09:45 +0200 Subject: [PATCH 011/125] Rename and clean up MapleCharacter --- scripts/npc/changeName.js | 4 +- src/main/java/client/BuddyList.java | 2 +- .../{MapleCharacter.java => Character.java} | 2863 +++++++++-------- src/main/java/client/MapleClient.java | 18 +- src/main/java/client/MapleFamily.java | 4 +- src/main/java/client/MapleFamilyEntry.java | 20 +- src/main/java/client/MapleMount.java | 4 +- src/main/java/client/MapleRing.java | 2 +- .../java/client/autoban/AutobanFactory.java | 10 +- .../java/client/autoban/AutobanManager.java | 8 +- .../command/commands/gm0/GmCommand.java | 8 +- .../commands/gm0/JoinEventCommand.java | 4 +- .../commands/gm0/LeaveEventCommand.java | 4 +- .../commands/gm0/MapOwnerClaimCommand.java | 4 +- .../command/commands/gm0/OnlineCommand.java | 8 +- .../command/commands/gm0/RanksCommand.java | 4 +- .../command/commands/gm0/RatesCommand.java | 4 +- .../commands/gm0/ReadPointsCommand.java | 4 +- .../commands/gm0/ReportBugCommand.java | 8 +- .../commands/gm0/ShowRatesCommand.java | 4 +- .../command/commands/gm0/StatDexCommand.java | 4 +- .../command/commands/gm0/StatIntCommand.java | 4 +- .../command/commands/gm0/StatLukCommand.java | 4 +- .../command/commands/gm0/StatStrCommand.java | 4 +- .../command/commands/gm1/BossHpCommand.java | 4 +- .../command/commands/gm1/BuffMeCommand.java | 4 +- .../command/commands/gm1/GotoCommand.java | 4 +- .../command/commands/gm1/MobHpCommand.java | 4 +- .../commands/gm1/WhatDropsFromCommand.java | 4 +- .../command/commands/gm1/WhoDropsCommand.java | 4 +- .../command/commands/gm2/ApCommand.java | 6 +- .../command/commands/gm2/BombCommand.java | 6 +- .../command/commands/gm2/BuffCommand.java | 4 +- .../command/commands/gm2/BuffMapCommand.java | 4 +- .../commands/gm2/ClearDropsCommand.java | 4 +- .../gm2/ClearSavedLocationsCommand.java | 4 +- .../commands/gm2/ClearSlotCommand.java | 4 +- .../command/commands/gm2/DcCommand.java | 6 +- .../commands/gm2/EmpowerMeCommand.java | 4 +- .../command/commands/gm2/HealCommand.java | 4 +- .../command/commands/gm2/HideCommand.java | 4 +- .../command/commands/gm2/IdCommand.java | 4 +- .../command/commands/gm2/ItemCommand.java | 4 +- .../command/commands/gm2/ItemDropCommand.java | 4 +- .../command/commands/gm2/JailCommand.java | 6 +- .../command/commands/gm2/JobCommand.java | 6 +- .../command/commands/gm2/LevelCommand.java | 4 +- .../command/commands/gm2/LevelProCommand.java | 4 +- .../command/commands/gm2/MaxSkillCommand.java | 3 +- .../command/commands/gm2/MaxStatCommand.java | 4 +- .../command/commands/gm2/ReachCommand.java | 6 +- .../command/commands/gm2/RechargeCommand.java | 4 +- .../commands/gm2/ResetSkillCommand.java | 3 +- .../command/commands/gm2/SearchCommand.java | 4 +- .../command/commands/gm2/SetSlotCommand.java | 4 +- .../command/commands/gm2/SetStatCommand.java | 4 +- .../command/commands/gm2/SpCommand.java | 6 +- .../command/commands/gm2/SummonCommand.java | 6 +- .../command/commands/gm2/UnHideCommand.java | 4 +- .../command/commands/gm2/UnJailCommand.java | 6 +- .../command/commands/gm2/WarpAreaCommand.java | 8 +- .../command/commands/gm2/WarpCommand.java | 4 +- .../command/commands/gm2/WarpMapCommand.java | 8 +- .../command/commands/gm2/WhereaMiCommand.java | 12 +- .../command/commands/gm3/BanCommand.java | 12 +- .../command/commands/gm3/ChatCommand.java | 4 +- .../command/commands/gm3/CheckDmgCommand.java | 6 +- .../commands/gm3/ClosePortalCommand.java | 4 +- .../command/commands/gm3/DebuffCommand.java | 6 +- .../command/commands/gm3/EndEventCommand.java | 4 +- .../command/commands/gm3/ExpedsCommand.java | 4 +- .../command/commands/gm3/FaceCommand.java | 6 +- .../command/commands/gm3/FameCommand.java | 6 +- .../command/commands/gm3/FlyCommand.java | 4 +- .../commands/gm3/GiveMesosCommand.java | 6 +- .../command/commands/gm3/GiveNxCommand.java | 6 +- .../command/commands/gm3/GiveRpCommand.java | 6 +- .../command/commands/gm3/GiveVpCommand.java | 6 +- .../command/commands/gm3/HairCommand.java | 6 +- .../command/commands/gm3/HealMapCommand.java | 6 +- .../commands/gm3/HealPersonCommand.java | 6 +- .../command/commands/gm3/HpMpCommand.java | 6 +- .../command/commands/gm3/HurtCommand.java | 6 +- .../command/commands/gm3/IgnoreCommand.java | 6 +- .../command/commands/gm3/IgnoredCommand.java | 6 +- .../command/commands/gm3/InMapCommand.java | 6 +- .../command/commands/gm3/KillAllCommand.java | 4 +- .../command/commands/gm3/KillCommand.java | 6 +- .../command/commands/gm3/KillMapCommand.java | 6 +- .../commands/gm3/MaxEnergyCommand.java | 4 +- .../command/commands/gm3/MaxHpMpCommand.java | 6 +- .../command/commands/gm3/MonitorCommand.java | 6 +- .../command/commands/gm3/MonitorsCommand.java | 6 +- .../command/commands/gm3/MusicCommand.java | 4 +- .../command/commands/gm3/MuteMapCommand.java | 4 +- .../command/commands/gm3/NightCommand.java | 4 +- .../command/commands/gm3/NoticeCommand.java | 4 +- .../command/commands/gm3/NpcCommand.java | 4 +- .../commands/gm3/OnlineTwoCommand.java | 8 +- .../commands/gm3/OpenPortalCommand.java | 4 +- .../command/commands/gm3/PeCommand.java | 4 +- .../command/commands/gm3/PosCommand.java | 4 +- .../commands/gm3/QuestCompleteCommand.java | 4 +- .../commands/gm3/QuestResetCommand.java | 4 +- .../commands/gm3/QuestStartCommand.java | 4 +- .../commands/gm3/ReloadDropsCommand.java | 4 +- .../commands/gm3/ReloadEventsCommand.java | 4 +- .../commands/gm3/ReloadMapCommand.java | 8 +- .../commands/gm3/ReloadPortalsCommand.java | 4 +- .../command/commands/gm3/RipCommand.java | 4 +- .../command/commands/gm3/SeedCommand.java | 4 +- .../command/commands/gm3/SpawnCommand.java | 4 +- .../commands/gm3/StartEventCommand.java | 4 +- .../command/commands/gm3/TimerAllCommand.java | 8 +- .../command/commands/gm3/TimerCommand.java | 6 +- .../command/commands/gm3/TimerMapCommand.java | 8 +- .../commands/gm3/ToggleCouponCommand.java | 4 +- .../command/commands/gm3/UnBanCommand.java | 6 +- .../commands/gm4/BossDropRateCommand.java | 4 +- .../command/commands/gm4/CakeCommand.java | 4 +- .../command/commands/gm4/DropRateCommand.java | 4 +- .../command/commands/gm4/ExpRateCommand.java | 4 +- .../commands/gm4/FishingRateCommand.java | 4 +- .../command/commands/gm4/ForceVacCommand.java | 4 +- .../command/commands/gm4/HorntailCommand.java | 4 +- .../command/commands/gm4/ItemVacCommand.java | 4 +- .../command/commands/gm4/MesoRateCommand.java | 4 +- .../command/commands/gm4/PapCommand.java | 4 +- .../command/commands/gm4/PianusCommand.java | 4 +- .../command/commands/gm4/PinkbeanCommand.java | 4 +- .../commands/gm4/PlayerNpcCommand.java | 4 +- .../commands/gm4/PlayerNpcRemoveCommand.java | 4 +- .../command/commands/gm4/PmobCommand.java | 4 +- .../commands/gm4/PmobRemoveCommand.java | 4 +- .../command/commands/gm4/PnpcCommand.java | 4 +- .../commands/gm4/PnpcRemoveCommand.java | 4 +- .../command/commands/gm4/ProItemCommand.java | 4 +- .../commands/gm4/QuestRateCommand.java | 4 +- .../commands/gm4/ServerMessageCommand.java | 4 +- .../commands/gm4/SetEqStatCommand.java | 4 +- .../commands/gm4/TravelRateCommand.java | 4 +- .../command/commands/gm4/ZakumCommand.java | 4 +- .../command/commands/gm5/DebugCommand.java | 6 +- .../command/commands/gm5/IpListCommand.java | 6 +- .../commands/gm6/ClearQuestCacheCommand.java | 4 +- .../commands/gm6/ClearQuestCommand.java | 4 +- .../command/commands/gm6/DCAllCommand.java | 6 +- .../command/commands/gm6/GetAccCommand.java | 6 +- .../commands/gm6/MapPlayersCommand.java | 6 +- .../command/commands/gm6/SaveAllCommand.java | 6 +- .../commands/gm6/ServerAddChannelCommand.java | 4 +- .../commands/gm6/ServerAddWorldCommand.java | 4 +- .../gm6/ServerRemoveChannelCommand.java | 4 +- .../gm6/ServerRemoveWorldCommand.java | 4 +- .../commands/gm6/SetGmLevelCommand.java | 6 +- .../command/commands/gm6/ShutdownCommand.java | 6 +- .../commands/gm6/SpawnAllPNpcsCommand.java | 4 +- .../commands/gm6/SupplyRateCouponCommand.java | 4 +- .../commands/gm6/WarpWorldCommand.java | 4 +- .../java/client/creator/CharacterFactory.java | 6 +- src/main/java/client/inventory/Inventory.java | 22 +- .../java/client/inventory/InventoryProof.java | 4 +- src/main/java/client/inventory/Pet.java | 10 +- .../manipulator/InventoryManipulator.java | 22 +- .../client/newyear/NewYearCardRecord.java | 14 +- .../processor/action/BuybackProcessor.java | 4 +- .../processor/action/MakerProcessor.java | 4 +- .../processor/action/PetAutopotProcessor.java | 6 +- .../processor/action/SpawnPetProcessor.java | 4 +- .../client/processor/npc/DueyProcessor.java | 8 +- .../processor/npc/FredrickProcessor.java | 12 +- .../processor/npc/StorageProcessor.java | 4 +- .../processor/stat/AssignAPProcessor.java | 11 +- .../processor/stat/AssignSPProcessor.java | 6 +- .../constants/string/LanguageConstants.java | 4 +- .../java/net/packet/logging/MapleLogger.java | 14 +- src/main/java/net/server/PlayerStorage.java | 29 +- src/main/java/net/server/Server.java | 62 +- src/main/java/net/server/channel/Channel.java | 26 +- .../handlers/AbstractDealDamageHandler.java | 9 +- .../channel/handlers/AcceptFamilyHandler.java | 6 +- .../channel/handlers/AdminCommandHandler.java | 10 +- .../handlers/AllianceOperationHandler.java | 14 +- .../channel/handlers/AranComboHandler.java | 4 +- .../channel/handlers/AutoAggroHandler.java | 4 +- .../channel/handlers/BBSOperationHandler.java | 12 +- .../handlers/BuddylistModifyHandler.java | 9 +- .../channel/handlers/CancelChairHandler.java | 4 +- .../handlers/CashOperationHandler.java | 26 +- .../channel/handlers/ChangeMapHandler.java | 4 +- .../handlers/CharInfoRequestHandler.java | 6 +- .../handlers/CloseRangeDamageHandler.java | 3 +- .../channel/handlers/CouponCodeHandler.java | 6 +- .../channel/handlers/DamageSummonHandler.java | 4 +- .../handlers/DenyAllianceRequestHandler.java | 4 +- .../handlers/DenyGuildRequestHandler.java | 4 +- .../handlers/DenyPartyRequestHandler.java | 6 +- .../server/channel/handlers/DoorHandler.java | 4 +- .../handlers/EnterCashShopHandler.java | 4 +- .../channel/handlers/EnterMTSHandler.java | 4 +- .../handlers/FaceExpressionHandler.java | 4 +- .../channel/handlers/FamilyAddHandler.java | 6 +- .../handlers/FamilySummonResponseHandler.java | 4 +- .../channel/handlers/FamilyUseHandler.java | 4 +- .../handlers/FieldDamageMobHandler.java | 4 +- .../channel/handlers/FredrickHandler.java | 4 +- .../channel/handlers/GeneralChatHandler.java | 4 +- .../channel/handlers/GiveFameHandler.java | 8 +- .../handlers/GrenadeEffectHandler.java | 4 +- .../handlers/GuildOperationHandler.java | 12 +- .../channel/handlers/HealOvertimeHandler.java | 4 +- .../handlers/HiredMerchantRequest.java | 8 +- .../handlers/InventoryMergeHandler.java | 4 +- .../handlers/InventorySortHandler.java | 4 +- .../channel/handlers/ItemPickupHandler.java | 4 +- .../server/channel/handlers/MTSHandler.java | 6 +- .../channel/handlers/MagicDamageHandler.java | 3 +- .../channel/handlers/MesoDropHandler.java | 4 +- .../channel/handlers/MessengerHandler.java | 6 +- .../handlers/MobBanishPlayerHandler.java | 4 +- .../channel/handlers/MobDamageMobHandler.java | 4 +- .../handlers/MonsterCarnivalHandler.java | 6 +- .../channel/handlers/MoveDragonHandler.java | 4 +- .../channel/handlers/MoveLifeHandler.java | 8 +- .../channel/handlers/MovePetHandler.java | 4 +- .../channel/handlers/MoveSummonHandler.java | 4 +- .../channel/handlers/MultiChatHandler.java | 4 +- .../channel/handlers/NewYearCardHandler.java | 8 +- .../channel/handlers/OpenFamilyHandler.java | 4 +- .../handlers/OpenFamilyPedigreeHandler.java | 4 +- .../handlers/PartyOperationHandler.java | 8 +- .../handlers/PartySearchStartHandler.java | 4 +- .../channel/handlers/PetAutoPotHandler.java | 4 +- .../channel/handlers/PetCommandHandler.java | 4 +- .../handlers/PetExcludeItemsHandler.java | 4 +- .../channel/handlers/PetFoodHandler.java | 4 +- .../channel/handlers/PetLootHandler.java | 4 +- .../handlers/PlayerInteractionHandler.java | 18 +- .../handlers/PlayerLoggedinHandler.java | 9 +- .../handlers/PlayerMapTransitionHandler.java | 4 +- .../channel/handlers/QuestActionHandler.java | 6 +- .../channel/handlers/RPSActionHandler.java | 4 +- .../channel/handlers/RaiseIncExpHandler.java | 4 +- .../channel/handlers/RaiseUIStateHandler.java | 6 +- .../channel/handlers/RangedAttackHandler.java | 3 +- .../channel/handlers/RemoteStoreHandler.java | 4 +- .../channel/handlers/ReportHandler.java | 6 +- .../channel/handlers/RingActionHandler.java | 38 +- .../channel/handlers/ScrollHandler.java | 4 +- .../channel/handlers/SkillBookHandler.java | 4 +- .../channel/handlers/SkillMacroHandler.java | 4 +- .../channel/handlers/SnowballHandler.java | 4 +- .../channel/handlers/SpecialMoveHandler.java | 4 +- .../channel/handlers/SpouseChatHandler.java | 4 +- .../channel/handlers/SummonDamageHandler.java | 6 +- .../channel/handlers/TakeDamageHandler.java | 7 +- .../handlers/TouchMonsterDamageHandler.java | 4 +- .../channel/handlers/TransferNameHandler.java | 4 +- .../handlers/TransferNameResultHandler.java | 4 +- .../handlers/TransferWorldHandler.java | 4 +- .../channel/handlers/TrockAddMapHandler.java | 4 +- .../channel/handlers/UseCashItemHandler.java | 9 +- .../channel/handlers/UseCatchItemHandler.java | 4 +- .../channel/handlers/UseItemHandler.java | 6 +- .../channel/handlers/UseMapleLifeHandler.java | 6 +- .../channel/handlers/UseMountFoodHandler.java | 4 +- .../channel/handlers/UseSolomonHandler.java | 4 +- .../channel/handlers/WeddingHandler.java | 6 +- .../channel/handlers/WhisperHandler.java | 8 +- .../login/MapleLoginBypassCoordinator.java | 4 +- .../AbstractMatchCheckerListener.java | 10 +- .../MapleMatchCheckerCoordinator.java | 22 +- .../listener/MatchCheckerCPQChallenge.java | 37 +- .../listener/MatchCheckerGuildCreation.java | 32 +- .../MaplePartySearchCoordinator.java | 64 +- .../partysearch/PartySearchCharacter.java | 14 +- .../partysearch/PartySearchEchelon.java | 25 +- .../partysearch/PartySearchStorage.java | 26 +- .../session/SessionCoordinator.java | 4 +- .../world/MapleInviteCoordinator.java | 20 +- .../world/MapleMonsterAggroCoordinator.java | 8 +- .../java/net/server/guild/GuildPackets.java | 10 +- .../java/net/server/guild/MapleAlliance.java | 24 +- .../java/net/server/guild/MapleGuild.java | 22 +- .../net/server/guild/MapleGuildCharacter.java | 12 +- .../handlers/login/CheckCharNameHandler.java | 4 +- .../handlers/login/ViewAllCharHandler.java | 12 +- .../task/channel/FaceExpressionService.java | 6 +- .../server/task/CharacterAutosaverTask.java | 6 +- .../java/net/server/task/TimeoutTask.java | 6 +- .../server/world/MapleMessengerCharacter.java | 4 +- .../java/net/server/world/MapleParty.java | 14 +- .../net/server/world/MaplePartyCharacter.java | 8 +- src/main/java/net/server/world/World.java | 132 +- .../scripting/AbstractPlayerInteraction.java | 37 +- .../scripting/event/EventInstanceManager.java | 144 +- .../java/scripting/event/EventManager.java | 24 +- .../java/scripting/map/MapScriptManager.java | 4 +- .../java/scripting/map/MapScriptMethods.java | 2 +- .../scripting/npc/NPCConversationManager.java | 55 +- .../java/scripting/npc/NPCScriptManager.java | 14 +- .../reactor/ReactorActionManager.java | 10 +- .../server/MapleItemInformationProvider.java | 11 +- src/main/java/server/MapleMarriage.java | 6 +- .../MapleSkillbookInformationProvider.java | 4 +- src/main/java/server/MapleStatEffect.java | 61 +- src/main/java/server/MapleTrade.java | 26 +- src/main/java/server/events/RescueGaga.java | 4 +- .../java/server/events/gm/MapleCoconut.java | 16 +- .../java/server/events/gm/MapleFitness.java | 6 +- src/main/java/server/events/gm/MapleOla.java | 6 +- .../java/server/events/gm/MapleOxQuiz.java | 10 +- .../java/server/events/gm/MapleSnowball.java | 14 +- .../server/expeditions/MapleExpedition.java | 54 +- src/main/java/server/life/MapleMonster.java | 159 +- src/main/java/server/life/MaplePlayerNPC.java | 16 +- src/main/java/server/life/MobSkill.java | 12 +- .../java/server/life/MonsterListener.java | 4 +- src/main/java/server/life/SpawnPoint.java | 9 +- .../java/server/loot/MapleLootInventory.java | 4 +- .../java/server/loot/MapleLootManager.java | 15 +- src/main/java/server/maps/MapleDoor.java | 20 +- .../java/server/maps/MapleDoorObject.java | 8 +- src/main/java/server/maps/MapleDragon.java | 8 +- .../java/server/maps/MapleGenericPortal.java | 4 +- .../java/server/maps/MapleHiredMerchant.java | 50 +- src/main/java/server/maps/MapleKite.java | 8 +- src/main/java/server/maps/MapleMap.java | 244 +- src/main/java/server/maps/MapleMapItem.java | 14 +- .../java/server/maps/MapleMiniDungeon.java | 12 +- src/main/java/server/maps/MapleMiniGame.java | 30 +- src/main/java/server/maps/MapleMist.java | 8 +- .../java/server/maps/MaplePlayerShop.java | 46 +- src/main/java/server/maps/MapleSummon.java | 8 +- src/main/java/server/maps/MapleTVEffect.java | 6 +- .../server/partyquest/AriantColiseum.java | 38 +- .../server/partyquest/MonsterCarnival.java | 42 +- .../partyquest/MonsterCarnivalParty.java | 28 +- .../java/server/partyquest/PartyQuest.java | 19 +- src/main/java/server/partyquest/Pyramid.java | 16 +- src/main/java/server/quest/MapleQuest.java | 28 +- .../java/server/quest/actions/BuffAction.java | 6 +- .../java/server/quest/actions/ExpAction.java | 6 +- .../java/server/quest/actions/FameAction.java | 4 +- .../java/server/quest/actions/InfoAction.java | 5 +- .../java/server/quest/actions/ItemAction.java | 14 +- .../quest/actions/MapleQuestAction.java | 6 +- .../java/server/quest/actions/MesoAction.java | 6 +- .../server/quest/actions/NextQuestAction.java | 4 +- .../server/quest/actions/PetSkillAction.java | 6 +- .../server/quest/actions/PetSpeedAction.java | 4 +- .../quest/actions/PetTamenessAction.java | 4 +- .../server/quest/actions/QuestAction.java | 9 +- .../server/quest/actions/SkillAction.java | 13 +- .../requirements/BuffExceptRequirement.java | 4 +- .../quest/requirements/BuffRequirement.java | 4 +- .../CompletedQuestRequirement.java | 4 +- .../requirements/EndDateRequirement.java | 7 +- .../requirements/FieldEnterRequirement.java | 4 +- .../quest/requirements/InfoExRequirement.java | 9 +- .../requirements/InfoNumberRequirement.java | 4 +- .../requirements/IntervalRequirement.java | 6 +- .../quest/requirements/ItemRequirement.java | 4 +- .../quest/requirements/JobRequirement.java | 12 +- .../requirements/MapleQuestRequirement.java | 6 +- .../requirements/MaxLevelRequirement.java | 4 +- .../quest/requirements/MesoRequirement.java | 4 +- .../requirements/MinLevelRequirement.java | 4 +- .../requirements/MinTamenessRequirement.java | 4 +- .../quest/requirements/MobRequirement.java | 12 +- .../MonsterBookCountRequirement.java | 4 +- .../quest/requirements/NpcRequirement.java | 4 +- .../quest/requirements/PetRequirement.java | 4 +- .../quest/requirements/QuestRequirement.java | 12 +- .../quest/requirements/ScriptRequirement.java | 4 +- src/main/java/tools/LogHelper.java | 6 +- src/main/java/tools/PacketCreator.java | 197 +- src/main/java/tools/packets/Fishing.java | 6 +- .../java/tools/packets/WeddingPackets.java | 16 +- 379 files changed, 3418 insertions(+), 3373 deletions(-) rename src/main/java/client/{MapleCharacter.java => Character.java} (91%) diff --git a/scripts/npc/changeName.js b/scripts/npc/changeName.js index a684dc9b1e..add15d283d 100644 --- a/scripts/npc/changeName.js +++ b/scripts/npc/changeName.js @@ -47,8 +47,8 @@ function action(mode, type, selection) { } else if(status == 2) { var text = cm.getText(); - const MapleCharacter = Java.type('client.MapleCharacter'); - var canCreate = MapleCharacter.canCreateChar(text); + const Character = Java.type('client.Character'); + var canCreate = Character.canCreateChar(text); if(canCreate) { cm.getPlayer().setName(text); cm.sendOk("Your name has been changed to #b" + text + "#k. You will have to login again for this to take effect.", 1); diff --git a/src/main/java/client/BuddyList.java b/src/main/java/client/BuddyList.java index f7579c5b9a..10e45d5627 100644 --- a/src/main/java/client/BuddyList.java +++ b/src/main/java/client/BuddyList.java @@ -129,7 +129,7 @@ public class BuddyList { public void broadcast(Packet packet, PlayerStorage pstorage) { for(int bid : getBuddyIds()) { - MapleCharacter chr = pstorage.getCharacterById(bid); + Character chr = pstorage.getCharacterById(bid); if(chr != null && chr.isLoggedinWorld()) { chr.sendPacket(packet); diff --git a/src/main/java/client/MapleCharacter.java b/src/main/java/client/Character.java similarity index 91% rename from src/main/java/client/MapleCharacter.java rename to src/main/java/client/Character.java index 5d436890ab..fbfe8b610d 100644 --- a/src/main/java/client/MapleCharacter.java +++ b/src/main/java/client/Character.java @@ -93,13 +93,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Lock; import java.util.regex.Pattern; -public class MapleCharacter extends AbstractMapleCharacterObject { +public class Character extends AbstractMapleCharacterObject { private static final MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); private static final String LEVEL_200 = "[Congrats] %s has reached Level %d! Congratulate %s on such an amazing achievement!"; private static final String[] BLOCKED_NAMES = {"admin", "owner", "moderator", "intern", "donor", "administrator", "FREDRICK", "help", "helper", "alert", "notice", "maplestory", "fuck", "wizet", "fucking", "negro", "fuk", "fuc", "penis", "pussy", "asshole", "gay", - "nigger", "homo", "suck", "cum", "shit", "shitty", "condom", "security", "official", "rape", "nigga", "sex", "tit", "boner", "orgy", "clit", "asshole", "fatass", "bitch", "support", "gamemaster", "cock", "gaay", "gm", - "operate", "master", "sysop", "party", "GameMaster", "community", "message", "event", "test", "meso", "Scania", "yata", "AsiaSoft", "henesys"}; - + "nigger", "homo", "suck", "cum", "shit", "shitty", "condom", "security", "official", "rape", "nigga", "sex", "tit", "boner", "orgy", "clit", "asshole", "fatass", "bitch", "support", "gamemaster", "cock", "gaay", "gm", + "operate", "master", "sysop", "party", "GameMaster", "community", "message", "event", "test", "meso", "Scania", "yata", "AsiaSoft", "henesys"}; + private int world; private int accountid, id, level; private int rank, rankMove, jobRank, jobRankMove; @@ -142,12 +142,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private String commandtext; private String dataString; private String search = null; - private AtomicBoolean mapTransitioning = new AtomicBoolean(true); // player client is currently trying to change maps or log in the game map - private AtomicBoolean awayFromWorld = new AtomicBoolean(true); // player is online, but on cash shop or mts - private AtomicInteger exp = new AtomicInteger(); - private AtomicInteger gachaexp = new AtomicInteger(); - private AtomicInteger meso = new AtomicInteger(); - private AtomicInteger chair = new AtomicInteger(-1); + private final AtomicBoolean mapTransitioning = new AtomicBoolean(true); // player client is currently trying to change maps or log in the game map + private final AtomicBoolean awayFromWorld = new AtomicBoolean(true); // player is online, but on cash shop or mts + private final AtomicInteger exp = new AtomicInteger(); + private final AtomicInteger gachaexp = new AtomicInteger(); + private final AtomicInteger meso = new AtomicInteger(); + private final AtomicInteger chair = new AtomicInteger(-1); private int merchantmeso; private BuddyList buddylist; private EventInstanceManager eventInstance = null; @@ -162,7 +162,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private MapleRockPaperScissor rps; private MapleMount maplemount; private MapleParty party; - private Pet[] pets = new Pet[3]; + private final Pet[] pets = new Pet[3]; private MaplePlayerShop playerShop = null; private MapleShop shop = null; private MapleSkinColor skinColor = MapleSkinColor.NORMAL; @@ -170,28 +170,28 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private MapleTrade trade = null; private MonsterBook monsterbook; private CashShop cashshop; - private Set newyears = new LinkedHashSet<>(); - private SavedLocation savedLocations[]; - private SkillMacro[] skillMacros = new SkillMacro[5]; + private final Set newyears = new LinkedHashSet<>(); + private final SavedLocation[] savedLocations; + private final SkillMacro[] skillMacros = new SkillMacro[5]; private List lastmonthfameids; - private List> lastVisitedMaps = new LinkedList<>(); + private final List> lastVisitedMaps = new LinkedList<>(); private WeakReference ownedMap = new WeakReference<>(null); private final Map quests; - private Set controlled = new LinkedHashSet<>(); - private Map entered = new LinkedHashMap<>(); - private Set visibleMapObjects = Collections.newSetFromMap(new ConcurrentHashMap<>()); - private Map skills = new LinkedHashMap<>(); - private Map activeCoupons = new LinkedHashMap<>(); - private Map activeCouponRates = new LinkedHashMap<>(); - private EnumMap effects = new EnumMap<>(BuffStat.class); - private Map buffEffectsCount = new LinkedHashMap<>(); - private Map diseaseExpires = new LinkedHashMap<>(); - private Map> buffEffects = new LinkedHashMap<>(); // non-overriding buffs thanks to Ronan - private Map buffExpires = new LinkedHashMap<>(); - private Map keymap = new LinkedHashMap<>(); - private Map summons = new LinkedHashMap<>(); - private Map coolDowns = new LinkedHashMap<>(); - private EnumMap> diseases = new EnumMap<>(MapleDisease.class); + private final Set controlled = new LinkedHashSet<>(); + private final Map entered = new LinkedHashMap<>(); + private final Set visibleMapObjects = Collections.newSetFromMap(new ConcurrentHashMap<>()); + private final Map skills = new LinkedHashMap<>(); + private final Map activeCoupons = new LinkedHashMap<>(); + private final Map activeCouponRates = new LinkedHashMap<>(); + private final EnumMap effects = new EnumMap<>(BuffStat.class); + private final Map buffEffectsCount = new LinkedHashMap<>(); + private final Map diseaseExpires = new LinkedHashMap<>(); + private final Map> buffEffects = new LinkedHashMap<>(); // non-overriding buffs thanks to Ronan + private final Map buffExpires = new LinkedHashMap<>(); + private final Map keymap = new LinkedHashMap<>(); + private final Map summons = new LinkedHashMap<>(); + private final Map coolDowns = new LinkedHashMap<>(); + private final EnumMap> diseases = new EnumMap<>(MapleDisease.class); private byte[] m_aQuickslotLoaded; private QuickslotBinding m_pQuickslotKeyMapped; private MapleDoor pdoor = null; @@ -209,36 +209,36 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private ScheduledFuture chairRecoveryTask = null; private ScheduledFuture pendantOfSpirit = null; //1122017 private ScheduledFuture cpqSchedule = null; - private Lock chrLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CHR, true); - private Lock evtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_EVT, true); - private Lock petLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PET, true); - private Lock prtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PRT); - private Lock cpnLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CPN); - private Map> excluded = new LinkedHashMap<>(); - private Set excludedItems = new LinkedHashSet<>(); - private Set disabledPartySearchInvites = new LinkedHashSet<>(); - private static String[] ariantroomleader = new String[3]; - private static int[] ariantroomslot = new int[3]; + private final Lock chrLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CHR, true); + private final Lock evtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_EVT, true); + private final Lock petLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PET, true); + private final Lock prtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PRT); + private final Lock cpnLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CPN); + private final Map> excluded = new LinkedHashMap<>(); + private final Set excludedItems = new LinkedHashSet<>(); + private final Set disabledPartySearchInvites = new LinkedHashSet<>(); + private static final String[] ariantroomleader = new String[3]; + private static final int[] ariantroomslot = new int[3]; private long portaldelay = 0, lastcombo = 0; private short combocounter = 0; - private List blockedPortals = new ArrayList<>(); - private Map area_info = new LinkedHashMap<>(); + private final List blockedPortals = new ArrayList<>(); + private final Map area_info = new LinkedHashMap<>(); private AutobanManager autoban; private boolean isbanned = false; private boolean blockCashShop = false; private boolean allowExpGain = true; private byte pendantExp = 0, lastmobcount = 0, doorSlot = -1; - private List trockmaps = new ArrayList<>(); - private List viptrockmaps = new ArrayList<>(); + private final List trockmaps = new ArrayList<>(); + private final List viptrockmaps = new ArrayList<>(); private Map events = new LinkedHashMap<>(); private PartyQuest partyQuest = null; - private List> npcUpdateQuests = new LinkedList<>(); + private final List> npcUpdateQuests = new LinkedList<>(); private MapleDragon dragon = null; private MapleRing marriageRing; private int marriageItemid = -1; private int partnerId = -1; - private List crushRings = new ArrayList<>(); - private List friendshipRings = new ArrayList<>(); + private final List crushRings = new ArrayList<>(); + private final List friendshipRings = new ArrayList<>(); private boolean loggedIn = false; private boolean useCS; //chaos scroll upon crafting item. private long npcCd; @@ -258,14 +258,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private boolean pendingNameChange; //only used to change name on logout, not to be relied upon elsewhere private long loginTime; private boolean chasing = false; - - private MapleCharacter() { + + private Character() { super.setListener(new AbstractCharacterListener() { @Override public void onHpChanged(int oldHp) { hpChangeAction(oldHp); } - + @Override public void onHpmpPoolUpdate() { List> hpmpupdate = recalcLocalStats(); @@ -283,12 +283,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statUpdates.put(MapleStat.MP, mp); } } - + @Override public void onStatUpdate() { recalcLocalStats(); } - + @Override public void onAnnounceStatPoolUpdate() { List> statup = new ArrayList<>(8); @@ -296,68 +296,68 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statup.add(new Pair<>(s.getKey(), s.getValue())); } - sendPacket(PacketCreator.updatePlayerStats(statup, true, MapleCharacter.this)); + sendPacket(PacketCreator.updatePlayerStats(statup, true, Character.this)); } }); - + useCS = false; - + setStance(0); inventory = new Inventory[InventoryType.values().length]; savedLocations = new SavedLocation[SavedLocationType.values().length]; - + for (InventoryType type : InventoryType.values()) { byte b = 24; if (type == InventoryType.CASH) { b = 96; } - inventory[type.ordinal()] = new Inventory(this, type, (byte) b); + inventory[type.ordinal()] = new Inventory(this, type, b); } inventory[InventoryType.CANHOLD.ordinal()] = new InventoryProof(this); - + for (int i = 0; i < SavedLocationType.values().length; i++) { savedLocations[i] = null; } quests = new LinkedHashMap<>(); setPosition(new Point(0, 0)); } - + private static MapleJob getJobStyleInternal(int jobid, byte opt) { int jobtype = jobid / 100; - - if(jobtype == MapleJob.WARRIOR.getId() / 100 || jobtype == MapleJob.DAWNWARRIOR1.getId() / 100 || jobtype == MapleJob.ARAN1.getId() / 100) { - return(MapleJob.WARRIOR); - } else if(jobtype == MapleJob.MAGICIAN.getId() / 100 || jobtype == MapleJob.BLAZEWIZARD1.getId() / 100 || jobtype == MapleJob.EVAN1.getId() / 100) { - return(MapleJob.MAGICIAN); - } else if(jobtype == MapleJob.BOWMAN.getId() / 100 || jobtype == MapleJob.WINDARCHER1.getId() / 100) { - if(jobid / 10 == MapleJob.CROSSBOWMAN.getId() / 10) { - return(MapleJob.CROSSBOWMAN); + + if (jobtype == MapleJob.WARRIOR.getId() / 100 || jobtype == MapleJob.DAWNWARRIOR1.getId() / 100 || jobtype == MapleJob.ARAN1.getId() / 100) { + return (MapleJob.WARRIOR); + } else if (jobtype == MapleJob.MAGICIAN.getId() / 100 || jobtype == MapleJob.BLAZEWIZARD1.getId() / 100 || jobtype == MapleJob.EVAN1.getId() / 100) { + return (MapleJob.MAGICIAN); + } else if (jobtype == MapleJob.BOWMAN.getId() / 100 || jobtype == MapleJob.WINDARCHER1.getId() / 100) { + if (jobid / 10 == MapleJob.CROSSBOWMAN.getId() / 10) { + return (MapleJob.CROSSBOWMAN); } else { - return(MapleJob.BOWMAN); + return (MapleJob.BOWMAN); } - } else if(jobtype == MapleJob.THIEF.getId() / 100 || jobtype == MapleJob.NIGHTWALKER1.getId() / 100) { - return(MapleJob.THIEF); - } else if(jobtype == MapleJob.PIRATE.getId() / 100 || jobtype == MapleJob.THUNDERBREAKER1.getId() / 100) { - if(opt == (byte) 0x80) { - return(MapleJob.BRAWLER); + } else if (jobtype == MapleJob.THIEF.getId() / 100 || jobtype == MapleJob.NIGHTWALKER1.getId() / 100) { + return (MapleJob.THIEF); + } else if (jobtype == MapleJob.PIRATE.getId() / 100 || jobtype == MapleJob.THUNDERBREAKER1.getId() / 100) { + if (opt == (byte) 0x80) { + return (MapleJob.BRAWLER); } else { - return(MapleJob.GUNSLINGER); + return (MapleJob.GUNSLINGER); } } - - return(MapleJob.BEGINNER); + + return (MapleJob.BEGINNER); } - + public MapleJob getJobStyle(byte opt) { return getJobStyleInternal(this.getJob().getId(), opt); } - + public MapleJob getJobStyle() { return getJobStyle((byte) ((this.getStr() > this.getDex()) ? 0x80 : 0x40)); } - public static MapleCharacter getDefault(MapleClient c) { - MapleCharacter ret = new MapleCharacter(); + public static Character getDefault(MapleClient c) { + Character ret = new Character(); ret.client = c; ret.setGMLevel(0); ret.hp = 50; @@ -378,13 +378,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.getInventory(InventoryType.USE).setSlotLimit(24); ret.getInventory(InventoryType.SETUP).setSlotLimit(24); ret.getInventory(InventoryType.ETC).setSlotLimit(24); - + // Select a keybinding method int[] selectedKey; int[] selectedType; int[] selectedAction; - - if(YamlConfig.config.server.USE_CUSTOM_KEYSET) { + + if (YamlConfig.config.server.USE_CUSTOM_KEYSET) { selectedKey = GameConstants.getCustomKey(true); selectedType = GameConstants.getCustomType(true); selectedAction = GameConstants.getCustomAction(true); @@ -393,12 +393,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { selectedType = GameConstants.getCustomType(false); selectedAction = GameConstants.getCustomAction(false); } - + for (int i = 0; i < selectedKey.length; i++) { ret.keymap.put(selectedKey[i], new KeyBinding(selectedType[i], selectedAction[i])); } - - + + //to fix the map 0 lol for (int i = 0; i < 5; i++) { ret.trockmaps.add(999999999); @@ -409,42 +409,42 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return ret; } - + public boolean isLoggedinWorld() { return this.isLoggedin() && !this.isAwayFromWorld(); } - + public boolean isAwayFromWorld() { return awayFromWorld.get(); } - + public void setEnteredChannelWorld() { awayFromWorld.set(false); client.getChannelServer().removePlayerAway(id); - + if (canRecvPartySearchInvite) { this.getWorldServer().getPartySearchCoordinator().attachPlayer(this); } } - + public void setAwayFromChannelWorld() { setAwayFromChannelWorld(false); } - + public void setDisconnectedFromChannelWorld() { setAwayFromChannelWorld(true); } - + private void setAwayFromChannelWorld(boolean disconnect) { awayFromWorld.set(true); - - if(!disconnect) { + + if (!disconnect) { client.getChannelServer().insertPlayerAway(id); } else { client.getChannelServer().removePlayerAway(id); } } - + public void updatePartySearchAvailability(boolean psearchAvailable) { if (psearchAvailable) { if (canRecvPartySearchInvite && getParty() == null) { @@ -456,59 +456,59 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public boolean toggleRecvPartySearchInvite() { canRecvPartySearchInvite = !canRecvPartySearchInvite; - + if (canRecvPartySearchInvite) { updatePartySearchAvailability(getParty() == null); } else { this.getWorldServer().getPartySearchCoordinator().detachPlayer(this); } - + return canRecvPartySearchInvite; } - + public boolean isRecvPartySearchInviteEnabled() { return canRecvPartySearchInvite; } - + public void resetPartySearchInvite(int fromLeaderid) { disabledPartySearchInvites.remove(fromLeaderid); } - + public void disablePartySearchInvite(int fromLeaderid) { disabledPartySearchInvites.add(fromLeaderid); } - + public boolean hasDisabledPartySearchInvite(int fromLeaderid) { return disabledPartySearchInvites.contains(fromLeaderid); } - + public void setSessionTransitionState() { client.setCharacterOnSessionTransitionState(this.getId()); } - + public boolean getCS() { return useCS; } - + public void setCS(boolean cs) { useCS = cs; } - + public long getNpcCooldown() { return npcCd; } - + public void setNpcCooldown(long d) { npcCd = d; } - + public void setOwlSearch(int id) { owlSearch = id; } - + public int getOwlSearch() { return owlSearch; } @@ -539,8 +539,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return ring; } } - - if(marriageRing != null) { + + if (marriageRing != null) { if (marriageRing.getRingId() == id) { return marriageRing; } @@ -548,43 +548,41 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return null; } - + public int getMarriageItemId() { return marriageItemid; } - + public void setMarriageItemId(int itemid) { marriageItemid = itemid; } - + public int getPartnerId() { return partnerId; } - + public void setPartnerId(int partnerid) { partnerId = partnerid; } - + public int getRelationshipId() { return getWorldServer().getRelationshipId(id); } - + public boolean isMarried() { return marriageRing != null && partnerId > 0; } - + public boolean hasJustMarried() { EventInstanceManager eim = getEventInstance(); - if(eim != null) { + if (eim != null) { String prop = eim.getProperty("groomId"); - - if(prop != null) { - if((Integer.parseInt(prop) == id || eim.getIntProperty("brideId") == id) && (mapid == 680000110 || mapid == 680000210)) { - return true; - } + + if (prop != null) { + return (Integer.parseInt(prop) == id || eim.getIntProperty("brideId") == id) && (mapid == 680000110 || mapid == 680000210); } } - + return false; } @@ -599,7 +597,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return pts; } - + public void addFame(int famechange) { this.fame += famechange; } @@ -607,15 +605,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void addFriendshipRing(MapleRing r) { friendshipRings.add(r); } - + public void addMarriageRing(MapleRing r) { marriageRing = r; } - + public void addMesosTraded(int gain) { this.mesosTraded += gain; } - + public void addPet(Pet pet) { petLock.lock(); try { @@ -629,10 +627,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { petLock.unlock(); } } - + public void addSummon(int id, MapleSummon summon) { summons.put(id, summon); - + if (summon.isPuppet()) { map.addPlayerPuppet(this); } @@ -668,7 +666,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (accountId) { query = "SELECT id FROM accounts WHERE name = ?"; } else { - query ="SELECT accountid FROM characters WHERE name = ?"; + query = "SELECT accountid FROM characters WHERE name = ?"; } boolean ret = false; @@ -692,7 +690,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return false; } - + public int calculateMaxBaseDamage(int watk, WeaponType weapon) { int mainstat, secondarystat; if (getJob().isA(MapleJob.THIEF) && weapon == WeaponType.DAGGER_OTHER) { @@ -732,24 +730,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return maxbasedamage; } - + public int calculateMaxBaseMagicDamage(int matk) { int maxbasedamage = matk; int totalint = getTotalInt(); - + if (totalint > 2000) { maxbasedamage -= 2000; maxbasedamage += (int) ((0.09033024267 * totalint) + 3823.8038); } else { maxbasedamage -= totalint; - + if (totalint > 1700) { maxbasedamage += (int) (0.1996049769 * Math.pow(totalint, 1.300631341)); } else { maxbasedamage += (int) (0.1996049769 * Math.pow(totalint, 1.290631341)); } } - + return (maxbasedamage * 107) / 100; } @@ -782,15 +780,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setLastMobCount(byte count) { lastmobcount = count; } - + public boolean cannotEnterCashShop() { return blockCashShop; } - + public void toggleBlockCashShop() { blockCashShop = !blockCashShop; } - + public void toggleExpGain() { allowExpGain = !allowExpGain; } @@ -798,7 +796,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setClient(MapleClient c) { this.client = c; } - + public void newClient(MapleClient c) { this.loggedIn = true; c.setAccountName(this.client.getAccountName());//No null's for accountName @@ -829,11 +827,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { List dsstat = Collections.singletonList(BuffStat.DARKSIGHT); getMap().broadcastGMMessage(this, PacketCreator.cancelForeignBuff(id, dsstat), false); getMap().broadcastSpawnPlayerMapObjectMessage(this, this, false); - - for(MapleSummon ms: this.getSummonsValues()) { + + for (MapleSummon ms : this.getSummonsValues()) { getMap().broadcastNONGMMessage(this, PacketCreator.spawnSummon(ms, false), false); } - + for (MapleMapObject mo : this.getMap().getMonsters()) { MapleMonster m = (MapleMonster) mo; m.aggroUpdateController(); @@ -851,7 +849,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.enableActions()); } } - + public void Hide(boolean hide) { Hide(hide, false); } @@ -894,24 +892,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { MapleDoor door = getPlayerDoor(); return door == null || (door.isActive() && door.getElapsedDeployTime() > 5000); } - + public void setHasSandboxItem() { hasSandboxItem = true; } - + public void removeSandboxItems() { // sandbox idea thanks to Morty if (!hasSandboxItem) { return; } - + MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); - for(InventoryType invType : InventoryType.values()) { + for (InventoryType invType : InventoryType.values()) { Inventory inv = this.getInventory(invType); - + inv.lockInventory(); try { - for(Item item : new ArrayList<>(inv.list())) { - if(InventoryManipulator.isSandboxItem(item)) { + for (Item item : new ArrayList<>(inv.list())) { + if (InventoryManipulator.isSandboxItem(item)) { InventoryManipulator.removeFromSlot(client, invType, item.getPosition(), item.getQuantity(), false); dropMessage(5, "[" + ii.getName(item.getItemId()) + "] has passed its trial conditions and will be removed from your inventory."); } @@ -920,11 +918,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { inv.unlockInventory(); } } - + hasSandboxItem = false; } - public FameStatus canGiveFame(MapleCharacter from) { + public FameStatus canGiveFame(Character from) { if (this.isGM()) { return FameStatus.OK; } else if (lastfametime >= System.currentTimeMillis() - 3600000 * 24) { @@ -1013,14 +1011,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (skilllevel > 0) { continue; } - + changeSkillLevel(skill, (byte) 0, 10, -1); } } } - + private void broadcastChangeJob() { - for (MapleCharacter chr : map.getAllPlayers()) { + for (Character chr : map.getAllPlayers()) { MapleClient chrC = chr.getClient(); if (chrC != null) { // propagate new job 3rd-person effects (FJ, Aran 1st strike, etc) @@ -1028,13 +1026,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { this.sendSpawnData(chrC); } } - + TimerManager.getInstance().schedule(new Runnable() { // need to delay to ensure clientside has finished reloading character data @Override public void run() { - MapleCharacter thisChr = MapleCharacter.this; + Character thisChr = Character.this; MapleMap map = thisChr.getMap(); - + if (map != null) { map.broadcastMessage(thisChr, PacketCreator.showForeignEffect(thisChr.getId(), 8), false); } @@ -1046,7 +1044,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (newJob == null) { return;//the fuck you doing idiot! } - + if (canRecvPartySearchInvite && getParty() == null) { this.updatePartySearchAvailability(false); this.job = newJob; @@ -1054,7 +1052,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else { this.job = newJob; } - + int spGain = 1; if (GameConstants.hasSPTable(newJob)) { spGain += 2; @@ -1062,16 +1060,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (newJob.getId() % 10 == 2) { spGain += 2; } - + if (YamlConfig.config.server.USE_ENFORCE_JOB_SP_RANGE) { spGain = getChangedJobSp(newJob); } } - + if (spGain > 0) { gainSp(spGain, GameConstants.getSkillBook(newJob.getId()), true); } - + // thanks xinyifly for finding out missing AP awards (AP Reset can be used as a compass) if (newJob.getId() % 100 >= 1) { if (this.isCygnus()) { @@ -1086,13 +1084,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { gainAp(4, true); } } - + if (!isGM()) { for (byte i = 1; i < 5; i++) { gainSlots(i, 4, true); } } - + int addhp = 0, addmp = 0; int job_ = job.getId() % 1000; // lame temp "fix" if (job_ == 100) { // 1st warrior @@ -1124,7 +1122,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { addmp += 275; } */ - + effLock.lock(); statWlock.lock(); try { @@ -1144,54 +1142,54 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statWlock.unlock(); effLock.unlock(); } - + setMPC(new MaplePartyCharacter(this)); silentPartyUpdate(); - + if (dragon != null) { getMap().broadcastMessage(PacketCreator.removeDragon(dragon.getObjectId())); dragon = null; } - + if (this.guildid > 0) { getGuild().broadcast(PacketCreator.jobMessage(0, job.getId(), name), this.getId()); } MapleFamily family = getFamily(); - if(family != null) { + if (family != null) { family.broadcast(PacketCreator.jobMessage(1, job.getId(), name), this.getId()); } setMasteries(this.job.getId()); guildUpdate(); - + broadcastChangeJob(); - + if (GameConstants.hasSPTable(newJob) && newJob.getId() != 2001) { if (getBuffedValue(BuffStat.MONSTER_RIDING) != null) { cancelBuffStats(BuffStat.MONSTER_RIDING); } createDragon(); } - + if (YamlConfig.config.server.USE_ANNOUNCE_CHANGEJOB) { if (!this.isGM()) { broadcastAcquaintances(6, "[" + GameConstants.ordinal(GameConstants.getJobBranch(newJob)) + " Job] " + name + " has just become a " + GameConstants.getJobName(this.job.getId()) + "."); // thanks Vcoc for noticing job name appearing in uppercase here } } } - + public void broadcastAcquaintances(int type, String message) { broadcastAcquaintances(PacketCreator.serverNotice(type, message)); } - + public void broadcastAcquaintances(Packet packet) { buddylist.broadcast(packet, getWorldServer().getPlayerStorage()); MapleFamily family = getFamily(); - if(family != null) { + if (family != null) { family.broadcast(packet, id); } - + MapleGuild guild = getGuild(); - if(guild != null) { + if (guild != null) { guild.broadcast(packet, id); } @@ -1210,16 +1208,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { keymap.remove(Integer.valueOf(key)); } } - + public void changeQuickslotKeybinding(byte[] aQuickslotKeyMapped) { this.m_pQuickslotKeyMapped = new QuickslotBinding(aQuickslotKeyMapped); } - + public void broadcastStance(int newStance) { setStance(newStance); broadcastStance(); } - + public void broadcastStance() { map.broadcastMessage(this, PacketCreator.movePlayer(id, this.getIdleMovement(), AbstractAnimatedMapleMapObject.IDLE_MOVEMENT_PACKET_LENGTH), false); } @@ -1236,87 +1234,87 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return warpMap; } - + // for use ONLY inside OnUserEnter map scripts that requires a player to change map while still moving between maps. public void warpAhead(int map) { newWarpMap = map; } - + private void eventChangedMap(int map) { EventInstanceManager eim = getEventInstance(); if (eim != null) { eim.changedMap(this, map); } } - + private void eventAfterChangedMap(int map) { EventInstanceManager eim = getEventInstance(); if (eim != null) { eim.afterChangedMap(this, map); } } - + public boolean canRecoverLastBanish() { return System.currentTimeMillis() - this.banishTime < 5 * 60 * 1000; } - + public Pair getLastBanishData() { return new Pair<>(this.banishMap, this.banishSp); } - + public void clearBanishPlayerData() { this.banishMap = -1; this.banishSp = -1; this.banishTime = 0; } - + public void setBanishPlayerData(int banishMap, int banishSp, long banishTime) { this.banishMap = banishMap; this.banishSp = banishSp; this.banishTime = banishTime; } - + public void changeMapBanish(int mapid, String portal, String msg) { - if(YamlConfig.config.server.USE_SPIKES_AVOID_BANISH) { - for(Item it: this.getInventory(InventoryType.EQUIPPED).list()) { - if((it.getFlag() & ItemConstants.SPIKES) == ItemConstants.SPIKES) { + if (YamlConfig.config.server.USE_SPIKES_AVOID_BANISH) { + for (Item it : this.getInventory(InventoryType.EQUIPPED).list()) { + if ((it.getFlag() & ItemConstants.SPIKES) == ItemConstants.SPIKES) { return; } } } - + int banMap = this.getMapId(); int banSp = this.getMap().findClosestPlayerSpawnpoint(this.getPosition()).getId(); long banTime = System.currentTimeMillis(); - + if (msg != null) { dropMessage(5, msg); } - + MapleMap map_ = getWarpMap(mapid); MaplePortal portal_ = map_.getPortal(portal); changeMap(map_, portal_ != null ? portal_ : map_.getRandomPlayerSpawnpoint()); - + setBanishPlayerData(banMap, banSp, banTime); } public void changeMap(int map) { MapleMap warpMap; EventInstanceManager eim = getEventInstance(); - + if (eim != null) { warpMap = eim.getMapInstance(map); } else { warpMap = client.getChannelServer().getMapFactory().getMap(map); } - + changeMap(warpMap, warpMap.getRandomPlayerSpawnpoint()); } public void changeMap(int map, int portal) { MapleMap warpMap; EventInstanceManager eim = getEventInstance(); - + if (eim != null) { warpMap = eim.getMapInstance(map); } else { @@ -1329,7 +1327,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void changeMap(int map, String portal) { MapleMap warpMap; EventInstanceManager eim = getEventInstance(); - + if (eim != null) { warpMap = eim.getMapInstance(map); } else { @@ -1342,7 +1340,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void changeMap(int map, MaplePortal portal) { MapleMap warpMap; EventInstanceManager eim = getEventInstance(); - + if (eim != null) { warpMap = eim.getMapInstance(map); } else { @@ -1359,10 +1357,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void changeMap(MapleMap to, int portal) { changeMap(to, to.getPortal(portal)); } - + public void changeMap(final MapleMap target, MaplePortal pto) { canWarpCounter++; - + eventChangedMap(target.getId()); // player can be dropped from an event here, hence the new warping target. MapleMap to = getWarpMap(target.getId()); if (pto == null) { @@ -1370,218 +1368,214 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } changeMapInternal(to, pto.getPosition(), PacketCreator.getWarpToMap(to, pto.getId(), this)); canWarpMap = false; - + canWarpCounter--; - if(canWarpCounter == 0) { + if (canWarpCounter == 0) { canWarpMap = true; } - + eventAfterChangedMap(this.getMapId()); } public void changeMap(final MapleMap target, final Point pos) { canWarpCounter++; - + eventChangedMap(target.getId()); MapleMap to = getWarpMap(target.getId()); changeMapInternal(to, pos, PacketCreator.getWarpToMap(to, 0x80, pos, this)); canWarpMap = false; - + canWarpCounter--; - if(canWarpCounter == 0) { + if (canWarpCounter == 0) { canWarpMap = true; } - + eventAfterChangedMap(this.getMapId()); } - + public void forceChangeMap(final MapleMap target, MaplePortal pto) { // will actually enter the map given as parameter, regardless of being an eventmap or whatnot - + canWarpCounter++; eventChangedMap(999999999); - + EventInstanceManager mapEim = target.getEventInstance(); - if(mapEim != null) { + if (mapEim != null) { EventInstanceManager playerEim = this.getEventInstance(); - if(playerEim != null) { + if (playerEim != null) { playerEim.exitPlayer(this); - if(playerEim.getPlayerCount() == 0) { + if (playerEim.getPlayerCount() == 0) { playerEim.dispose(); } } - + // thanks Thora for finding an issue with players not being actually warped into the target event map (rather sent to the event starting map) mapEim.registerPlayer(this, false); } - + MapleMap to = target; // warps directly to the target intead of the target's map id, this allows GMs to patrol players inside instances. if (pto == null) { pto = to.getPortal(0); } changeMapInternal(to, pto.getPosition(), PacketCreator.getWarpToMap(to, pto.getId(), this)); canWarpMap = false; - + canWarpCounter--; - if(canWarpCounter == 0) { + if (canWarpCounter == 0) { canWarpMap = true; } - + eventAfterChangedMap(this.getMapId()); } - + private boolean buffMapProtection() { int thisMapid = mapid; int returnMapid = client.getChannelServer().getMapFactory().getMap(thisMapid).getReturnMapId(); - + effLock.lock(); chrLock.lock(); try { - for(Entry mbs : effects.entrySet()) { - if(mbs.getKey() == BuffStat.MAP_PROTECTION) { - byte value = (byte)mbs.getValue().value; - - if(value == 1 && ((returnMapid == 211000000 && thisMapid != 200082300) || returnMapid == 193000000)) { + for (Entry mbs : effects.entrySet()) { + if (mbs.getKey() == BuffStat.MAP_PROTECTION) { + byte value = (byte) mbs.getValue().value; + + if (value == 1 && ((returnMapid == 211000000 && thisMapid != 200082300) || returnMapid == 193000000)) { return true; //protection from cold - } else if(value == 2 && (returnMapid == 230000000 || thisMapid == 200082300)) { - return true; //breathing underwater - } else { - return false; - } + } else return value == 2 && (returnMapid == 230000000 || thisMapid == 200082300); //breathing underwater } - } + } } finally { chrLock.unlock(); effLock.unlock(); } - - for(Item it: this.getInventory(InventoryType.EQUIPPED).list()) { - if((it.getFlag() & ItemConstants.COLD) == ItemConstants.COLD && ((returnMapid == 211000000 && thisMapid != 200082300) || returnMapid == 193000000)) { + + for (Item it : this.getInventory(InventoryType.EQUIPPED).list()) { + if ((it.getFlag() & ItemConstants.COLD) == ItemConstants.COLD && ((returnMapid == 211000000 && thisMapid != 200082300) || returnMapid == 193000000)) { return true; //protection from cold } } - + return false; } - + public List getLastVisitedMapids() { List lastVisited = new ArrayList<>(5); - + petLock.lock(); try { - for(WeakReference lv : lastVisitedMaps) { + for (WeakReference lv : lastVisitedMaps) { MapleMap lvm = lv.get(); - - if(lvm != null) { + + if (lvm != null) { lastVisited.add(lvm.getId()); } } } finally { petLock.unlock(); } - + return lastVisited; } - - public void partyOperationUpdate(MapleParty party, List exPartyMembers) { + + public void partyOperationUpdate(MapleParty party, List exPartyMembers) { List> mapids; - + petLock.lock(); try { mapids = new LinkedList<>(lastVisitedMaps); } finally { petLock.unlock(); } - - List partyMembers = new LinkedList<>(); - for(MapleCharacter mc : (exPartyMembers != null) ? exPartyMembers : this.getPartyMembersOnline()) { - if(mc.isLoggedinWorld()) { + + List partyMembers = new LinkedList<>(); + for (Character mc : (exPartyMembers != null) ? exPartyMembers : this.getPartyMembersOnline()) { + if (mc.isLoggedinWorld()) { partyMembers.add(mc); } } - - MapleCharacter partyLeaver = null; - if(exPartyMembers != null) { + + Character partyLeaver = null; + if (exPartyMembers != null) { partyMembers.remove(this); partyLeaver = this; } - + MapleMap map = this.getMap(); List partyItems = null; - + int partyId = exPartyMembers != null ? -1 : this.getPartyId(); - for(WeakReference mapRef : mapids) { + for (WeakReference mapRef : mapids) { MapleMap mapObj = mapRef.get(); - - if(mapObj != null) { + + if (mapObj != null) { List partyMapItems = mapObj.updatePlayerItemDropsToParty(partyId, id, partyMembers, partyLeaver); if (map.hashCode() == mapObj.hashCode()) { partyItems = partyMapItems; } } } - + if (partyItems != null && exPartyMembers == null) { map.updatePartyItemDropsToNewcomer(this, partyItems); } - + updatePartyTownDoors(party, this, partyLeaver, partyMembers); } - - private static void addPartyPlayerDoor(MapleCharacter target) { + + private static void addPartyPlayerDoor(Character target) { MapleDoor targetDoor = target.getPlayerDoor(); - if(targetDoor != null) { + if (targetDoor != null) { target.applyPartyDoor(targetDoor, true); } } - - private static void removePartyPlayerDoor(MapleParty party, MapleCharacter target) { + + private static void removePartyPlayerDoor(MapleParty party, Character target) { target.removePartyDoor(party); } - - private static void updatePartyTownDoors(MapleParty party, MapleCharacter target, MapleCharacter partyLeaver, List partyMembers) { - if(partyLeaver != null) { + + private static void updatePartyTownDoors(MapleParty party, Character target, Character partyLeaver, List partyMembers) { + if (partyLeaver != null) { removePartyPlayerDoor(party, target); } else { addPartyPlayerDoor(target); } - + Map partyDoors = null; - if(!partyMembers.isEmpty()) { + if (!partyMembers.isEmpty()) { partyDoors = party.getDoors(); - - for(MapleCharacter pchr : partyMembers) { + + for (Character pchr : partyMembers) { MapleDoor door = partyDoors.get(pchr.getId()); - if(door != null) { + if (door != null) { door.updateDoorPortal(pchr); } } - - for(MapleDoor door : partyDoors.values()) { - for(MapleCharacter pchar : partyMembers) { + + for (MapleDoor door : partyDoors.values()) { + for (Character pchar : partyMembers) { MapleDoorObject mdo = door.getTownDoor(); mdo.sendDestroyData(pchar.getClient(), true); pchar.removeVisibleMapObject(mdo); } } - - if(partyLeaver != null) { + + if (partyLeaver != null) { Collection leaverDoors = partyLeaver.getDoors(); - for(MapleDoor door : leaverDoors) { - for(MapleCharacter pchar : partyMembers) { + for (MapleDoor door : leaverDoors) { + for (Character pchar : partyMembers) { MapleDoorObject mdo = door.getTownDoor(); mdo.sendDestroyData(pchar.getClient(), true); pchar.removeVisibleMapObject(mdo); } } } - + List histMembers = party.getMembersSortedByHistory(); - for(Integer chrid : histMembers) { + for (Integer chrid : histMembers) { MapleDoor door = partyDoors.get(chrid); - if(door != null) { - for(MapleCharacter pchar : partyMembers) { + if (door != null) { + for (Character pchar : partyMembers) { MapleDoorObject mdo = door.getTownDoor(); mdo.sendSpawnData(pchar.getClient()); pchar.addVisibleMapObject(mdo); @@ -1589,55 +1583,55 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - - if(partyLeaver != null) { + + if (partyLeaver != null) { Collection leaverDoors = partyLeaver.getDoors(); - - if(partyDoors != null) { - for(MapleDoor door : partyDoors.values()) { + + if (partyDoors != null) { + for (MapleDoor door : partyDoors.values()) { MapleDoorObject mdo = door.getTownDoor(); mdo.sendDestroyData(partyLeaver.getClient(), true); partyLeaver.removeVisibleMapObject(mdo); } } - - for(MapleDoor door : leaverDoors) { + + for (MapleDoor door : leaverDoors) { MapleDoorObject mdo = door.getTownDoor(); mdo.sendDestroyData(partyLeaver.getClient(), true); partyLeaver.removeVisibleMapObject(mdo); } - - for(MapleDoor door : leaverDoors) { + + for (MapleDoor door : leaverDoors) { door.updateDoorPortal(partyLeaver); - + MapleDoorObject mdo = door.getTownDoor(); mdo.sendSpawnData(partyLeaver.getClient()); partyLeaver.addVisibleMapObject(mdo); } } } - + private Integer getVisitedMapIndex(MapleMap map) { int idx = 0; - - for(WeakReference mapRef : lastVisitedMaps) { - if(map.equals(mapRef.get())) { + + for (WeakReference mapRef : lastVisitedMaps) { + if (map.equals(mapRef.get())) { return idx; } - + idx++; } - + return -1; } - + public void visitMap(MapleMap map) { petLock.lock(); try { int idx = getVisitedMapIndex(map); - - if(idx == -1) { - if(lastVisitedMaps.size() == YamlConfig.config.server.MAP_VISITED_SIZE) { + + if (idx == -1) { + if (lastVisitedMaps.size() == YamlConfig.config.server.MAP_VISITED_SIZE) { lastVisitedMaps.remove(0); } } else { @@ -1651,24 +1645,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { petLock.unlock(); } } - + public void setOwnedMap(MapleMap map) { ownedMap = new WeakReference<>(map); } - + public MapleMap getOwnedMap() { return ownedMap.get(); } public void notifyMapTransferToPartner(int mapid) { - if(partnerId > 0) { - final MapleCharacter partner = getWorldServer().getPlayerStorage().getCharacterById(partnerId); - if(partner != null && !partner.isAwayFromWorld()) { + if (partnerId > 0) { + final Character partner = getWorldServer().getPlayerStorage().getCharacterById(partnerId); + if (partner != null && !partner.isAwayFromWorld()) { partner.sendPacket(WeddingPackets.OnNotifyWeddingPartnerTransfer(id, mapid)); } } } - + public void removeIncomingInvites() { MapleInviteCoordinator.removePlayerIncomingInvites(id); } @@ -1677,20 +1671,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (!canWarpMap) { return; } - + this.mapTransitioning.set(true); - + this.unregisterChairBuff(); this.clearBanishPlayerData(); MapleTrade.cancelTrade(this, MapleTrade.TradeResult.UNSUCCESSFUL_ANOTHER_MAP); this.closePlayerInteractions(); - + MapleParty e = null; if (this.getParty() != null && this.getParty().getEnemy() != null) { e = this.getParty().getEnemy(); } final MapleParty k = e; - + sendPacket(warpPacket); map.removePlayer(this); if (client.getChannelServer().getPlayerStorage().getCharacterById(getId()) != null) { @@ -1698,7 +1692,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { setPosition(pos); map.addPlayer(this); visitMap(map); - + prtLock.lock(); try { if (party != null) { @@ -1709,11 +1703,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { prtLock.unlock(); } - if (MapleCharacter.this.getParty() != null) { - MapleCharacter.this.getParty().setEnemy(k); + if (Character.this.getParty() != null) { + Character.this.getParty().setEnemy(k); } silentPartyUpdateInternal(getParty()); // EIM script calls inside - + if (getMap().getHPDec() > 0) { resetHpDecreaseTask(); } @@ -1722,20 +1716,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { client.disconnect(true, false); // thanks BHB for noticing a player storage stuck case here return; } - + notifyMapTransferToPartner(map.getId()); - + //alas, new map has been specified when a warping was being processed... - if(newWarpMap != -1) { + if (newWarpMap != -1) { canWarpMap = true; - + int temp = newWarpMap; newWarpMap = -1; changeMap(temp); } else { // if this event map has a gate already opened, render it EventInstanceManager eim = getEventInstance(); - if(eim != null) { + if (eim != null) { eim.recoverOpenedGate(this, map.getId()); } @@ -1743,11 +1737,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.environmentMoveList(map.getEnvironment().entrySet())); } } - + public boolean isChangingMaps() { return this.mapTransitioning.get(); } - + public void setMapTransitionComplete() { this.mapTransitioning.set(false); } @@ -1788,7 +1782,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (berserkSchedule != null) { berserkSchedule.cancel(false); } - final MapleCharacter chr = this; + final Character chr = this; if (job.equals(MapleJob.DARKKNIGHT)) { Skill BerserkX = SkillFactory.getSkill(DarkKnight.BERSERK); final int skilllevel = getSkillLevel(BerserkX); @@ -1800,12 +1794,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (awayFromWorld.get()) { return; } - + sendPacket(PacketCreator.showOwnBerserk(skilllevel, berserk)); if (!isHidden) { - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false); + getMap().broadcastMessage(Character.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false); } else { - getMap().broadcastGMMessage(MapleCharacter.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false); + getMap().broadcastGMMessage(Character.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false); } } }, 5000, 3000); @@ -1830,7 +1824,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void stopControllingMonster(MapleMonster monster) { if (cpnLock.tryLock()) { try { @@ -1840,7 +1834,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public int getNumControlledMonsters() { cpnLock.lock(); try { @@ -1849,7 +1843,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cpnLock.unlock(); } } - + public Collection getControlledMonsters() { cpnLock.lock(); try { @@ -1858,10 +1852,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cpnLock.unlock(); } } - + public void releaseControlledMonsters() { Collection controlledMonsters; - + cpnLock.lock(); try { controlledMonsters = new ArrayList<>(controlled); @@ -1869,31 +1863,31 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { cpnLock.unlock(); } - + for (MapleMonster monster : controlledMonsters) { monster.aggroRedirectController(); } } - + public boolean applyConsumeOnPickup(final int itemid) { if (itemid / 1000000 == 2) { if (ii.isConsumeOnPickup(itemid)) { if (ItemConstants.isPartyItem(itemid)) { - List pchr = this.getPartyMembersOnSameMap(); - - if(!ItemConstants.isPartyAllcure(itemid)) { + List pchr = this.getPartyMembersOnSameMap(); + + if (!ItemConstants.isPartyAllcure(itemid)) { MapleStatEffect mse = ii.getItemEffect(itemid); - - if(!pchr.isEmpty()) { - for (MapleCharacter mc : pchr) { + + if (!pchr.isEmpty()) { + for (Character mc : pchr) { mse.applyTo(mc); } } else { mse.applyTo(this); } } else { - if(!pchr.isEmpty()) { - for (MapleCharacter mc : pchr) { + if (!pchr.isEmpty()) { + for (Character mc : pchr) { mc.dispelDebuffs(); } } else { @@ -1903,7 +1897,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else { ii.getItemEffect(itemid).applyTo(this); } - + if (itemid / 10000 == 238) { this.getMonsterBook().addCard(client, itemid); } @@ -1912,28 +1906,28 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return false; } - + public final void pickupItem(MapleMapObject ob) { pickupItem(ob, -1); } - + public final void pickupItem(MapleMapObject ob, int petIndex) { // yes, one picks the MapleMapObject, not the MapleMapItem if (ob == null) { // pet index refers to the one picking up the item return; } - + if (ob instanceof MapleMapItem) { MapleMapItem mapitem = (MapleMapItem) ob; if (System.currentTimeMillis() - mapitem.getDropTime() < 400 || !mapitem.canBePickedBy(this)) { sendPacket(PacketCreator.enableActions()); return; } - - List mpcs = new LinkedList<>(); - if (mapitem.getMeso() > 0 && !mapitem.isPickedUp()) { + + List mpcs = new LinkedList<>(); + if (mapitem.getMeso() > 0 && !mapitem.isPickedUp()) { mpcs = getPartyMembersOnSameMap(); } - + ScriptedItem itemScript = null; mapitem.lockItem(); try { @@ -1942,7 +1936,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.enableActions()); return; } - + boolean isPet = petIndex > -1; final Packet pickupPacket = PacketCreator.removeItemFromMap(mapitem.getObjectId(), (isPet) ? 5 : 2, this.getId(), isPet, petIndex); @@ -1950,13 +1944,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { boolean hasSpaceInventory = true; if (mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866 || mapitem.getMeso() > 0 || ii.isConsumeOnPickup(mapitem.getItemId()) || (hasSpaceInventory = InventoryManipulator.checkSpace(client, mapitem.getItemId(), mItem.getQuantity(), mItem.getOwner()))) { int mapId = this.getMapId(); - + if ((mapId > 209000000 && mapId < 209000016) || (mapId >= 990000500 && mapId <= 990000502)) {//happyville trees and guild PQ if (!mapitem.isPlayerDrop() || mapitem.getDropper().getObjectId() == client.getPlayer().getObjectId()) { - if(mapitem.getMeso() > 0) { + if (mapitem.getMeso() > 0) { if (!mpcs.isEmpty()) { int mesosamm = mapitem.getMeso() / mpcs.size(); - for (MapleCharacter partymem : mpcs) { + for (Character partymem : mpcs) { if (partymem.isLoggedinWorld()) { partymem.gainMeso(mesosamm, true, true, false); } @@ -1964,9 +1958,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else { this.gainMeso(mapitem.getMeso(), true, true, false); } - + this.getMap().pickItemDrop(pickupPacket, mapitem); - } else if(mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866) { + } else if (mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866) { // Add NX to account, show effect and make item disappear int nxGain = mapitem.getItemId() == 4031865 ? 100 : 250; this.getCashShop().gainCash(1, nxGain); @@ -1988,17 +1982,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.enableActions()); return; } - + if (!this.needQuestItem(mapitem.getQuest(), mapitem.getItemId())) { sendPacket(PacketCreator.showItemUnavailable()); sendPacket(PacketCreator.enableActions()); return; } - + if (mapitem.getMeso() > 0) { if (!mpcs.isEmpty()) { int mesosamm = mapitem.getMeso() / mpcs.size(); - for (MapleCharacter partymem : mpcs) { + for (Character partymem : mpcs) { if (partymem.isLoggedinWorld()) { partymem.gainMeso(mesosamm, true, true, false); } @@ -2016,11 +2010,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return; } } - } else if(mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866) { + } else if (mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866) { // Add NX to account, show effect and make item disappear int nxGain = mapitem.getItemId() == 4031865 ? 100 : 250; this.getCashShop().gainCash(1, nxGain); - + showHint("You have earned #e#b" + nxGain + " NX#k#n. (" + this.getCashShop().getCash(1) + " NX)", 300); } else if (applyConsumeOnPickup(mItem.getItemId())) { } else if (InventoryManipulator.addFromDrop(client, mItem, true)) { @@ -2033,14 +2027,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } this.getMap().pickItemDrop(pickupPacket, mapitem); - } else if(!hasSpaceInventory) { + } else if (!hasSpaceInventory) { sendPacket(PacketCreator.getInventoryFull()); sendPacket(PacketCreator.getShowInventoryFull()); } } finally { mapitem.unlockItem(); } - + if (itemScript != null) { ItemScriptManager ism = ItemScriptManager.getInstance(); ism.runItemScript(client, itemScript); @@ -2052,22 +2046,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int countItem(int itemid) { return inventory[ItemConstants.getInventoryType(itemid).ordinal()].countById(itemid); } - + public boolean canHold(int itemid) { return canHold(itemid, 1); } - + public boolean canHold(int itemid, int quantity) { return client.getAbstractPlayerInteraction().canHold(itemid, quantity); } - + public boolean canHoldUniques(List itemids) { for (Integer itemid : itemids) { if (ii.isPickupRestricted(itemid) && this.haveItem(itemid)) { return false; } } - + return true; } @@ -2075,18 +2069,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Integer bv = getBuffedValue(BuffStat.MONSTER_RIDING); return bv != null && bv.equals(Corsair.BATTLE_SHIP); } - + public void announceBattleshipHp() { sendPacket(PacketCreator.skillCooldown(5221999, battleshipHp)); } - + public void decreaseBattleshipHp(int decrease) { this.battleshipHp -= decrease; if (battleshipHp <= 0) { Skill battleship = SkillFactory.getSkill(Corsair.BATTLE_SHIP); int cooldown = battleship.getEffect(getSkillLevel(battleship)).getCooldown(); sendPacket(PacketCreator.skillCooldown(Corsair.BATTLE_SHIP, cooldown)); - addCooldown(Corsair.BATTLE_SHIP, Server.getInstance().getCurrentTime(), (long)(cooldown * 1000)); + addCooldown(Corsair.BATTLE_SHIP, Server.getInstance().getCurrentTime(), cooldown * 1000); removeCooldown(5221999); cancelEffectFromBuffStat(BuffStat.MONSTER_RIDING); } else { @@ -2094,7 +2088,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { addCooldown(5221999, 0, Long.MAX_VALUE); } } - + public void decreaseReports() { this.possibleReports--; } @@ -2113,24 +2107,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ex.printStackTrace(); } } - + private void nextPendingRequest(MapleClient c) { CharacterNameAndId pendingBuddyRequest = c.getPlayer().getBuddylist().pollPendingRequest(); if (pendingBuddyRequest != null) { c.sendPacket(PacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName())); } } - + private void notifyRemoteChannel(MapleClient c, int remoteChannel, int otherCid, BuddyList.BuddyOperation operation) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (remoteChannel != -1) { c.getWorldServer().buddyChanged(otherCid, player.getId(), player.getName(), c.getChannel(), operation); } } - + public void deleteBuddy(int otherCid) { BuddyList bl = getBuddylist(); - + if (bl.containsVisible(otherCid)) { notifyRemoteChannel(client, getWorldServer().find(otherCid), otherCid, BuddyList.BuddyOperation.DELETED); } @@ -2138,8 +2132,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.updateBuddylist(getBuddylist().getBuddies())); nextPendingRequest(client); } - - public static boolean deleteCharFromDB(MapleCharacter player, int senderAccId) { + + public static boolean deleteCharFromDB(Character player, int senderAccId) { int cid = player.getId(); if (!Server.getInstance().haveCharacterEntry(senderAccId, cid)) { // thanks zera (EpiphanyMS) for pointing a critical exploit with non-authed character deletion request return false; @@ -2164,7 +2158,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { try (ResultSet rs = ps.executeQuery()) { while (rs.next()) { int buddyid = rs.getInt("buddyid"); - MapleCharacter buddy = Server.getInstance().getWorld(world).getPlayerStorage().getCharacterById(buddyid); + Character buddy = Server.getInstance().getWorld(world).getPlayerStorage().getCharacterById(buddyid); if (buddy != null) { buddy.deleteBuddy(cid); @@ -2317,7 +2311,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { String[] toDel = {"famelog", "inventoryitems", "keymap", "queststatus", "savedlocations", "trocklocations", "skillmacros", "skills", "eventstats", "server_queue"}; for (String s : toDel) { - MapleCharacter.deleteWhereCharacterId(con, "DELETE FROM `" + s + "` WHERE characterid = ?", cid); + Character.deleteWhereCharacterId(con, "DELETE FROM `" + s + "` WHERE characterid = ?", cid); } Server.getInstance().deleteCharacterEntry(accId, cid); @@ -2327,7 +2321,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + private static void deleteQuestProgressWhereCharacterId(Connection con, int cid) throws SQLException { try (PreparedStatement ps = con.prepareStatement("DELETE FROM medalmaps WHERE characterid = ?")) { ps.setInt(1, cid); @@ -2338,7 +2332,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ps.setInt(1, cid); ps.executeUpdate(); } - + try (PreparedStatement ps = con.prepareStatement("DELETE FROM queststatus WHERE characterid = ?")) { ps.setInt(1, cid); ps.executeUpdate(); @@ -2370,20 +2364,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + private static Pair> getChairTaskIntervalRate(int maxhp, int maxmp) { float toHeal = Math.max(maxhp, maxmp); float maxDuration = YamlConfig.config.server.CHAIR_EXTRA_HEAL_MAX_DELAY * 1000; - + int rate = 0; int minRegen = 1, maxRegen = (256 * YamlConfig.config.server.CHAIR_EXTRA_HEAL_MULTIPLIER) - 1, midRegen = 1; while (minRegen < maxRegen) { midRegen = (int) ((minRegen + maxRegen) * 0.94); - + float procs = toHeal / midRegen; float newRate = maxDuration / procs; rate = (int) newRate; - + if (newRate < 420) { minRegen = (int) (1.2 * midRegen); } else if (newRate > 5000) { @@ -2392,7 +2386,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { break; } } - + float procs = maxDuration / rate; int hpRegen, mpRegen; if (maxhp > maxmp) { @@ -2402,10 +2396,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { hpRegen = (int) Math.ceil(maxhp / procs); mpRegen = midRegen; } - + return new Pair<>(rate, new Pair<>(hpRegen, mpRegen)); } - + private void updateChairHealStats() { statRlock.lock(); try { @@ -2415,7 +2409,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { statRlock.unlock(); } - + effLock.lock(); statWlock.lock(); try { @@ -2429,12 +2423,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + private void startChairTask() { if (chair.get() < 0) { return; } - + int healInterval; effLock.lock(); try { @@ -2443,26 +2437,26 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { effLock.unlock(); } - + chrLock.lock(); try { if (chairRecoveryTask != null) { stopChairTask(); } - + chairRecoveryTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { updateChairHealStats(); final int healHP = localchairhp; final int healMP = localchairmp; - - if(MapleCharacter.this.getHp() < localmaxhp) { + + if (Character.this.getHp() < localmaxhp) { byte recHP = (byte) (healHP / YamlConfig.config.server.CHAIR_EXTRA_HEAL_MULTIPLIER); - + sendPacket(PacketCreator.showOwnRecovery(recHP)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, recHP), false); - } else if (MapleCharacter.this.getMp() >= localmaxmp) { + getMap().broadcastMessage(Character.this, PacketCreator.showRecovery(id, recHP), false); + } else if (Character.this.getMp() >= localmaxmp) { stopChairTask(); // optimizing schedule management when player is already with full pool. } @@ -2473,7 +2467,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + private void stopExtraTask() { chrLock.lock(); try { @@ -2485,7 +2479,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + private void startExtraTask(final byte healHP, final byte healMP, final short healInterval) { chrLock.lock(); try { @@ -2494,7 +2488,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + private void startExtraTaskInternal(final byte healHP, final byte healMP, final short healInterval) { extraRecInterval = healInterval; @@ -2505,11 +2499,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { stopExtraTask(); return; } - - if(MapleCharacter.this.getHp() < localmaxhp) { - if(healHP > 0) { + + if (Character.this.getHp() < localmaxhp) { + if (healHP > 0) { sendPacket(PacketCreator.showOwnRecovery(healHP)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, healHP), false); + getMap().broadcastMessage(Character.this, PacketCreator.showRecovery(id, healHP), false); } } @@ -2530,7 +2524,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void dispel() { - if(!(YamlConfig.config.server.USE_UNDISPEL_HOLY_SHIELD && this.hasActiveBuff(Bishop.HOLY_SHIELD))) { + if (!(YamlConfig.config.server.USE_UNDISPEL_HOLY_SHIELD && this.hasActiveBuff(Bishop.HOLY_SHIELD))) { List mbsvhList = getAllStatups(); for (MapleBuffStatValueHolder mbsvh : mbsvhList) { if (mbsvh.effect.isSkill()) { @@ -2550,7 +2544,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public final int getDiseasesSize() { chrLock.lock(); try { @@ -2565,28 +2559,28 @@ public class MapleCharacter extends AbstractMapleCharacterObject { try { long curtime = Server.getInstance().getCurrentTime(); Map> ret = new LinkedHashMap<>(); - - for(Entry de : diseaseExpires.entrySet()) { + + for (Entry de : diseaseExpires.entrySet()) { Pair dee = diseases.get(de.getKey()); MapleDiseaseValueHolder mdvh = dee.getLeft(); - + ret.put(de.getKey(), new Pair<>(mdvh.length - (curtime - mdvh.startTime), dee.getRight())); } - + return ret; } finally { chrLock.unlock(); } } - + public void silentApplyDiseases(Map> diseaseMap) { chrLock.lock(); try { long curTime = Server.getInstance().getCurrentTime(); - - for(Entry> di : diseaseMap.entrySet()) { + + for (Entry> di : diseaseMap.entrySet()) { long expTime = curTime + di.getValue().getLeft(); - + diseaseExpires.put(di.getKey(), expTime); diseases.put(di.getKey(), new Pair<>(new MapleDiseaseValueHolder(curTime, di.getValue().getLeft()), di.getValue().getRight())); } @@ -2594,23 +2588,23 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void announceDiseases() { Set>> chrDiseases; - + chrLock.lock(); try { // Poison damage visibility and diseases status visibility, extended through map transitions thanks to Ronan if (!this.isLoggedinWorld()) { return; } - + chrDiseases = new LinkedHashSet<>(diseases.entrySet()); } finally { chrLock.unlock(); } - - for(Entry> di : chrDiseases) { + + for (Entry> di : chrDiseases) { MapleDisease disease = di.getKey(); MobSkill skill = di.getValue().getRight(); final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); @@ -2622,11 +2616,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void collectDiseases() { - for (MapleCharacter chr : map.getAllPlayers()) { + for (Character chr : map.getAllPlayers()) { int cid = chr.getId(); - + for (Entry> di : chr.getAllDiseases().entrySet()) { MapleDisease disease = di.getKey(); MobSkill skill = di.getValue().getRight(); @@ -2640,7 +2634,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void giveDebuff(final MapleDisease disease, MobSkill skill) { if (!hasDisease(disease) && getDiseasesSize() < 2) { if (!(disease == MapleDisease.SEDUCE || disease == MapleDisease.STUN)) { @@ -2648,7 +2642,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return; } } - + chrLock.lock(); try { long curTime = Server.getInstance().getCurrentTime(); @@ -2657,14 +2651,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { chrLock.unlock(); } - + if (disease == MapleDisease.SEDUCE && chair.get() < 0) { sitChair(-1); } - + final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); sendPacket(PacketCreator.giveDebuff(debuff, skill)); - + if (disease != MapleDisease.SLOW) { map.broadcastMessage(this, PacketCreator.giveForeignDebuff(id, debuff, skill), false); } else { @@ -2677,7 +2671,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (hasDisease(debuff)) { long mask = debuff.getValue(); sendPacket(PacketCreator.cancelDebuff(mask)); - + if (debuff != MapleDisease.SLOW) { map.broadcastMessage(this, PacketCreator.cancelForeignDebuff(id, mask), false); } else { @@ -2702,14 +2696,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { dispelDebuff(MapleDisease.WEAKEN); dispelDebuff(MapleDisease.SLOW); // thanks Conrad for noticing ZOMBIFY isn't dispellable } - + public void purgeDebuffs() { dispelDebuff(MapleDisease.SEDUCE); dispelDebuff(MapleDisease.ZOMBIFY); dispelDebuff(MapleDisease.CONFUSE); dispelDebuffs(); } - + public void cancelAllDebuffs() { chrLock.lock(); try { @@ -2719,7 +2713,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void dispelSkill(int skillid) { List allBuffs = getAllStatups(); for (MapleBuffStatValueHolder mbsvh : allBuffs) { @@ -2750,12 +2744,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + public void changeFaceExpression(int emote) { long timeNow = Server.getInstance().getCurrentTime(); - if(timeNow - lastExpression > 2000) { + if (timeNow - lastExpression > 2000) { lastExpression = timeNow; - + FaceExpressionService service = (FaceExpressionService) client.getChannelServer().getServiceAccess(ChannelServices.FACE_EXPRESSION); service.registerFaceExpression(map, this, emote); } @@ -2767,7 +2761,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { lastHpDec = Server.getInstance().getCurrentTime(); } } - + private void startHpDecreaseTask(long lastHpTask) { hpDecreaseTask = TimerManager.getInstance().register(new Runnable() { @Override @@ -2776,16 +2770,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } }, YamlConfig.config.server.MAP_DAMAGE_OVERTIME_INTERVAL, YamlConfig.config.server.MAP_DAMAGE_OVERTIME_INTERVAL - lastHpTask); } - + public void resetHpDecreaseTask() { if (hpDecreaseTask != null) { hpDecreaseTask.cancel(false); } - + long lastHpTask = Server.getInstance().getCurrentTime() - lastHpDec; startHpDecreaseTask((lastHpTask > YamlConfig.config.server.MAP_DAMAGE_OVERTIME_INTERVAL) ? YamlConfig.config.server.MAP_DAMAGE_OVERTIME_INTERVAL : lastHpTask); } - + public void dropMessage(String message) { dropMessage(0, message); } @@ -2793,7 +2787,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void dropMessage(int type, String message) { sendPacket(PacketCreator.serverNotice(type, message)); } - + public void enteredScript(String script, int mapid) { if (!entered.containsKey(mapid)) { entered.put(mapid, script); @@ -2808,7 +2802,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { getWorldServer().updateMessenger(getMessenger(), getName(), getWorld(), client.getChannel()); } } - + public void cancelDiseaseExpireTask() { if (diseaseExpireTask != null) { diseaseExpireTask.cancel(false); @@ -2822,28 +2816,28 @@ public class MapleCharacter extends AbstractMapleCharacterObject { @Override public void run() { Set toExpire = new LinkedHashSet<>(); - + chrLock.lock(); try { long curTime = Server.getInstance().getCurrentTime(); - - for(Entry de : diseaseExpires.entrySet()) { - if(de.getValue() < curTime) { + + for (Entry de : diseaseExpires.entrySet()) { + if (de.getValue() < curTime) { toExpire.add(de.getKey()); } } } finally { chrLock.unlock(); } - - for(MapleDisease d : toExpire) { + + for (MapleDisease d : toExpire) { dispelDebuff(d); } } }, 1500); } } - + public void cancelBuffExpireTask() { if (buffExpireTask != null) { buffExpireTask.cancel(false); @@ -2858,15 +2852,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void run() { Set> es; List toCancel = new ArrayList<>(); - + effLock.lock(); chrLock.lock(); try { es = new LinkedHashSet<>(buffExpires.entrySet()); - + long curTime = Server.getInstance().getCurrentTime(); - for(Entry bel : es) { - if(curTime >= bel.getValue()) { + for (Entry bel : es) { + if (curTime >= bel.getValue()) { toCancel.add(buffEffects.get(bel.getKey()).entrySet().iterator().next().getValue()); //rofl } } @@ -2874,15 +2868,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); effLock.unlock(); } - - for(MapleBuffStatValueHolder mbsvh : toCancel) { + + for (MapleBuffStatValueHolder mbsvh : toCancel) { cancelEffect(mbsvh.effect, false, mbsvh.startTime); } } }, 1500); } } - + public void cancelSkillCooldownTask() { if (skillCooldownTask != null) { skillCooldownTask.cancel(false); @@ -2896,7 +2890,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { @Override public void run() { Set> es; - + effLock.lock(); chrLock.lock(); try { @@ -2905,11 +2899,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); effLock.unlock(); } - + long curTime = Server.getInstance().getCurrentTime(); - for(Entry bel : es) { + for (Entry bel : es) { MapleCoolDownValueHolder mcdvh = bel.getValue(); - if(curTime >= mcdvh.startTime + mcdvh.length) { + if (curTime >= mcdvh.startTime + mcdvh.length) { removeCooldown(mcdvh.skillId); sendPacket(PacketCreator.skillCooldown(mcdvh.skillId, 0)); } @@ -2918,7 +2912,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { }, 1500); } } - + public void cancelExpirationTask() { if (itemExpireTask != null) { itemExpireTask.cancel(false); @@ -2932,10 +2926,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { @Override public void run() { boolean deletedCoupon = false; - + long expiration, currenttime = System.currentTimeMillis(); Set keys = getSkills().keySet(); - for (Iterator i = keys.iterator(); i.hasNext();) { + for (Iterator i = keys.iterator(); i.hasNext(); ) { Skill key = i.next(); SkillEntry skill = getSkills().get(key); if (skill.expiration != -1 && skill.expiration < currenttime) { @@ -2947,7 +2941,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { for (Inventory inv : inventory) { for (Item item : inv.list()) { expiration = item.getExpiration(); - + if (expiration != -1 && (expiration < currenttime) && ((item.getFlag() & ItemConstants.LOCK) == ItemConstants.LOCK)) { short lock = item.getFlag(); lock &= ~(ItemConstants.LOCK); @@ -2966,7 +2960,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (pet != null) { unequipPet(pet, true); } - + if (ItemConstants.isExpirablePet(item.getItemId())) { sendPacket(PacketCreator.itemExpired(item.getItemId())); toberemove.add(item); @@ -2977,8 +2971,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - - if(!toberemove.isEmpty()) { + + if (!toberemove.isEmpty()) { for (Item item : toberemove) { InventoryManipulator.removeFromSlot(client, inv.getType(), item.getPosition(), item.getQuantity(), true); } @@ -3000,8 +2994,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { toberemove.clear(); } - - if(deletedCoupon) { + + if (deletedCoupon) { updateCouponRates(); } } @@ -3011,7 +3005,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public enum FameStatus { - + OK, NOT_TODAY, NOT_THIS_MONTH } @@ -3027,12 +3021,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { long currentgexp = gachaexp.get(); if ((currentgexp + exp.get()) >= ExpTable.getExpNeededForLevel(level)) { expgain += ExpTable.getExpNeededForLevel(level) - exp.get(); - + int nextneed = ExpTable.getExpNeededForLevel(level + 1); if (currentgexp - expgain >= nextneed) { expgain += nextneed; } - + this.gachaexp.set((int) (currentgexp - expgain)); } else { expgain = this.gachaexp.getAndSet(0); @@ -3044,7 +3038,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void addGachaExp(int gain) { updateSingleStat(MapleStat.GACHAEXP, gachaexp.addAndGet(gain)); } - + public void gainExp(int gain) { gainExp(gain, true, true); } @@ -3052,60 +3046,60 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void gainExp(int gain, boolean show, boolean inChat) { gainExp(gain, show, inChat, true); } - + public void gainExp(int gain, boolean show, boolean inChat, boolean white) { gainExp(gain, 0, show, inChat, white); } - + public void gainExp(int gain, int party, boolean show, boolean inChat, boolean white) { if (hasDisease(MapleDisease.CURSE)) { gain *= 0.5; party *= 0.5; } - - if(gain < 0) { + + if (gain < 0) { gain = Integer.MAX_VALUE; // integer overflow, heh. } - - if(party < 0) { + + if (party < 0) { party = Integer.MAX_VALUE; // integer overflow, heh. } - - int equip = (int) Math.min((long)(gain / 10) * pendantExp, Integer.MAX_VALUE); - - gainExpInternal((long) gain, equip, party, show, inChat, white); + + int equip = (int) Math.min((long) (gain / 10) * pendantExp, Integer.MAX_VALUE); + + gainExpInternal(gain, equip, party, show, inChat, white); } - + public void loseExp(int loss, boolean show, boolean inChat) { loseExp(loss, show, inChat, true); } - + public void loseExp(int loss, boolean show, boolean inChat, boolean white) { gainExpInternal(-loss, 0, 0, show, inChat, white); } - + private void announceExpGain(long gain, int equip, int party, boolean inChat, boolean white) { gain = Math.min(gain, Integer.MAX_VALUE); if (gain == 0) { if (party == 0) { return; } - + gain = party; party = 0; white = false; } - + sendPacket(PacketCreator.getShowExpGain((int) gain, equip, party, inChat, white)); } - + private synchronized void gainExpInternal(long gain, int equip, int party, boolean show, boolean inChat, boolean white) { // need of method synchonization here detected thanks to MedicOP long total = Math.max(gain + equip + party, -exp.get()); - + if (level < getMaxLevel() && (allowExpGain || this.getEventInstance() != null)) { long leftover = 0; long nextExp = exp.get() + total; - + if (nextExp > (long) Integer.MAX_VALUE) { total = Integer.MAX_VALUE - exp.get(); leftover = nextExp - Integer.MAX_VALUE; @@ -3122,8 +3116,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { break; } } - - if(leftover > 0) { + + if (leftover > 0) { gainExpInternal(leftover, equip, party, false, inChat, white); } else { lastExpGainTime = System.currentTimeMillis(); @@ -3147,36 +3141,36 @@ public class MapleCharacter extends AbstractMapleCharacterObject { petLock.unlock(); } } - + public void gainFame(int delta) { gainFame(delta, null, 0); } - - public boolean gainFame(int delta, MapleCharacter fromPlayer, int mode) { + + public boolean gainFame(int delta, Character fromPlayer, int mode) { Pair fameRes = applyFame(delta); delta = fameRes.getRight(); if (delta != 0) { int thisFame = fameRes.getLeft(); updateSingleStat(MapleStat.FAME, thisFame); - + if (fromPlayer != null) { fromPlayer.sendPacket(PacketCreator.giveFameResponse(mode, getName(), thisFame)); sendPacket(PacketCreator.receiveFame(mode, fromPlayer.getName())); } else { sendPacket(PacketCreator.getShowFameGain(delta)); } - + return true; } else { return false; } } - + public boolean canHoldMeso(int gain) { // thanks lucasziron for pointing out a need to check space availability for mesos on player transactions long nextMeso = (long) meso.get() + gain; return nextMeso <= Integer.MAX_VALUE; } - + public void gainMeso(int gain) { gainMeso(gain, true, false, true); } @@ -3199,7 +3193,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { petLock.unlock(); } - + if (gain != 0) { updateSingleStat(MapleStat.MESO, (int) nextMeso, enableActions); if (show) { @@ -3220,7 +3214,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public List getAllCooldowns() { List ret = new ArrayList<>(); - + effLock.lock(); chrLock.lock(); try { @@ -3231,7 +3225,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); effLock.unlock(); } - + return ret; } @@ -3246,16 +3240,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public static int getAriantSlotsRoom(int room) { return ariantroomslot[room]; } - + public void updateAriantScore() { updateAriantScore(0); } - + public void updateAriantScore(int dropQty) { AriantColiseum arena = this.getAriantColiseum(); if (arena != null) { arena.updateAriantScore(this, countItem(4031868)); - + if (dropQty > 0) { arena.addLostShards(dropQty); } @@ -3364,14 +3358,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + private List getAllStatups() { effLock.lock(); chrLock.lock(); try { List ret = new ArrayList<>(); - for(Map bel : buffEffects.values()) { - for(MapleBuffStatValueHolder mbsvh : bel.values()) { + for (Map bel : buffEffects.values()) { + for (MapleBuffStatValueHolder mbsvh : bel.values()) { ret.add(mbsvh); } } @@ -3381,19 +3375,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public List getAllBuffs() { // buff values will be stored in an arbitrary order effLock.lock(); chrLock.lock(); try { long curtime = Server.getInstance().getCurrentTime(); - + Map ret = new LinkedHashMap<>(); - for(Map bel : buffEffects.values()) { - for(MapleBuffStatValueHolder mbsvh : bel.values()) { + for (Map bel : buffEffects.values()) { + for (MapleBuffStatValueHolder mbsvh : bel.values()) { int srcid = mbsvh.effect.getBuffSourceId(); - if(!ret.containsKey(srcid)) { - ret.put(srcid, new PlayerBuffValueHolder((int)(curtime - mbsvh.startTime), mbsvh.effect)); + if (!ret.containsKey(srcid)) { + ret.put(srcid, new PlayerBuffValueHolder((int) (curtime - mbsvh.startTime), mbsvh.effect)); } } } @@ -3419,7 +3413,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public boolean hasBuffFromSourceid(int sourceid) { effLock.lock(); chrLock.lock(); @@ -3430,10 +3424,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public boolean hasActiveBuff(int sourceid) { LinkedList allBuffs; - + effLock.lock(); chrLock.lock(); try { @@ -3442,7 +3436,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); effLock.unlock(); } - + for (MapleBuffStatValueHolder mbsvh : allBuffs) { if (mbsvh.effect.getBuffSourceId() == sourceid) { return true; @@ -3450,35 +3444,35 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return false; } - + private List> getActiveStatupsFromSourceid(int sourceid) { // already under effLock & chrLock List> ret = new ArrayList<>(); List> singletonStatups = new ArrayList<>(); - for(Entry bel : buffEffects.get(sourceid).entrySet()) { + for (Entry bel : buffEffects.get(sourceid).entrySet()) { BuffStat mbs = bel.getKey(); MapleBuffStatValueHolder mbsvh = effects.get(bel.getKey()); - + Pair p; - if(mbsvh != null) { + if (mbsvh != null) { p = new Pair<>(mbs, mbsvh.value); } else { p = new Pair<>(mbs, 0); } - + if (!isSingletonStatup(mbs)) { // thanks resinate, Daddy Egg for pointing out morph issues when updating it along with other statups ret.add(p); } else { singletonStatups.add(p); } } - + Collections.sort(ret, new Comparator>() { @Override public int compare(Pair p1, Pair p2) { return p1.getLeft().compareTo(p2.getLeft()); } }); - + if (!singletonStatups.isEmpty()) { Collections.sort(singletonStatups, new Comparator>() { @Override @@ -3486,88 +3480,88 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return p1.getLeft().compareTo(p2.getLeft()); } }); - + ret.addAll(singletonStatups); } - + return ret; } - + private void addItemEffectHolder(Integer sourceid, long expirationtime, Map statups) { buffEffects.put(sourceid, statups); buffExpires.put(sourceid, expirationtime); } - + private boolean removeEffectFromItemEffectHolder(Integer sourceid, BuffStat buffStat) { Map lbe = buffEffects.get(sourceid); - - if(lbe.remove(buffStat) != null) { - buffEffectsCount.put(buffStat, (byte)(buffEffectsCount.get(buffStat) - 1)); - - if(lbe.isEmpty()) { + + if (lbe.remove(buffStat) != null) { + buffEffectsCount.put(buffStat, (byte) (buffEffectsCount.get(buffStat) - 1)); + + if (lbe.isEmpty()) { buffEffects.remove(sourceid); buffExpires.remove(sourceid); } - + return true; } - + return false; } - + private void removeItemEffectHolder(Integer sourceid) { Map be = buffEffects.remove(sourceid); - if(be != null) { - for(Entry bei : be.entrySet()) { - buffEffectsCount.put(bei.getKey(), (byte)(buffEffectsCount.get(bei.getKey()) - 1)); + if (be != null) { + for (Entry bei : be.entrySet()) { + buffEffectsCount.put(bei.getKey(), (byte) (buffEffectsCount.get(bei.getKey()) - 1)); } } - + buffExpires.remove(sourceid); } - + private void dropWorstEffectFromItemEffectHolder(BuffStat mbs) { Integer min = Integer.MAX_VALUE; Integer srcid = -1; - for(Entry> bpl: buffEffects.entrySet()) { + for (Entry> bpl : buffEffects.entrySet()) { MapleBuffStatValueHolder mbsvh = bpl.getValue().get(mbs); - if(mbsvh != null) { - if(mbsvh.value < min) { + if (mbsvh != null) { + if (mbsvh.value < min) { min = mbsvh.value; srcid = bpl.getKey(); } } } - + removeEffectFromItemEffectHolder(srcid, mbs); } - + private MapleBuffStatValueHolder fetchBestEffectFromItemEffectHolder(BuffStat mbs) { Pair max = new Pair<>(Integer.MIN_VALUE, 0); MapleBuffStatValueHolder mbsvh = null; - for(Entry> bpl: buffEffects.entrySet()) { + for (Entry> bpl : buffEffects.entrySet()) { MapleBuffStatValueHolder mbsvhi = bpl.getValue().get(mbs); - if(mbsvhi != null) { - if(!mbsvhi.effect.isActive(this)) { + if (mbsvhi != null) { + if (!mbsvhi.effect.isActive(this)) { continue; } - - if(mbsvhi.value > max.left) { + + if (mbsvhi.value > max.left) { max = new Pair<>(mbsvhi.value, mbsvhi.effect.getStatups().size()); mbsvh = mbsvhi; - } else if(mbsvhi.value == max.left && mbsvhi.effect.getStatups().size() > max.right) { + } else if (mbsvhi.value == max.left && mbsvhi.effect.getStatups().size() > max.right) { max = new Pair<>(mbsvhi.value, mbsvhi.effect.getStatups().size()); mbsvh = mbsvhi; } } } - - if(mbsvh != null) { + + if (mbsvh != null) { effects.put(mbs, mbsvh); } return mbsvh; } - + private void extractBuffValue(int sourceid, BuffStat stat) { chrLock.lock(); try { @@ -3576,29 +3570,29 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void debugListAllBuffs() { effLock.lock(); chrLock.lock(); try { System.out.println("-------------------"); System.out.println("CACHED BUFF COUNT: "); - for(Entry bpl : buffEffectsCount.entrySet()) { + for (Entry bpl : buffEffectsCount.entrySet()) { System.out.println(bpl.getKey() + ": " + bpl.getValue()); } System.out.println("-------------------"); System.out.println("CACHED BUFFS: "); - for(Entry> bpl : buffEffects.entrySet()) { + for (Entry> bpl : buffEffects.entrySet()) { System.out.print(bpl.getKey() + ": "); - for(Entry pble : bpl.getValue().entrySet()) { + for (Entry pble : bpl.getValue().entrySet()) { System.out.print(pble.getKey().name() + pble.getValue().value + ", "); } System.out.println(); } System.out.println("-------------------"); - + System.out.println("IN ACTION:"); - for(Entry bpl : effects.entrySet()) { + for (Entry bpl : effects.entrySet()) { System.out.println(bpl.getKey().name() + " -> " + MapleItemInformationProvider.getInstance().getName(bpl.getValue().effect.getSourceId())); } } finally { @@ -3606,12 +3600,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public void debugListAllBuffsCount() { effLock.lock(); chrLock.lock(); try { - for(Entry mbsl : buffEffectsCount.entrySet()) { + for (Entry mbsl : buffEffectsCount.entrySet()) { System.out.println(mbsl.getKey().name() + " -> " + mbsl.getValue()); } } finally { @@ -3619,7 +3613,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public void cancelAllBuffs(boolean softcancel) { if (softcancel) { effLock.lock(); @@ -3628,10 +3622,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cancelEffectFromBuffStat(BuffStat.SUMMON); cancelEffectFromBuffStat(BuffStat.PUPPET); cancelEffectFromBuffStat(BuffStat.COMBO); - + effects.clear(); - - for(Integer srcid : new ArrayList<>(buffEffects.keySet())) { + + for (Integer srcid : new ArrayList<>(buffEffects.keySet())) { removeItemEffectHolder(srcid); } } finally { @@ -3644,8 +3638,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.lock(); chrLock.lock(); try { - for(Entry> bpl : buffEffects.entrySet()) { - for(Entry mbse : bpl.getValue().entrySet()) { + for (Entry> bpl : buffEffects.entrySet()) { + for (Entry mbse : bpl.getValue().entrySet()) { mseBuffs.put(mbse.getValue().effect, mbse.getValue().startTime); } } @@ -3663,15 +3657,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private void dropBuffStats(List> effectsToCancel) { for (Pair cancelEffectCancelTasks : effectsToCancel) { //boolean nestedCancel = false; - + chrLock.lock(); try { /* if (buffExpires.get(cancelEffectCancelTasks.getRight().effect.getBuffSourceId()) != null) { nestedCancel = true; }*/ - - if(cancelEffectCancelTasks.getRight().bestApplied) { + + if (cancelEffectCancelTasks.getRight().bestApplied) { fetchBestEffectFromItemEffectHolder(cancelEffectCancelTasks.getLeft()); } } finally { @@ -3684,26 +3678,26 @@ public class MapleCharacter extends AbstractMapleCharacterObject { }*/ } } - + private List> deregisterBuffStats(Map stats) { chrLock.lock(); try { List> effectsToCancel = new ArrayList<>(stats.size()); for (Entry stat : stats.entrySet()) { int sourceid = stat.getValue().effect.getBuffSourceId(); - - if(!buffEffects.containsKey(sourceid)) { + + if (!buffEffects.containsKey(sourceid)) { buffExpires.remove(sourceid); } - + BuffStat mbs = stat.getKey(); effectsToCancel.add(new Pair<>(mbs, stat.getValue())); - + MapleBuffStatValueHolder mbsvh = effects.get(mbs); if (mbsvh != null && mbsvh.effect.getBuffSourceId() == sourceid) { mbsvh.bestApplied = true; effects.remove(mbs); - + if (mbs == BuffStat.RECOVERY) { if (recoveryTask != null) { recoveryTask.cancel(false); @@ -3717,7 +3711,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { getMap().broadcastMessage(PacketCreator.removeSummon(summon, true), summon.getPosition()); getMap().removeMapObject(summon); removeVisibleMapObject(summon); - + summons.remove(summonId); if (summon.isPuppet()) { map.removePlayerPuppet(this); @@ -3736,18 +3730,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { dragonBloodSchedule.cancel(false); dragonBloodSchedule = null; } else if (mbs == BuffStat.HPREC || mbs == BuffStat.MPREC) { - if(mbs == BuffStat.HPREC) { + if (mbs == BuffStat.HPREC) { extraHpRec = 0; } else { extraMpRec = 0; } - + if (extraRecoveryTask != null) { extraRecoveryTask.cancel(false); extraRecoveryTask = null; } - - if(extraHpRec != 0 || extraMpRec != 0) { + + if (extraHpRec != 0 || extraMpRec != 0) { startExtraTaskInternal(extraHpRec, extraMpRec, extraRecInterval); } } @@ -3759,14 +3753,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void cancelEffect(int itemId) { cancelEffect(ii.getItemEffect(itemId), false, -1); } public boolean cancelEffect(MapleStatEffect effect, boolean overwrite, long startTime) { boolean ret; - + prtLock.lock(); effLock.lock(); try { @@ -3775,7 +3769,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); prtLock.unlock(); } - + if (effect.isMagicDoor() && ret) { prtLock.lock(); effLock.lock(); @@ -3788,10 +3782,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + return ret; } - + private static MapleStatEffect getEffectFromBuffSource(Map buffSource) { try { return buffSource.entrySet().iterator().next().getValue().effect; @@ -3799,10 +3793,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return null; } } - + private boolean isUpdatingEffect(Set activeEffects, MapleStatEffect mse) { - if (mse == null) return false; - + if (mse == null) { + return false; + } + // thanks xinyifly for noticing "Speed Infusion" crashing game when updating buffs during map transition boolean active = mse.isActive(this); if (active) { @@ -3811,17 +3807,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return activeEffects.contains(mse); } } - + public void updateActiveEffects() { effLock.lock(); // thanks davidlafriniere, maple006, RedHat for pointing a deadlock occurring here try { Set updatedBuffs = new LinkedHashSet<>(); Set activeEffects = new LinkedHashSet<>(); - + for (MapleBuffStatValueHolder mse : effects.values()) { activeEffects.add(mse.effect); } - + for (Map buff : buffEffects.values()) { MapleStatEffect mse = getEffectFromBuffSource(buff); if (isUpdatingEffect(activeEffects, mse)) { @@ -3830,26 +3826,26 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + for (BuffStat mbs : updatedBuffs) { effects.remove(mbs); } - + updateEffects(updatedBuffs); } finally { effLock.unlock(); } } - + private void updateEffects(Set removedStats) { effLock.lock(); chrLock.lock(); try { Set retrievedStats = new LinkedHashSet<>(); - + for (BuffStat mbs : removedStats) { fetchBestEffectFromItemEffectHolder(mbs); - + MapleBuffStatValueHolder mbsvh = effects.get(mbs); if (mbsvh != null) { for (Pair statup : mbsvh.effect.getStatups()) { @@ -3857,23 +3853,23 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + propagateBuffEffectUpdates(new LinkedHashMap>(), retrievedStats, removedStats); } finally { chrLock.unlock(); effLock.unlock(); } } - + private boolean cancelEffect(MapleStatEffect effect, boolean overwrite, long startTime, boolean firstCancel) { Set removedStats = new LinkedHashSet<>(); dropBuffStats(cancelEffectInternal(effect, overwrite, startTime, removedStats)); updateLocalStats(); updateEffects(removedStats); - + return !removedStats.isEmpty(); } - + private List> cancelEffectInternal(MapleStatEffect effect, boolean overwrite, long startTime, Set removedStats) { Map buffstats = null; BuffStat ombs; @@ -3881,35 +3877,35 @@ public class MapleCharacter extends AbstractMapleCharacterObject { buffstats = extractCurrentBuffStats(effect); } else if ((ombs = getSingletonStatupFromEffect(effect)) != null) { // removing all effects of a buff having non-shareable buff stat. MapleBuffStatValueHolder mbsvh = effects.get(ombs); - if(mbsvh != null) { + if (mbsvh != null) { buffstats = extractCurrentBuffStats(mbsvh.effect); } } - + if (buffstats == null) { // all else, is dropping ALL current statups that uses same stats as the given effect buffstats = extractLeastRelevantStatEffectsIfFull(effect); } - + if (effect.isMapChair()) { stopChairTask(); } - + List> toCancel = deregisterBuffStats(buffstats); if (effect.isMonsterRiding()) { this.getClient().getWorldServer().unregisterMountHunger(this); this.getMount().setActive(false); } - + if (!overwrite) { removedStats.addAll(buffstats.keySet()); } - + return toCancel; } public void cancelEffectFromBuffStat(BuffStat stat) { MapleBuffStatValueHolder effect; - + effLock.lock(); chrLock.lock(); try { @@ -3922,17 +3918,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cancelEffect(effect.effect, false, -1); } } - + public void cancelBuffStats(BuffStat stat) { effLock.lock(); try { List> cancelList = new LinkedList<>(); - + chrLock.lock(); try { - for(Entry> bel : this.buffEffects.entrySet()) { + for (Entry> bel : this.buffEffects.entrySet()) { MapleBuffStatValueHolder beli = bel.getValue().get(stat); - if(beli != null) { + if (beli != null) { cancelList.add(new Pair<>(bel.getKey(), beli)); } } @@ -3941,7 +3937,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } Map buffStatList = new LinkedHashMap<>(); - for(Pair p : cancelList) { + for (Pair p : cancelList) { buffStatList.put(stat, p.getRight()); extractBuffValue(p.getLeft(), stat); dropBuffStats(deregisterBuffStats(buffStatList)); @@ -3949,45 +3945,45 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { effLock.unlock(); } - + cancelPlayerBuffs(Arrays.asList(stat)); } - + private Map extractCurrentBuffStats(MapleStatEffect effect) { chrLock.lock(); try { Map stats = new LinkedHashMap<>(); Map buffList = buffEffects.remove(effect.getBuffSourceId()); - - if(buffList != null) { + + if (buffList != null) { for (Entry stateffect : buffList.entrySet()) { stats.put(stateffect.getKey(), stateffect.getValue()); - buffEffectsCount.put(stateffect.getKey(), (byte)(buffEffectsCount.get(stateffect.getKey()) - 1)); + buffEffectsCount.put(stateffect.getKey(), (byte) (buffEffectsCount.get(stateffect.getKey()) - 1)); } } - + return stats; } finally { chrLock.unlock(); } } - + private Map extractLeastRelevantStatEffectsIfFull(MapleStatEffect effect) { Map extractedStatBuffs = new LinkedHashMap<>(); - + chrLock.lock(); try { Map stats = new LinkedHashMap<>(); Map minStatBuffs = new LinkedHashMap<>(); - - for(Entry> mbsvhi : buffEffects.entrySet()) { - for(Entry mbsvhe : mbsvhi.getValue().entrySet()) { + + for (Entry> mbsvhi : buffEffects.entrySet()) { + for (Entry mbsvhe : mbsvhi.getValue().entrySet()) { BuffStat mbs = mbsvhe.getKey(); Byte b = stats.get(mbs); - - if(b != null) { + + if (b != null) { stats.put(mbs, (byte) (b + 1)); - if(mbsvhe.getValue().value < minStatBuffs.get(mbs).value) { + if (mbsvhe.getValue().value < minStatBuffs.get(mbs).value) { minStatBuffs.put(mbs, mbsvhe.getValue()); } } else { @@ -3996,23 +3992,23 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + Set effectStatups = new LinkedHashSet<>(); - for(Pair efstat : effect.getStatups()) { + for (Pair efstat : effect.getStatups()) { effectStatups.add(efstat.getLeft()); } - - for(Entry it : stats.entrySet()) { + + for (Entry it : stats.entrySet()) { boolean uniqueBuff = isSingletonStatup(it.getKey()); - - if(it.getValue() >= (!uniqueBuff ? YamlConfig.config.server.MAX_MONITORED_BUFFSTATS : 1) && effectStatups.contains(it.getKey())) { + + if (it.getValue() >= (!uniqueBuff ? YamlConfig.config.server.MAX_MONITORED_BUFFSTATS : 1) && effectStatups.contains(it.getKey())) { MapleBuffStatValueHolder mbsvh = minStatBuffs.get(it.getKey()); - + Map lpbe = buffEffects.get(mbsvh.effect.getBuffSourceId()); lpbe.remove(it.getKey()); - buffEffectsCount.put(it.getKey(), (byte)(buffEffectsCount.get(it.getKey()) - 1)); - - if(lpbe.isEmpty()) { + buffEffectsCount.put(it.getKey(), (byte) (buffEffectsCount.get(it.getKey()) - 1)); + + if (lpbe.isEmpty()) { buffEffects.remove(mbsvh.effect.getBuffSourceId()); } extractedStatBuffs.put(it.getKey(), mbsvh); @@ -4021,10 +4017,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { chrLock.unlock(); } - + return extractedStatBuffs; } - + private void cancelInactiveBuffStats(Set retrievedStats, Set removedStats) { List inactiveStats = new LinkedList<>(); for (BuffStat mbs : removedStats) { @@ -4032,22 +4028,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { inactiveStats.add(mbs); } } - + if (!inactiveStats.isEmpty()) { sendPacket(PacketCreator.cancelBuff(inactiveStats)); getMap().broadcastMessage(this, PacketCreator.cancelForeignBuff(getId(), inactiveStats), false); } } - + private static Map topologicalSortLeafStatCount(Map> buffStack) { Map leafBuffCount = new LinkedHashMap<>(); - + for (Entry> e : buffStack.entrySet()) { Stack mseStack = e.getValue(); if (mseStack.isEmpty()) { continue; } - + MapleStatEffect mse = mseStack.peek(); Integer count = leafBuffCount.get(mse); if (count == null) { @@ -4056,74 +4052,76 @@ public class MapleCharacter extends AbstractMapleCharacterObject { leafBuffCount.put(mse, count + 1); } } - + return leafBuffCount; } - + private static List topologicalSortRemoveLeafStats(Map> stackedBuffStats, Map> buffStack, Map leafStatCount) { List clearedStatEffects = new LinkedList<>(); Set clearedStats = new LinkedHashSet<>(); - + for (Entry e : leafStatCount.entrySet()) { MapleStatEffect mse = e.getKey(); - + if (stackedBuffStats.get(mse).size() <= e.getValue()) { clearedStatEffects.add(mse); - + for (BuffStat mbs : stackedBuffStats.get(mse)) { clearedStats.add(mbs); } } } - + for (BuffStat mbs : clearedStats) { MapleStatEffect mse = buffStack.get(mbs).pop(); stackedBuffStats.get(mse).remove(mbs); } - + return clearedStatEffects; } - + private static void topologicalSortRebaseLeafStats(Map> stackedBuffStats, Map> buffStack) { for (Entry> e : buffStack.entrySet()) { Stack mseStack = e.getValue(); - + if (!mseStack.isEmpty()) { MapleStatEffect mse = mseStack.pop(); stackedBuffStats.get(mse).remove(e.getKey()); } } } - + private static List topologicalSortEffects(Map>> buffEffects) { Map> stackedBuffStats = new LinkedHashMap<>(); Map> buffStack = new LinkedHashMap<>(); - + for (Entry>> e : buffEffects.entrySet()) { BuffStat mbs = e.getKey(); - + Stack mbsStack = new Stack<>(); buffStack.put(mbs, mbsStack); - + for (Pair emse : e.getValue()) { MapleStatEffect mse = emse.getLeft(); mbsStack.push(mse); - + Set mbsStats = stackedBuffStats.get(mse); if (mbsStats == null) { mbsStats = new LinkedHashSet<>(); stackedBuffStats.put(mse, mbsStats); } - + mbsStats.add(mbs); } } - + List buffList = new LinkedList<>(); while (true) { Map leafStatCount = topologicalSortLeafStatCount(buffStack); - if (leafStatCount.isEmpty()) break; - + if (leafStatCount.isEmpty()) { + break; + } + List clearedNodes = topologicalSortRemoveLeafStats(stackedBuffStats, buffStack, leafStatCount); if (clearedNodes.isEmpty()) { topologicalSortRebaseLeafStats(stackedBuffStats, buffStack); @@ -4131,54 +4129,53 @@ public class MapleCharacter extends AbstractMapleCharacterObject { buffList.addAll(clearedNodes); } } - + return buffList; } - + private static List sortEffectsList(Map updateEffectsList) { Map>> buffEffects = new LinkedHashMap<>(); - + for (Entry p : updateEffectsList.entrySet()) { MapleStatEffect mse = p.getKey(); - + for (Pair statup : mse.getStatups()) { BuffStat stat = statup.getLeft(); - + List> statBuffs = buffEffects.get(stat); if (statBuffs == null) { statBuffs = new ArrayList<>(); buffEffects.put(stat, statBuffs); } - + statBuffs.add(new Pair<>(mse, statup.getRight())); } } - + Comparator cmp = new Comparator>() { @Override - public int compare(Pair o1, Pair o2) - { + public int compare(Pair o1, Pair o2) { return o2.getRight().compareTo(o1.getRight()); } }; - + for (Entry>> statBuffs : buffEffects.entrySet()) { Collections.sort(statBuffs.getValue(), cmp); } - + return topologicalSortEffects(buffEffects); } - + private List>> propagatePriorityBuffEffectUpdates(Set retrievedStats) { List>> priorityUpdateEffects = new LinkedList<>(); Map yokeStats = new LinkedHashMap<>(); - + // priority buffsources: override buffstats for the client to perceive those as "currently buffed" Set mbsvhList = new LinkedHashSet<>(); for (MapleBuffStatValueHolder mbsvh : getAllStatups()) { mbsvhList.add(mbsvh); } - + for (MapleBuffStatValueHolder mbsvh : mbsvhList) { MapleStatEffect mse = mbsvh.effect; int buffSourceId = mse.getBuffSourceId(); @@ -4187,126 +4184,126 @@ public class MapleCharacter extends AbstractMapleCharacterObject { BuffStat mbs = ps.getLeft(); if (retrievedStats.contains(mbs)) { MapleBuffStatValueHolder mbsvhe = effects.get(mbs); - + // this shouldn't even be null... //if (mbsvh != null) { - yokeStats.put(mbsvh, mbsvhe.effect); + yokeStats.put(mbsvh, mbsvhe.effect); //} } } } } - + for (Entry e : yokeStats.entrySet()) { MapleBuffStatValueHolder mbsvhPriority = e.getKey(); MapleStatEffect mseActive = e.getValue(); - + priorityUpdateEffects.add(new Pair<>(mseActive.getBuffSourceId(), new Pair<>(mbsvhPriority.effect, mbsvhPriority.startTime))); } - + return priorityUpdateEffects; } - + private void propagateBuffEffectUpdates(Map> retrievedEffects, Set retrievedStats, Set removedStats) { cancelInactiveBuffStats(retrievedStats, removedStats); if (retrievedStats.isEmpty()) { return; } - + Map> maxBuffValue = new LinkedHashMap<>(); - for(BuffStat mbs : retrievedStats) { + for (BuffStat mbs : retrievedStats) { MapleBuffStatValueHolder mbsvh = effects.get(mbs); - if(mbsvh != null) { + if (mbsvh != null) { retrievedEffects.put(mbsvh.effect.getBuffSourceId(), new Pair<>(mbsvh.effect, mbsvh.startTime)); } - - maxBuffValue.put(mbs, new Pair<>(Integer.MIN_VALUE, (MapleStatEffect) null)); + + maxBuffValue.put(mbs, new Pair<>(Integer.MIN_VALUE, null)); } - + Map updateEffects = new LinkedHashMap<>(); - + List recalcMseList = new LinkedList<>(); - for(Entry> re : retrievedEffects.entrySet()) { + for (Entry> re : retrievedEffects.entrySet()) { recalcMseList.add(re.getValue().getLeft()); } - + boolean mageJob = this.getJobStyle() == MapleJob.MAGICIAN; do { List mseList = recalcMseList; recalcMseList = new LinkedList<>(); - - for(MapleStatEffect mse : mseList) { + + for (MapleStatEffect mse : mseList) { int maxEffectiveStatup = Integer.MIN_VALUE; - for(Pair st : mse.getStatups()) { + for (Pair st : mse.getStatups()) { BuffStat mbs = st.getLeft(); - + boolean relevantStatup = true; - if(mbs == BuffStat.WATK) { // not relevant for mages - if(mageJob) { + if (mbs == BuffStat.WATK) { // not relevant for mages + if (mageJob) { relevantStatup = false; } - } else if(mbs == BuffStat.MATK) { // not relevant for non-mages - if(!mageJob) { + } else if (mbs == BuffStat.MATK) { // not relevant for non-mages + if (!mageJob) { relevantStatup = false; } } - + Pair mbv = maxBuffValue.get(mbs); - if(mbv == null) { + if (mbv == null) { continue; } - - if(mbv.getLeft() < st.getRight()) { + + if (mbv.getLeft() < st.getRight()) { MapleStatEffect msbe = mbv.getRight(); - if(msbe != null) { + if (msbe != null) { recalcMseList.add(msbe); } - + maxBuffValue.put(mbs, new Pair<>(st.getRight(), mse)); - - if(relevantStatup) { - if(maxEffectiveStatup < st.getRight()) { + + if (relevantStatup) { + if (maxEffectiveStatup < st.getRight()) { maxEffectiveStatup = st.getRight(); } } } } - + updateEffects.put(mse, maxEffectiveStatup); } - } while(!recalcMseList.isEmpty()); - + } while (!recalcMseList.isEmpty()); + List updateEffectsList = sortEffectsList(updateEffects); - + List>> toUpdateEffects = new LinkedList<>(); - for(MapleStatEffect mse : updateEffectsList) { + for (MapleStatEffect mse : updateEffectsList) { toUpdateEffects.add(new Pair<>(mse.getBuffSourceId(), retrievedEffects.get(mse.getBuffSourceId()))); } - + List> activeStatups = new LinkedList<>(); - for(Pair> lmse: toUpdateEffects) { + for (Pair> lmse : toUpdateEffects) { Pair msel = lmse.getRight(); - - for(Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { + + for (Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { activeStatups.add(statup); } - + msel.getLeft().updateBuffEffect(this, activeStatups, msel.getRight()); activeStatups.clear(); } - + List>> priorityEffects = propagatePriorityBuffEffectUpdates(retrievedStats); - for(Pair> lmse: priorityEffects) { + for (Pair> lmse : priorityEffects) { Pair msel = lmse.getRight(); - - for(Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { + + for (Pair statup : getActiveStatupsFromSourceid(lmse.getLeft())) { activeStatups.add(statup); } - + msel.getLeft().updateBuffEffect(this, activeStatups, msel.getRight()); activeStatups.clear(); } - + if (this.isRidingBattleship()) { List> statups = new ArrayList<>(1); statups.add(new Pair<>(BuffStat.MONSTER_RIDING, 0)); @@ -4314,19 +4311,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { this.announceBattleshipHp(); } } - + private static BuffStat getSingletonStatupFromEffect(MapleStatEffect mse) { - for(Pair mbs : mse.getStatups()) { - if(isSingletonStatup(mbs.getLeft())) { + for (Pair mbs : mse.getStatups()) { + if (isSingletonStatup(mbs.getLeft())) { return mbs.getLeft(); } } - + return null; } - + private static boolean isSingletonStatup(BuffStat mbs) { - switch(mbs) { //HPREC and MPREC are supposed to be singleton + switch (mbs) { //HPREC and MPREC are supposed to be singleton case COUPON_EXP1: case COUPON_EXP2: case COUPON_EXP3: @@ -4349,24 +4346,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { case SPEED: case JUMP: return false; - + default: return true; } } - + private static boolean isPriorityBuffSourceid(int sourceid) { - switch(sourceid) { + switch (sourceid) { case -2022631: case -2022632: case -2022633: return true; - + default: return false; } } - + private void addItemEffectHolderCount(BuffStat stat) { Byte val = buffEffectsCount.get(stat); if (val != null) { @@ -4377,7 +4374,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { buffEffectsCount.put(stat, val); } - + public void registerEffect(MapleStatEffect effect, long starttime, long expirationtime, boolean isSilent) { if (effect.isDragonBlood()) { prepareDragonBlood(effect); @@ -4402,11 +4399,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (awayFromWorld.get()) { return; } - + addHP(healEffect.getHp()); sendPacket(PacketCreator.showOwnBuffEffect(beholder, 2)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.summonSkill(getId(), beholder, 5), true); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showOwnBuffEffect(beholder, 2), false); + getMap().broadcastMessage(Character.this, PacketCreator.summonSkill(getId(), beholder, 5), true); + getMap().broadcastMessage(Character.this, PacketCreator.showOwnBuffEffect(beholder, 2), false); } }, healInterval, healInterval); } @@ -4420,24 +4417,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (awayFromWorld.get()) { return; } - - buffEffect.applyTo(MapleCharacter.this); + + buffEffect.applyTo(Character.this); sendPacket(PacketCreator.showOwnBuffEffect(beholder, 2)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.summonSkill(getId(), beholder, (int) (Math.random() * 3) + 6), true); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBuffEffect(getId(), beholder, 2), false); + getMap().broadcastMessage(Character.this, PacketCreator.summonSkill(getId(), beholder, (int) (Math.random() * 3) + 6), true); + getMap().broadcastMessage(Character.this, PacketCreator.showBuffEffect(getId(), beholder, 2), false); } }, buffInterval, buffInterval); } } else if (effect.isRecovery()) { int healInterval = (YamlConfig.config.server.USE_ULTRA_RECOVERY) ? 2000 : 5000; final byte heal = (byte) effect.getX(); - + chrLock.lock(); try { - if(recoveryTask != null) { + if (recoveryTask != null) { recoveryTask.cancel(false); } - + recoveryTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { @@ -4457,23 +4454,23 @@ public class MapleCharacter extends AbstractMapleCharacterObject { addHP(heal); sendPacket(PacketCreator.showOwnRecovery(heal)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, heal), false); + getMap().broadcastMessage(Character.this, PacketCreator.showRecovery(id, heal), false); } }, healInterval, healInterval); } finally { chrLock.unlock(); } } else if (effect.getHpRRate() > 0 || effect.getMpRRate() > 0) { - if(effect.getHpRRate() > 0) { + if (effect.getHpRRate() > 0) { extraHpRec = effect.getHpR(); extraRecInterval = effect.getHpRRate(); } - - if(effect.getMpRRate() > 0) { + + if (effect.getMpRRate() > 0) { extraMpRec = effect.getMpR(); extraRecInterval = effect.getMpRRate(); } - + chrLock.lock(); try { stopExtraTask(); @@ -4481,11 +4478,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { chrLock.unlock(); } - + } else if (effect.isMapChair()) { startChairTask(); } - + prtLock.lock(); effLock.lock(); chrLock.lock(); @@ -4493,35 +4490,35 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Integer sourceid = effect.getBuffSourceId(); Map toDeploy; Map appliedStatups = new LinkedHashMap<>(); - - for(Pair ps : effect.getStatups()) { + + for (Pair ps : effect.getStatups()) { appliedStatups.put(ps.getLeft(), new MapleBuffStatValueHolder(effect, starttime, ps.getRight())); } - + boolean active = effect.isActive(this); - if(YamlConfig.config.server.USE_BUFF_MOST_SIGNIFICANT) { + if (YamlConfig.config.server.USE_BUFF_MOST_SIGNIFICANT) { toDeploy = new LinkedHashMap<>(); Map> retrievedEffects = new LinkedHashMap<>(); Set retrievedStats = new LinkedHashSet<>(); for (Entry statup : appliedStatups.entrySet()) { MapleBuffStatValueHolder mbsvh = effects.get(statup.getKey()); MapleBuffStatValueHolder statMbsvh = statup.getValue(); - - if(active) { - if(mbsvh == null || mbsvh.value < statMbsvh.value || (mbsvh.value == statMbsvh.value && mbsvh.effect.getStatups().size() <= statMbsvh.effect.getStatups().size())) { + + if (active) { + if (mbsvh == null || mbsvh.value < statMbsvh.value || (mbsvh.value == statMbsvh.value && mbsvh.effect.getStatups().size() <= statMbsvh.effect.getStatups().size())) { toDeploy.put(statup.getKey(), statMbsvh); } else { - if(!isSingletonStatup(statup.getKey())) { - for(Pair mbs : mbsvh.effect.getStatups()) { + if (!isSingletonStatup(statup.getKey())) { + for (Pair mbs : mbsvh.effect.getStatups()) { retrievedStats.add(mbs.getLeft()); } } } } - + addItemEffectHolderCount(statup.getKey()); } - + // should also propagate update from buffs shared with priority sourceids Set updated = appliedStatups.keySet(); for (MapleBuffStatValueHolder mbsvh : this.getAllStatups()) { @@ -4533,27 +4530,27 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - - if(!isSilent) { + + if (!isSilent) { addItemEffectHolder(sourceid, expirationtime, appliedStatups); for (Entry statup : toDeploy.entrySet()) { effects.put(statup.getKey(), statup.getValue()); } - + if (active) { retrievedEffects.put(sourceid, new Pair<>(effect, starttime)); } - + propagateBuffEffectUpdates(retrievedEffects, retrievedStats, new LinkedHashSet()); } } else { for (Entry statup : appliedStatups.entrySet()) { addItemEffectHolderCount(statup.getKey()); } - + toDeploy = (active ? appliedStatups : new LinkedHashMap()); } - + addItemEffectHolder(sourceid, expirationtime, appliedStatups); for (Entry statup : toDeploy.entrySet()) { effects.put(statup.getKey(), statup.getValue()); @@ -4563,12 +4560,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); prtLock.unlock(); } - + updateLocalStats(); } - + private static int getJobMapChair(MapleJob job) { - switch(job.getId() / 1000) { + switch (job.getId() / 1000) { case 0: return Beginner.MAP_CHAIR; case 1: @@ -4577,60 +4574,60 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return Legend.MAP_CHAIR; } } - + public boolean unregisterChairBuff() { if (!YamlConfig.config.server.USE_CHAIR_EXTRAHEAL) { return false; } - + int skillId = getJobMapChair(job); int skillLv = getSkillLevel(skillId); - if(skillLv > 0) { + if (skillLv > 0) { MapleStatEffect mapChairSkill = SkillFactory.getSkill(skillId).getEffect(skillLv); return cancelEffect(mapChairSkill, false, -1); } - + return false; } - + public boolean registerChairBuff() { if (!YamlConfig.config.server.USE_CHAIR_EXTRAHEAL) { return false; } - + int skillId = getJobMapChair(job); int skillLv = getSkillLevel(skillId); - if(skillLv > 0) { + if (skillLv > 0) { MapleStatEffect mapChairSkill = SkillFactory.getSkill(skillId).getEffect(skillLv); mapChairSkill.applyTo(this); return true; } - + return false; } - + public int getChair() { return chair.get(); } - + public String getChalkboard() { return this.chalktext; } - + public MapleClient getClient() { return client; } - + public AbstractPlayerInteraction getAbstractPlayerInteraction() { return client.getAbstractPlayerInteraction(); } - + private List getQuests() { synchronized (quests) { return new ArrayList<>(quests.values()); } } - + public final List getCompletedQuests() { List ret = new LinkedList<>(); for (MapleQuestStatus qs : getQuests()) { @@ -4641,7 +4638,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return Collections.unmodifiableList(ret); } - + public List getCrushRings() { Collections.sort(crushRings); return crushRings; @@ -4683,7 +4680,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + public MapleDoor getPlayerDoor() { prtLock.lock(); try { @@ -4692,7 +4689,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + public MapleDoor getMainTownDoor() { for (MapleDoor door : getDoors()) { if (door.getTownPortal().getId() == 0x80) { @@ -4702,7 +4699,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return null; } - + public void applyPartyDoor(MapleDoor door, boolean partyUpdate) { MapleParty chrParty; prtLock.lock(); @@ -4710,7 +4707,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (!partyUpdate) { pdoor = door; } - + chrParty = getParty(); if (chrParty != null) { chrParty.addDoor(id, door); @@ -4718,21 +4715,21 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { prtLock.unlock(); } - + silentPartyUpdateInternal(chrParty); } - + public MapleDoor removePartyDoor(boolean partyUpdate) { MapleDoor ret = null; MapleParty chrParty; - + prtLock.lock(); try { chrParty = getParty(); if (chrParty != null) { chrParty.removeDoor(id); } - + if (!partyUpdate) { ret = pdoor; pdoor = null; @@ -4740,11 +4737,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { prtLock.unlock(); } - + silentPartyUpdateInternal(chrParty); return ret; } - + private void removePartyDoor(MapleParty formerParty) { // player is no longer registered at this party formerParty.removeDoor(id); } @@ -4761,10 +4758,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { evtLock.unlock(); } } - + public MapleMarriage getMarriageInstance() { EventInstanceManager eim = getEventInstance(); - + if (eim != null || !(eim instanceof MapleMarriage)) { return (MapleMarriage) eim; } else { @@ -4776,7 +4773,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.lock(); try { Set petExclude = excluded.get(petId); - + if (petExclude != null) { petExclude.clear(); } else { @@ -4786,7 +4783,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void addExcluded(int petId, int x) { chrLock.lock(); try { @@ -4795,18 +4792,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public void commitExcludedItems() { Map> petExcluded = this.getExcluded(); - + chrLock.lock(); try { excludedItems.clear(); } finally { chrLock.unlock(); } - - for(Map.Entry> pe : petExcluded.entrySet()) { + + for (Map.Entry> pe : petExcluded.entrySet()) { byte petIndex = this.getPetIndex(pe.getKey()); if (petIndex < 0) { continue; @@ -4818,7 +4815,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.lock(); try { - for(Integer itemid: exclItems) { + for (Integer itemid : exclItems) { excludedItems.add(itemid); } } finally { @@ -4827,10 +4824,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void exportExcludedItems(MapleClient c) { Map> petExcluded = this.getExcluded(); - for(Map.Entry> pe : petExcluded.entrySet()) { + for (Map.Entry> pe : petExcluded.entrySet()) { byte petIndex = this.getPetIndex(pe.getKey()); if (petIndex < 0) { continue; @@ -4842,7 +4839,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public Map> getExcluded() { chrLock.lock(); try { @@ -4851,7 +4848,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { chrLock.unlock(); } } - + public Set getExcludedItems() { chrLock.lock(); try { @@ -4872,69 +4869,69 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public boolean hasNoviceExpRate() { return YamlConfig.config.server.USE_ENFORCE_NOVICE_EXPRATE && isBeginnerJob() && level < 11; } - + public int getExpRate() { if (hasNoviceExpRate()) { // base exp rate 1x for early levels idea thanks to Vcoc return 1; } - + return expRate; } - + public int getCouponExpRate() { return expCoupon; } - + public int getRawExpRate() { return expRate / (expCoupon * getWorldServer().getExpRate()); } - + public int getDropRate() { return dropRate; } - + public int getCouponDropRate() { return dropCoupon; } - + public int getRawDropRate() { return dropRate / (dropCoupon * getWorldServer().getDropRate()); } - + public int getBossDropRate() { World w = getWorldServer(); return (dropRate / w.getDropRate()) * w.getBossDropRate(); } - + public int getMesoRate() { return mesoRate; } - + public int getCouponMesoRate() { return mesoCoupon; } - + public int getRawMesoRate() { return mesoRate / (mesoCoupon * getWorldServer().getMesoRate()); } - + public int getQuestExpRate() { if (hasNoviceExpRate()) { return 1; } - + World w = getWorldServer(); return w.getExpRate() * w.getQuestRate(); } - + public int getQuestMesoRate() { World w = getWorldServer(); return w.getMesoRate() * w.getQuestRate(); } - + public float getCardRate(int itemid) { float rate = 100.0f; - + if (itemid == 0) { MapleStatEffect mseMeso = getBuffEffect(BuffStat.MESO_UP_BY_ITEM); if (mseMeso != null) { @@ -4946,10 +4943,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { rate += mseItem.getCardRate(mapid, itemid); } } - + return rate / 100; } - + public int getFace() { return face; } @@ -4959,16 +4956,21 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public MapleFamily getFamily() { - if(familyEntry != null) return familyEntry.getFamily(); - else return null; + if (familyEntry != null) { + return familyEntry.getFamily(); + } else { + return null; + } } - + public MapleFamilyEntry getFamilyEntry() { return familyEntry; } - + public void setFamilyEntry(MapleFamilyEntry entry) { - if(entry != null) setFamilyId(entry.getFamily().getID()); + if (entry != null) { + setFamilyId(entry.getFamily().getID()); + } this.familyEntry = entry; } @@ -4979,11 +4981,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public boolean getFinishedDojoTutorial() { return finishedDojoTutorial; } - + public void setUsedStorage() { usedStorage = true; } - + public List getFriendshipRings() { Collections.sort(friendshipRings); return friendshipRings; @@ -5005,16 +5007,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return null; } } - + public MapleAlliance getAlliance() { - if(mgc != null) { + if (mgc != null) { try { return Server.getInstance().getAlliance(getGuild().getAllianceId()); } catch (Exception ex) { ex.printStackTrace(); } } - + return null; } @@ -5055,7 +5057,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return -1; } - + public static int getIdByName(String name) { final int id; try (Connection con = DatabaseConnection.getConnection(); @@ -5108,14 +5110,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return (inventory[ItemConstants.getInventoryType(itemid).ordinal()].findById(itemid) != null) || (checkEquipped && inventory[InventoryType.EQUIPPED.ordinal()].findById(itemid) != null); } - + public boolean haveItemEquipped(int itemid) { return (inventory[InventoryType.EQUIPPED.ordinal()].findById(itemid) != null); } - + public boolean haveWeddingRing() { - int rings[] = {1112806, 1112803, 1112807, 1112809}; - + int[] rings = {1112806, 1112803, 1112807, 1112809}; + for (int ringid : rings) { if (haveItemWithId(ringid, true)) { return true; @@ -5124,7 +5126,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } - + public int getItemQuantity(int itemid, boolean checkEquipped) { int count = inventory[ItemConstants.getInventoryType(itemid).ordinal()].countById(itemid); if (checkEquipped) { @@ -5132,7 +5134,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return count; } - + public int getCleanItemQuantity(int itemid, boolean checkEquipped) { int count = inventory[ItemConstants.getInventoryType(itemid).ordinal()].countNotOwnedById(itemid); if (checkEquipped) { @@ -5172,11 +5174,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int getLevel() { return level; } - + public int getFh() { Point pos = this.getPosition(); pos.y -= 6; - + if (map.getFootholds().findBelow(pos) == null) { return 0; } else { @@ -5194,7 +5196,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public MapleRing getMarriageRing() { return partnerId > 0 ? marriageRing : null; } - + public int getMasterLevel(int skill) { SkillEntry ret = skills.get(SkillFactory.getSkill(skill)); if (ret == null) { @@ -5209,7 +5211,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return skills.get(skill).masterlevel; } - + public int getTotalStr() { return localstr; } @@ -5229,23 +5231,23 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int getTotalMagic() { return localmagic; } - + public int getTotalWatk() { return localwatk; } - + public int getMaxClassLevel() { return isCygnus() ? 120 : 200; } - + public int getMaxLevel() { - if(!YamlConfig.config.server.USE_ENFORCE_JOB_LEVEL_RANGE || isGmJob()) { + if (!YamlConfig.config.server.USE_ENFORCE_JOB_LEVEL_RANGE || isGmJob()) { return getMaxClassLevel(); } - + return GameConstants.getJobMaxLevel(job); } - + public int getMeso() { return meso.get(); } @@ -5253,7 +5255,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int getMerchantMeso() { return merchantmeso; } - + public int getMerchantNetMeso() { int elapsedDays = 0; @@ -5274,7 +5276,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { elapsedDays = 100; } - long netMeso = (long) merchantmeso; // negative mesos issues found thanks to Flash, Vcoc + long netMeso = merchantmeso; // negative mesos issues found thanks to Flash, Vcoc netMeso = (netMeso * (100 - elapsedDays)) / 100; return (int) netMeso; } @@ -5290,7 +5292,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public MapleGuildCharacter getMGC() { return mgc; } - + public void setMGC(MapleGuildCharacter mgc) { this.mgc = mgc; } @@ -5305,37 +5307,37 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setMPC(MaplePartyCharacter mpc) { this.mpc = mpc; } - + public int getTargetHpBarHash() { return this.targetHpBarHash; } - + public void setTargetHpBarHash(int mobHash) { this.targetHpBarHash = mobHash; } - + public long getTargetHpBarTime() { return this.targetHpBarTime; } - + public void setTargetHpBarTime(long timeNow) { this.targetHpBarTime = timeNow; } - + public void setPlayerAggro(int mobHash) { setTargetHpBarHash(mobHash); setTargetHpBarTime(System.currentTimeMillis()); } - + public void resetPlayerAggro() { - if(getWorldServer().unregisterDisabledServerMessage(id)) { + if (getWorldServer().unregisterDisabledServerMessage(id)) { client.announceServerMessage(); } - + setTargetHpBarHash(0); setTargetHpBarTime(0); } - + public MapleMiniGame getMiniGame() { return miniGame; } @@ -5428,15 +5430,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - - public List getPartyMembersOnline() { - List list = new LinkedList<>(); - + + public List getPartyMembersOnline() { + List list = new LinkedList<>(); + prtLock.lock(); try { - if(party != null) { - for(MaplePartyCharacter mpc: party.getMembers()) { - MapleCharacter mc = mpc.getPlayer(); + if (party != null) { + for (MaplePartyCharacter mpc : party.getMembers()) { + Character mc = mpc.getPlayer(); if (mc != null) { list.add(mc); } @@ -5445,22 +5447,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { prtLock.unlock(); } - + return list; } - - public List getPartyMembersOnSameMap() { - List list = new LinkedList<>(); + + public List getPartyMembersOnSameMap() { + List list = new LinkedList<>(); int thisMapHash = this.getMap().hashCode(); - + prtLock.lock(); try { - if(party != null) { - for(MaplePartyCharacter mpc: party.getMembers()) { - MapleCharacter chr = mpc.getPlayer(); + if (party != null) { + for (MaplePartyCharacter mpc : party.getMembers()) { + Character chr = mpc.getPlayer(); if (chr != null) { MapleMap chrMap = chr.getMap(); - if(chrMap != null && chrMap.hashCode() == thisMapHash && chr.isLoggedinWorld()) { + if (chrMap != null && chrMap.hashCode() == thisMapHash && chr.isLoggedinWorld()) { list.add(chr); } } @@ -5469,49 +5471,49 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { prtLock.unlock(); } - + return list; } - - public boolean isPartyMember(MapleCharacter chr) { + + public boolean isPartyMember(Character chr) { return isPartyMember(chr.getId()); } - + public boolean isPartyMember(int cid) { prtLock.lock(); try { - if(party != null) { + if (party != null) { return party.getMemberById(cid) != null; } } finally { prtLock.unlock(); } - + return false; } - + public MaplePlayerShop getPlayerShop() { return playerShop; } - + public MapleRockPaperScissor getRPS() { // thanks inhyuk for suggesting RPS addition return rps; } - + public void setGMLevel(int level) { this.gmLevel = Math.min(level, 6); this.gmLevel = Math.max(level, 0); - + whiteChat = gmLevel >= 4; // thanks ozanrijen for suggesting default white chat } - + public void closePartySearchInteractions() { this.getWorldServer().getPartySearchCoordinator().unregisterPartyLeader(this); if (canRecvPartySearchInvite) { this.getWorldServer().getPartySearchCoordinator().detachPlayer(this); } } - + public void closePlayerInteractions() { closeNpcShop(); closeTrade(); @@ -5520,29 +5522,29 @@ public class MapleCharacter extends AbstractMapleCharacterObject { closeRPS(); closeHiredMerchant(false); closePlayerMessenger(); - + client.closePlayerScriptInteractions(); resetPlayerAggro(); } - + public void closeNpcShop() { setShop(null); } - + public void closeTrade() { MapleTrade.cancelTrade(this, MapleTrade.TradeResult.PARTNER_CANCEL); } - + public void closePlayerShop() { MaplePlayerShop mps = this.getPlayerShop(); if (mps == null) { return; } - + if (mps.isOwner(this)) { mps.setOpen(false); getWorldServer().unregisterPlayerShop(mps); - + for (MaplePlayerShopItem mpsi : mps.getItems()) { if (mpsi.getBundles() >= 2) { Item iItem = mpsi.getItem().copy(); @@ -5558,26 +5560,26 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } this.setPlayerShop(null); } - + public void closeMiniGame(boolean forceClose) { MapleMiniGame game = this.getMiniGame(); if (game == null) { return; } - + if (game.isOwner(this)) { game.closeRoom(forceClose); } else { game.removeVisitor(forceClose, this); } } - + public void closeHiredMerchant(boolean closeMerchant) { MapleHiredMerchant merchant = this.getHiredMerchant(); if (merchant == null) { return; } - + if (closeMerchant) { if (merchant.isOwner(this) && merchant.getItems().isEmpty()) { merchant.forceClose(); @@ -5599,16 +5601,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void closePlayerMessenger() { MapleMessenger m = this.getMessenger(); if (m == null) { return; } - + World w = getWorldServer(); MapleMessengerCharacter messengerplayer = new MapleMessengerCharacter(this, this.getMessengerPosition()); - + w.leaveMessenger(m.getId(), messengerplayer); this.setMessenger(null); this.setMessengerPosition(4); @@ -5627,7 +5629,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (index < 0) { return null; } - + petLock.lock(); try { return pets[index]; @@ -5651,7 +5653,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { petLock.unlock(); } } - + public byte getPetIndex(Pet pet) { petLock.lock(); try { @@ -5682,11 +5684,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public MapleQuestStatus getQuest(final int quest) { return getQuest(MapleQuest.getInstance(quest)); } - + public MapleQuestStatus getQuest(MapleQuest quest) { synchronized (quests) { short questid = quest.getId(); @@ -5698,13 +5700,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return qs; } } - + //---- \/ \/ \/ \/ \/ \/ \/ NOT TESTED \/ \/ \/ \/ \/ \/ \/ \/ \/ ---- - + public final void setQuestAdd(final MapleQuest quest, final byte status, final String customData) { synchronized (quests) { if (!quests.containsKey(quest.getId())) { - final MapleQuestStatus stat = new MapleQuestStatus(quest, MapleQuestStatus.Status.getById((int)status)); + final MapleQuestStatus stat = new MapleQuestStatus(quest, MapleQuestStatus.Status.getById(status)); stat.setCustomData(customData); quests.put(quest.getId(), stat); } @@ -5735,12 +5737,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } //---- /\ /\ /\ /\ /\ /\ /\ NOT TESTED /\ /\ /\ /\ /\ /\ /\ /\ /\ ---- - + public boolean needQuestItem(int questid, int itemid) { if (questid <= 0) { //For non quest items :3 return true; } - + int amountNeeded, questStatus = this.getQuestStatus(questid); if (questStatus == 0) { amountNeeded = MapleQuest.getInstance(questid).getStartItemAmountNeeded(itemid); @@ -5755,7 +5757,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return true; } } - + return getInventory(ItemConstants.getInventoryType(itemid)).countById(itemid) < amountNeeded; } @@ -5770,7 +5772,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void clearSavedLocation(SavedLocationType type) { savedLocations[type.ordinal()] = null; } - + public int peekSavedLocation(String type) { SavedLocation sl = savedLocations[SavedLocationType.fromString(type).ordinal()]; if (sl == null) { @@ -5778,11 +5780,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return sl.getMapId(); } - + public int getSavedLocation(String type) { int m = peekSavedLocation(type); clearSavedLocation(SavedLocationType.fromString(type)); - + return m; } @@ -5797,7 +5799,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public Map getSkills() { return Collections.unmodifiableMap(skills); } - + public int getSkillLevel(int skill) { SkillEntry ret = skills.get(SkillFactory.getSkill(skill)); if (ret == null) { @@ -5845,7 +5847,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return Collections.unmodifiableList(ret); } - + public MapleStatEffect getStatForBuff(BuffStat effect) { effLock.lock(); chrLock.lock(); @@ -5868,19 +5870,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public Collection getSummonsValues() { return summons.values(); } - + public void clearSummons() { summons.clear(); } - + public MapleSummon getSummonByKey(int id) { return summons.get(id); } - + public boolean isSummonsEmpty() { return summons.isEmpty(); } - + public boolean containsSummon(MapleSummon summon) { return summons.containsValue(summon); } @@ -5904,7 +5906,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public int getWorld() { return world; } - + public World getWorldServer() { return Server.getInstance().getWorld(world); } @@ -5919,7 +5921,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { addCooldown(skillid, timeNow, time); } } - + public int gmLevel() { return gmLevel; } @@ -5927,11 +5929,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private void guildUpdate() { mgc.setLevel(level); mgc.setJobId(job.getId()); - + if (this.guildid < 1) { return; } - + try { Server.getInstance().memberLevelJobUpdate(this.mgc); //Server.getInstance().getGuild(guildid, world, mgc).gainGP(40); @@ -5943,7 +5945,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { e.printStackTrace(); } } - + public void handleEnergyChargeGain() { // to get here energychargelevel has to be > 0 Skill energycharge = isCygnus() ? SkillFactory.getSkill(ThunderBreaker.ENERGY_CHARGE) : SkillFactory.getSkill(Marauder.ENERGY_CHARGE); MapleStatEffect ceffect; @@ -5963,7 +5965,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (energybar >= 10000 && energybar < 11000) { energybar = 15000; - final MapleCharacter chr = this; + final Character chr = this; tMan.schedule(new Runnable() { @Override public void run() { @@ -6000,7 +6002,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return script.equals(e); } - public void hasGivenFame(MapleCharacter to) { + public void hasGivenFame(Character to) { lastfametime = System.currentTimeMillis(); lastmonthfameids.add(Integer.valueOf(to.getId())); try (Connection con = DatabaseConnection.getConnection(); @@ -6020,38 +6022,38 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public boolean haveItem(int itemid) { return getItemQuantity(itemid, ItemConstants.isEquipment(itemid)) > 0; } - + public boolean haveCleanItem(int itemid) { return getCleanItemQuantity(itemid, ItemConstants.isEquipment(itemid)) > 0; } - + public boolean hasEmptySlot(int itemId) { return getInventory(ItemConstants.getInventoryType(itemId)).getNextFreeSlot() > -1; } - + public boolean hasEmptySlot(byte invType) { return getInventory(InventoryType.getByType(invType)).getNextFreeSlot() > -1; } public void increaseGuildCapacity() { int cost = MapleGuild.getIncreaseGuildCost(getGuild().getCapacity()); - + if (getMeso() < cost) { dropMessage(1, "You don't have enough mesos."); return; } - - if(Server.getInstance().increaseGuildCapacity(guildid)) { + + if (Server.getInstance().increaseGuildCapacity(guildid)) { gainMeso(-cost, true, false, true); } else { dropMessage(1, "Your guild already reached the maximum capacity of players."); } } - + private boolean canBuyback(int fee, boolean usingMesos) { return (usingMesos ? this.getMeso() : cashshop.getCash(1)) >= fee; } - + private void applyBuybackFee(int fee, boolean usingMesos) { if (usingMesos) { this.gainMeso(-fee); @@ -6059,30 +6061,30 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cashshop.gainCash(1, -fee); } } - + private long getNextBuybackTime() { return lastBuyback + YamlConfig.config.server.BUYBACK_COOLDOWN_MINUTES * 60 * 1000; } - + private boolean isBuybackInvincible() { return Server.getInstance().getCurrentTime() - lastBuyback < 4200; } - + private int getBuybackFee() { float fee = YamlConfig.config.server.BUYBACK_FEE; int grade = Math.min(Math.max(level, 30), 120) - 30; - + fee += (grade * YamlConfig.config.server.BUYBACK_LEVEL_STACK_FEE); if (YamlConfig.config.server.USE_BUYBACK_WITH_MESOS) { fee *= YamlConfig.config.server.BUYBACK_MESO_MULTIPLIER; } - + return (int) Math.floor(fee); } - + public void showBuybackInfo() { String s = "#eBUYBACK STATUS#n\r\n\r\nCurrent buyback fee: #b" + getBuybackFee() + " " + (YamlConfig.config.server.USE_BUYBACK_WITH_MESOS ? "mesos" : "NX") + "#k\r\n\r\n"; - + long timeNow = Server.getInstance().getCurrentTime(); boolean avail = true; if (!isAlive()) { @@ -6096,47 +6098,47 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } s += "\r\n"; } - + if (timeNow < getNextBuybackTime() && avail) { s += "Buyback available in #r" + getTimeRemaining(getNextBuybackTime() - timeNow) + "#k"; s += "\r\n"; } else { s += "Buyback #bavailable#k"; } - + this.showHint(s); } - + private static String getTimeRemaining(long timeLeft) { int seconds = (int) Math.floor(timeLeft / 1000) % 60; - int minutes = (int) Math.floor(timeLeft / (1000*60)) % 60; - + int minutes = (int) Math.floor(timeLeft / (1000 * 60)) % 60; + return (minutes > 0 ? (String.format("%02d", minutes) + " minutes, ") : "") + String.format("%02d", seconds) + " seconds"; } - + public boolean couldBuyback() { // Ronan's buyback system long timeNow = Server.getInstance().getCurrentTime(); - + if (timeNow - lastDeathtime > YamlConfig.config.server.BUYBACK_RETURN_MINUTES * 60 * 1000) { this.dropMessage(5, "The period of time to decide has expired, therefore you are unable to buyback."); return false; } - + long nextBuybacktime = getNextBuybackTime(); if (timeNow < nextBuybacktime) { long timeLeft = nextBuybacktime - timeNow; this.dropMessage(5, "Next buyback available in " + getTimeRemaining(timeLeft) + "."); return false; } - + boolean usingMesos = YamlConfig.config.server.USE_BUYBACK_WITH_MESOS; int fee = getBuybackFee(); - + if (!canBuyback(fee, usingMesos)) { this.dropMessage(5, "You don't have " + fee + " " + (usingMesos ? "mesos" : "NX") + " to buyback."); return false; } - + lastBuyback = timeNow; applyBuybackFee(fee, usingMesos); return true; @@ -6156,12 +6158,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public boolean isGmJob() { int jn = job.getJobNiche(); return jn >= 8 && jn <= 9; } - + public boolean isCygnus() { return getJobType() == 1; } @@ -6195,15 +6197,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + public boolean isGuildLeader() { // true on guild master or jr. master return guildid > 0 && guildRank < 3; } - + public boolean attemptCatchFish(int baitLevel) { return YamlConfig.config.server.USE_FISHING_SYSTEM && GameConstants.isFishingArea(mapid) && this.getPosition().getY() > 0 && ItemConstants.isFishingChair(chair.get()) && this.getWorldServer().registerFisherPlayer(this, baitLevel); } - + public void leaveMap() { releaseControlledMonsters(); visibleMapObjects.clear(); @@ -6211,13 +6213,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (hpDecreaseTask != null) { hpDecreaseTask.cancel(false); } - + AriantColiseum arena = this.getAriantColiseum(); if (arena != null) { arena.leaveArena(this); } } - + private int getChangedJobSp(MapleJob newJob) { int curSp = getUsedSp(newJob) + getJobRemainingSp(newJob); int spGain = 0; @@ -6225,54 +6227,54 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (curSp < expectedSp) { spGain += (expectedSp - curSp); } - + return getSpGain(spGain, curSp, newJob); } - + private int getUsedSp(MapleJob job) { int jobId = job.getId(); int spUsed = 0; - + for (Entry s : this.getSkills().entrySet()) { Skill skill = s.getKey(); if (GameConstants.isInJobTree(skill.getId(), jobId) && !skill.isBeginnerSkill()) { spUsed += s.getValue().skillevel; } } - + return spUsed; } - + private int getJobLevelSp(int level, MapleJob job, int jobBranch) { if (getJobStyleInternal(job.getId(), (byte) 0x40) == MapleJob.MAGICIAN) { level += 2; // starts earlier, level 8 } - + return 3 * level + GameConstants.getChangeJobSpUpgrade(jobBranch); } - + private int getJobMaxSp(MapleJob job) { int jobBranch = GameConstants.getJobBranch(job); int jobRange = GameConstants.getJobUpgradeLevelRange(jobBranch); return getJobLevelSp(jobRange, job, jobBranch); } - + private int getJobRemainingSp(MapleJob job) { int skillBook = GameConstants.getSkillBook(job.getId()); - + int ret = 0; for (int i = 0; i <= skillBook; i++) { ret += this.getRemainingSp(i); } - + return ret; } - + private int getSpGain(int spGain, MapleJob job) { int curSp = getUsedSp(job) + getJobRemainingSp(job); return getSpGain(spGain, curSp, job); } - + private int getSpGain(int spGain, int curSp, MapleJob job) { int maxSp = getJobMaxSp(job); @@ -6280,22 +6282,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { int jobBranch = GameConstants.getJobBranch(job); return spGain; } - + private void levelUpGainSp() { if (GameConstants.getJobBranch(job) == 0) { return; } - + int spGain = 3; if (YamlConfig.config.server.USE_ENFORCE_JOB_SP_RANGE && !GameConstants.hasSPTable(job)) { spGain = getSpGain(spGain, job); } - + if (spGain > 0) { gainSp(spGain, GameConstants.getSkillBook(job.getId()), true); } } - + public synchronized void levelUp(boolean takeexp) { Skill improvingMaxHP = null; Skill improvingMaxMP = null; @@ -6308,7 +6310,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statWlock.lock(); try { gainAp(5, true); - + int str = 0, dex = 0; if (level < 6) { str += 5; @@ -6324,7 +6326,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } else { int remainingAp = 5; - + if (isCygnus()) { if (level > 10) { if (level <= 17) { @@ -6334,7 +6336,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + gainAp(remainingAp, true); } @@ -6408,7 +6410,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ThreadManager.getInstance().newTask(new Runnable() { @Override public void run() { - MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(job), MapleCharacter.this); + MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(job), Character.this); } }); } @@ -6420,9 +6422,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { level = maxClassLevel; //To prevent levels past the maximum } - + levelUpGainSp(); - + effLock.lock(); statWlock.lock(); try { @@ -6440,7 +6442,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statup.add(new Pair<>(MapleStat.MAXMP, clientmaxmp)); statup.add(new Pair<>(MapleStat.STR, str)); statup.add(new Pair<>(MapleStat.DEX, dex)); - + sendPacket(PacketCreator.updatePlayerStats(statup, true, this)); } finally { statWlock.unlock(); @@ -6463,7 +6465,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } this.yellowMessage("You reached level " + level + ". Congratulations! As a token of your success, your inventory has been expanded a little bit."); - } + } } if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL == true) { //For the rate upgrade revertLastPlayerRates(); @@ -6492,18 +6494,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { levelUpMessages(); guildUpdate(); - + MapleFamilyEntry familyEntry = getFamilyEntry(); - if(familyEntry != null) { + if (familyEntry != null) { familyEntry.giveReputationToSenior(YamlConfig.config.server.FAMILY_REP_PER_LEVELUP, true); MapleFamilyEntry senior = familyEntry.getSenior(); - if(senior != null) { //only send the message to direct senior - MapleCharacter seniorChr = senior.getChr(); - if(seniorChr != null) seniorChr.sendPacket(PacketCreator.levelUpMessage(1, level, getName())); + if (senior != null) { //only send the message to direct senior + Character seniorChr = senior.getChr(); + if (seniorChr != null) { + seniorChr.sendPacket(PacketCreator.levelUpMessage(1, level, getName())); + } } } } - + public boolean leaveParty() { MapleParty party; boolean partyLeader; @@ -6517,7 +6521,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } if (party != null) { - if(partyLeader) party.assignNewLeader(client); + if (partyLeader) { + party.assignNewLeader(client); + } MapleParty.leaveParty(party, client); return true; @@ -6612,42 +6618,42 @@ public class MapleCharacter extends AbstractMapleCharacterObject { yellowMessage("Very nicely done! You have reached the so-long dreamed LEVEL 200!!! You are truly a hero among men, cheers upon you!"); } } - + public void setPlayerRates() { - this.expRate *= GameConstants.getPlayerBonusExpRate(this.level / 20); + this.expRate *= GameConstants.getPlayerBonusExpRate(this.level / 20); this.mesoRate *= GameConstants.getPlayerBonusMesoRate(this.level / 20); this.dropRate *= GameConstants.getPlayerBonusDropRate(this.level / 20); } public void revertLastPlayerRates() { - this.expRate /= GameConstants.getPlayerBonusExpRate((this.level - 1) / 20); + this.expRate /= GameConstants.getPlayerBonusExpRate((this.level - 1) / 20); this.mesoRate /= GameConstants.getPlayerBonusMesoRate((this.level - 1) / 20); this.dropRate /= GameConstants.getPlayerBonusDropRate((this.level - 1) / 20); } - + public void revertPlayerRates() { - this.expRate /= GameConstants.getPlayerBonusExpRate(this.level / 20); + this.expRate /= GameConstants.getPlayerBonusExpRate(this.level / 20); this.mesoRate /= GameConstants.getPlayerBonusMesoRate(this.level / 20); this.dropRate /= GameConstants.getPlayerBonusDropRate(this.level / 20); } - + public void setWorldRates() { World worldz = getWorldServer(); this.expRate *= worldz.getExpRate(); this.mesoRate *= worldz.getMesoRate(); this.dropRate *= worldz.getDropRate(); } - + public void revertWorldRates() { World worldz = getWorldServer(); this.expRate /= worldz.getExpRate(); this.mesoRate /= worldz.getMesoRate(); this.dropRate /= worldz.getDropRate(); } - + private void setCouponRates() { List couponEffects; - + Collection cashItems = this.getInventory(InventoryType.CASH).list(); chrLock.lock(); try { @@ -6656,20 +6662,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { chrLock.unlock(); } - - for(Integer couponId: couponEffects) { + + for (Integer couponId : couponEffects) { commitBuffCoupon(couponId); } } - + private void revertCouponRates() { revertCouponsEffects(); } - + public void updateCouponRates() { Inventory cashInv = this.getInventory(InventoryType.CASH); - if (cashInv == null) return; - + if (cashInv == null) { + return; + } + effLock.lock(); chrLock.lock(); cashInv.lockInventory(); @@ -6682,52 +6690,52 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public void resetPlayerRates() { expRate = 1; mesoRate = 1; dropRate = 1; - + expCoupon = 1; mesoCoupon = 1; dropCoupon = 1; } - + private int getCouponMultiplier(int couponId) { return activeCouponRates.get(couponId); } - + private void setExpCouponRate(int couponId, int couponQty) { this.expCoupon *= (getCouponMultiplier(couponId) * couponQty); } - + private void setDropCouponRate(int couponId, int couponQty) { this.dropCoupon *= (getCouponMultiplier(couponId) * couponQty); this.mesoCoupon *= (getCouponMultiplier(couponId) * couponQty); } - + private void revertCouponsEffects() { dispelBuffCoupons(); - + this.expRate /= this.expCoupon; this.dropRate /= this.dropCoupon; this.mesoRate /= this.mesoCoupon; - + this.expCoupon = 1; this.dropCoupon = 1; this.mesoCoupon = 1; } - + private List activateCouponsEffects() { List toCommitEffect = new LinkedList<>(); - - if(YamlConfig.config.server.USE_STACK_COUPON_RATES) { - for(Entry coupon: activeCoupons.entrySet()) { + + if (YamlConfig.config.server.USE_STACK_COUPON_RATES) { + for (Entry coupon : activeCoupons.entrySet()) { int couponId = coupon.getKey(); int couponQty = coupon.getValue(); toCommitEffect.add(couponId); - + if (ItemConstants.isExpCoupon(couponId)) { setExpCouponRate(couponId, couponQty); } else { @@ -6736,43 +6744,42 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } else { int maxExpRate = 1, maxDropRate = 1, maxExpCouponId = -1, maxDropCouponId = -1; - - for(Entry coupon: activeCoupons.entrySet()) { + + for (Entry coupon : activeCoupons.entrySet()) { int couponId = coupon.getKey(); - if(ItemConstants.isExpCoupon(couponId)) { - if(maxExpRate < getCouponMultiplier(couponId)) { + if (ItemConstants.isExpCoupon(couponId)) { + if (maxExpRate < getCouponMultiplier(couponId)) { maxExpCouponId = couponId; maxExpRate = getCouponMultiplier(couponId); } - } - else { - if(maxDropRate < getCouponMultiplier(couponId)) { + } else { + if (maxDropRate < getCouponMultiplier(couponId)) { maxDropCouponId = couponId; maxDropRate = getCouponMultiplier(couponId); } } } - + if (maxExpCouponId > -1) { toCommitEffect.add(maxExpCouponId); } if (maxDropCouponId > -1) { toCommitEffect.add(maxDropCouponId); } - + this.expCoupon = maxExpRate; this.dropCoupon = maxDropRate; this.mesoCoupon = maxDropRate; } - + this.expRate *= this.expCoupon; this.dropRate *= this.dropCoupon; this.mesoRate *= this.mesoCoupon; - + return toCommitEffect; } - + private void setActiveCoupons(Collection cashItems) { activeCoupons.clear(); activeCouponRates.clear(); @@ -6780,11 +6787,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Map coupons = Server.getInstance().getCouponRates(); List active = Server.getInstance().getActiveCoupons(); - for (Item it: cashItems) { + for (Item it : cashItems) { if (ItemConstants.isRateCoupon(it.getItemId()) && active.contains(it.getItemId())) { Integer count = activeCoupons.get(it.getItemId()); - if(count != null) { + if (count != null) { activeCoupons.put(it.getItemId(), count + 1); } else { activeCoupons.put(it.getItemId(), 1); @@ -6793,33 +6800,33 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + private void commitBuffCoupon(int couponid) { if (!isLoggedin() || getCashShop().isOpened()) { return; } - + MapleStatEffect mse = ii.getItemEffect(couponid); mse.applyTo(this); } - + public void dispelBuffCoupons() { List allBuffs = getAllStatups(); - + for (MapleBuffStatValueHolder mbsvh : allBuffs) { if (ItemConstants.isRateCoupon(mbsvh.effect.getSourceId())) { cancelEffect(mbsvh.effect, false, mbsvh.startTime); } } } - + public Set getActiveCoupons() { chrLock.lock(); try { return Collections.unmodifiableSet(activeCoupons.keySet()); } finally { chrLock.unlock(); - } + } } public void addPlayerRing(MapleRing ring) { @@ -6832,10 +6839,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { this.addCrushRing(ring); } } - - public static MapleCharacter loadCharacterEntryFromDB(ResultSet rs, List equipped) { - MapleCharacter ret = new MapleCharacter(); - + + public static Character loadCharacterEntryFromDB(ResultSet rs, List equipped) { + Character ret = new Character(); + try { ret.accountid = rs.getInt("accountid"); ret.id = rs.getInt("id"); @@ -6870,8 +6877,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.rankMove = rs.getInt("rankMove"); ret.jobRank = rs.getInt("jobRank"); ret.jobRankMove = rs.getInt("jobRankMove"); - - if(equipped != null) { // players can have no equipped items at all, ofc + + if (equipped != null) { // players can have no equipped items at all, ofc Inventory inv = ret.inventory[InventoryType.EQUIPPED.ordinal()]; for (Item item : equipped) { inv.addItemFromDB(item); @@ -6880,13 +6887,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } catch (SQLException sqle) { sqle.printStackTrace(); } - + return ret; } - - public MapleCharacter generateCharacterEntry() { - MapleCharacter ret = new MapleCharacter(); - + + public Character generateCharacterEntry() { + Character ret = new Character(); + ret.accountid = this.getAccountID(); ret.id = this.getId(); ret.name = this.getName(); @@ -6894,9 +6901,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.skinColor = this.getSkinColor(); ret.face = this.getFace(); ret.hair = this.getHair(); - + // skipping pets, probably unneeded here - + ret.level = this.getLevel(); ret.job = this.getJob(); ret.str = this.getStr(); @@ -6914,38 +6921,38 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ret.gachaexp.set(this.getGachaExp()); ret.mapid = this.getMapId(); ret.initialSpawnPoint = this.getInitialSpawnpoint(); - + ret.inventory[InventoryType.EQUIPPED.ordinal()] = this.getInventory(InventoryType.EQUIPPED); - + ret.setGMLevel(this.gmLevel()); ret.world = this.getWorld(); ret.rank = this.getRank(); ret.rankMove = this.getRankMove(); ret.jobRank = this.getJobRank(); ret.jobRankMove = this.getJobRankMove(); - + return ret; } - + private void loadCharSkillPoints(String[] skillPoints) { - int sps[] = new int[skillPoints.length]; + int[] sps = new int[skillPoints.length]; for (int i = 0; i < skillPoints.length; i++) { sps[i] = Integer.parseInt(skillPoints[i]); } - + setRemainingSp(sps); } - + public int getRemainingSp() { return getRemainingSp(job.getId()); //default } - + public void updateRemainingSp(int remainingSp) { updateRemainingSp(remainingSp, GameConstants.getSkillBook(job.getId())); } - - public static MapleCharacter loadCharFromDB(final int charid, MapleClient client, boolean channelserver) throws SQLException { - MapleCharacter ret = new MapleCharacter(); + + public static Character loadCharFromDB(final int charid, MapleClient client, boolean channelserver) throws SQLException { + Character ret = new Character(); ret.client = client; ret.id = charid; @@ -7444,10 +7451,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return null; } - + public void reloadQuestExpirations() { - for(MapleQuestStatus mqs: getStartedQuests()) { - if(mqs.getExpirationTime() > 0) { + for (MapleQuestStatus mqs : getStartedQuests()) { + if (mqs.getExpirationTime() > 0) { questTimeLimit2(mqs.getQuest(), mqs.getExpirationTime()); } } @@ -7459,7 +7466,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { i = i.replace("rn", "Rn"); i = i.replace("vv", "Vv"); i = i.replace("VV", "Vv"); - + return i; } @@ -7480,7 +7487,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public static class MapleCoolDownValueHolder { - + public int skillId; public long startTime, length; @@ -7510,7 +7517,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else if (id == 1140100 || id == 1140130) { raiseQuestMobCount(9101002); } - + int lastQuestProcessed = 0; try { synchronized (quests) { @@ -7519,7 +7526,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (qs.getStatus() == MapleQuestStatus.Status.COMPLETED || qs.getQuest().canComplete(this, null)) { continue; } - + if (qs.progress(id)) { announceUpdateQuest(DelayedQuestUpdate.UPDATE, qs, false); if (qs.getInfoNumber() > 0) { @@ -7529,7 +7536,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } catch (Exception e) { - FilePrinter.printError(FilePrinter.EXCEPTION_CAUGHT, e, "MapleCharacter.mobKilled. CID: " + this.id + " last Quest Processed: " + lastQuestProcessed); + FilePrinter.printError(FilePrinter.EXCEPTION_CAUGHT, e, "Character.mobKilled. CID: " + this.id + " last Quest Processed: " + lastQuestProcessed); } } @@ -7550,11 +7557,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { gainCP(-losing); return; } - + cancelAllBuffs(false); dispelDebuffs(); lastDeathtime = Server.getInstance().getCurrentTime(); - + EventInstanceManager eim = getEventInstance(); if (eim != null) { eim.playerKilled(this); @@ -7576,7 +7583,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } else if (getJob() != MapleJob.BEGINNER) { //Hmm... if (!FieldLimit.NO_EXP_DECREASE.check(getMap().getFieldLimit())) { // thanks Conrad for noticing missing FieldLimit check int XPdummy = ExpTable.getExpNeededForLevel(getLevel()); - + if (getMap().isTown()) { // thanks MindLove, SIayerMonkey, HaItsNotOver for noting players only lose 1% on town maps XPdummy /= 100; } else { @@ -7586,7 +7593,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { XPdummy /= 20; } } - + int curExp = getExp(); if (curExp > XPdummy) { loseExp(XPdummy, false, false); @@ -7595,7 +7602,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + if (getBuffedValue(BuffStat.MORPH) != null) { cancelEffectFromBuffStat(BuffStat.MORPH); } @@ -7607,14 +7614,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { unsitChairInternal(); sendPacket(PacketCreator.enableActions()); } - + private void unsitChairInternal() { int chairid = chair.get(); if (chairid >= 0) { if (ItemConstants.isFishingChair(chairid)) { this.getWorldServer().unregisterFisherPlayer(this); } - + setChair(-1); if (unregisterChairBuff()) { getMap().broadcastMessage(this, PacketCreator.cancelForeignChairSkillEffect(this.getId()), false); @@ -7625,7 +7632,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { sendPacket(PacketCreator.cancelChair(-1)); } - + public void sitChair(int itemId) { if (this.isLoggedinWorld()) { if (itemId >= 1000000) { // sit on item chair @@ -7647,29 +7654,29 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + private void setChair(int chair) { this.chair.set(chair); } - + public void respawn(int returnMap) { respawn(null, returnMap); // unspecified EIM, don't force EIM unregister in this case } - + public void respawn(EventInstanceManager eim, int returnMap) { if (eim != null) { eim.unregisterPlayer(this); // some event scripts uses this... } changeMap(returnMap); - + cancelAllBuffs(false); // thanks Oblivium91 for finding out players still could revive in area and take damage before returning to town - + if (usedSafetyCharm) { // thanks kvmba for noticing safety charm not providing 30% HP/MP addMPHP((int) Math.ceil(this.getClientMaxHp() * 0.3), (int) Math.ceil(this.getClientMaxMp() * 0.3)); } else { updateHp(50); } - + setStance(0); } @@ -7683,10 +7690,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (awayFromWorld.get()) { return; } - + addHP(-bloodEffect.getX()); sendPacket(PacketCreator.showOwnBuffEffect(bloodEffect.getSourceId(), 5)); - getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBuffEffect(getId(), bloodEffect.getSourceId(), 5), false); + getMap().broadcastMessage(Character.this, PacketCreator.showBuffEffect(getId(), bloodEffect.getSourceId(), 5), false); } }, 4000, 4000); } @@ -7703,7 +7710,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { equipwatk = 0; //equipspeed = 0; //equipjump = 0; - + for (Item item : getInventory(InventoryType.EQUIPPED)) { Equip equip = (Equip) item; equipmaxhp += equip.getHp(); @@ -7717,10 +7724,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { //equipspeed += equip.getSpeed(); //equipjump += equip.getJump(); } - + equipchanged = false; } - + localmaxhp += equipmaxhp; localmaxmp += equipmaxmp; localdex += equipdex; @@ -7730,7 +7737,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { localmagic += equipmagic; localwatk += equipwatk; } - + private void reapplyLocalStats() { effLock.lock(); chrLock.lock(); @@ -7854,7 +7861,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + private List> recalcLocalStats() { effLock.lock(); chrLock.lock(); @@ -7863,9 +7870,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { List> hpmpupdate = new ArrayList<>(2); int oldlocalmaxhp = localmaxhp; int oldlocalmaxmp = localmaxmp; - + reapplyLocalStats(); - + if (YamlConfig.config.server.USE_FIXED_RATIO_HPMP_UPDATE) { if (localmaxhp != oldlocalmaxhp) { Pair hpUpdate; @@ -7899,7 +7906,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + private void updateLocalStats() { prtLock.lock(); effLock.lock(); @@ -7927,7 +7934,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.lock(); try { if (party != null) { - for (MapleCharacter partychar : this.getPartyMembersOnSameMap()) { + for (Character partychar : this.getPartyMembersOnSameMap()) { sendPacket(PacketCreator.updatePartyMemberHP(partychar.getId(), partychar.getHp(), partychar.getCurrentMaxHp())); } } @@ -7964,9 +7971,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.lock(); chrLock.lock(); try { - if (this.coolDowns.containsKey(skillId)) { - this.coolDowns.remove(skillId); - } + this.coolDowns.remove(skillId); } finally { chrLock.unlock(); effLock.unlock(); @@ -8007,10 +8012,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public synchronized void resetStats() { - if(!YamlConfig.config.server.USE_AUTOASSIGN_STARTERS_AP) { + if (!YamlConfig.config.server.USE_AUTOASSIGN_STARTERS_AP) { return; } - + effLock.lock(); statWlock.lock(); try { @@ -8058,12 +8063,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { effLock.unlock(); } } - + public void resetBattleshipHp() { int bshipLevel = Math.max(getLevel() - 120, 0); // thanks alex12 for noticing battleship HP issues for low-level players this.battleshipHp = 400 * getSkillLevel(SkillFactory.getSkill(Corsair.BATTLE_SHIP)) + (bshipLevel * 200); } - + public void resetEnteredScript() { entered.remove(map.getId()); } @@ -8082,7 +8087,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public synchronized void saveCooldowns() { List listcd = getAllCooldowns(); - + if (!listcd.isEmpty()) { try (Connection con = DatabaseConnection.getConnection()) { deleteWhereCharacterId(con, "DELETE FROM cooldowns WHERE charid = ?"); @@ -8100,24 +8105,24 @@ public class MapleCharacter extends AbstractMapleCharacterObject { se.printStackTrace(); } } - + Map> listds = getAllDiseases(); if (!listds.isEmpty()) { try (Connection con = DatabaseConnection.getConnection()) { deleteWhereCharacterId(con, "DELETE FROM playerdiseases WHERE charid = ?"); try (PreparedStatement ps = con.prepareStatement("INSERT INTO playerdiseases (charid, disease, mobskillid, mobskilllv, length) VALUES (?, ?, ?, ?, ?)")) { ps.setInt(1, getId()); - + for (Entry> e : listds.entrySet()) { ps.setInt(2, e.getKey().ordinal()); - + MobSkill ms = e.getValue().getRight(); ps.setInt(3, ms.getSkillId()); ps.setInt(4, ms.getSkillLevel()); ps.setInt(5, e.getValue().getLeft().intValue()); ps.addBatch(); } - + ps.executeBatch(); } } catch (SQLException se) { @@ -8142,19 +8147,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void saveLocationOnWarp() { // suggestion to remember the map before warp command thanks to Lei MaplePortal closest = map.findClosestPortal(getPosition()); int curMapid = getMapId(); - + for (int i = 0; i < savedLocations.length; i++) { if (savedLocations[i] == null) { savedLocations[i] = new SavedLocation(curMapid, closest != null ? closest.getId() : 0); } } } - + public void saveLocation(String type) { MaplePortal closest = map.findClosestPortal(getPosition()); savedLocations[SavedLocationType.fromString(type).ordinal()] = new SavedLocation(getMapId(), closest != null ? closest.getId() : 0); } - + public final boolean insertNewChar(CharacterFactoryRecipe recipe) { str = recipe.getStr(); dex = recipe.getDex(); @@ -8304,7 +8309,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { con.commit(); return true; - } catch (Exception e) { + } catch (Exception e) { con.rollback(); throw e; } finally { @@ -8319,21 +8324,21 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void saveCharToDB() { - if(YamlConfig.config.server.USE_AUTOSAVE) { + if (YamlConfig.config.server.USE_AUTOSAVE) { Runnable r = new Runnable() { @Override public void run() { saveCharToDB(true); } }; - + CharacterSaveService service = (CharacterSaveService) getWorldServer().getServiceAccess(WorldServices.SAVE_CHARACTER); service.registerSaveCharacter(this.getId(), r); } else { saveCharToDB(true); } } - + //ItemFactory saveItems and monsterbook.saveCards are the most time consuming here. public synchronized void saveCharToDB(boolean notAutosave) { if (!loggedIn) { @@ -8343,9 +8348,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Calendar c = Calendar.getInstance(); if (notAutosave) { - FilePrinter.print(FilePrinter.SAVING_CHARACTER, "Attempting to save " + name + " at " + c.getTime().toString()); + FilePrinter.print(FilePrinter.SAVING_CHARACTER, "Attempting to save " + name + " at " + c.getTime()); } else { - FilePrinter.print(FilePrinter.AUTOSAVING_CHARACTER, "Attempting to autosave " + name + " at " + c.getTime().toString()); + FilePrinter.print(FilePrinter.AUTOSAVING_CHARACTER, "Attempting to autosave " + name + " at " + c.getTime()); } Server.getInstance().updateCharacterEntry(this); @@ -8777,7 +8782,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void sendKeymap() { sendPacket(PacketCreator.getKeymap(keymap)); } - + public void sendQuickmap() { // send quickslots to user QuickslotBinding pQuickslotKeyMapped = this.m_pQuickslotKeyMapped; @@ -8793,7 +8798,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { // Always send the macro packet to fix a client side bug when switching characters. sendPacket(PacketCreator.getMacros(skillMacros)); } - + public SkillMacro[] getMacros() { return skillMacros; } @@ -8801,7 +8806,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void sendNote(String to, String msg, byte fame) throws SQLException { sendNote(to, this.getName(), msg, fame); } - + public static void sendNote(String to, String from, String msg, byte fame) throws SQLException { try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO notes (`to`, `from`, `message`, `timestamp`, `fame`) VALUES (?, ?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS)) { @@ -8849,7 +8854,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setChalkboard(String text) { this.chalktext = text; } - + public void setDojoEnergy(int x) { this.dojoEnergy = Math.min(x, 10000); } @@ -8914,7 +8919,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setGuildRank(int _rank) { guildRank = _rank; } - + public void setAllianceRank(int _rank) { allianceRank = _rank; } @@ -8962,14 +8967,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } merchantmeso = set; } - + public synchronized void withdrawMerchantMesos() { int merchantMeso = this.getMerchantNetMeso(); int playerMeso = this.getMeso(); - + if (merchantMeso > 0) { int possible = Integer.MAX_VALUE - playerMeso; - + if (possible > 0) { if (possible < merchantMeso) { this.gainMeso(possible, false); @@ -8981,7 +8986,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } else { int nextMeso = playerMeso + merchantMeso; - + if (nextMeso < 0) { this.gainMeso(-playerMeso, false); this.setMerchantMeso(merchantMeso + playerMeso); @@ -8995,19 +9000,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setHiredMerchant(MapleHiredMerchant merchant) { this.hiredMerchant = merchant; } - + private void hpChangeAction(int oldHp) { boolean playerDied = false; if (hp <= 0) { if (oldHp > hp) { - if(!isBuybackInvincible()) { + if (!isBuybackInvincible()) { playerDied = true; } else { hp = 1; } } } - + final boolean chrDied = playerDied; Runnable r = new Runnable() { @Override @@ -9023,65 +9028,65 @@ public class MapleCharacter extends AbstractMapleCharacterObject { }; if (map != null) { map.registerCharacterStatUpdate(r); - } + } } - + private Pair calcHpRatioUpdate(int newHp, int oldHp) { int delta = newHp - oldHp; this.hp = calcHpRatioUpdate(hp, oldHp, delta); - + hpChangeAction(Short.MIN_VALUE); return new Pair<>(MapleStat.HP, hp); } - + private Pair calcMpRatioUpdate(int newMp, int oldMp) { int delta = newMp - oldMp; this.mp = calcMpRatioUpdate(mp, oldMp, delta); return new Pair<>(MapleStat.MP, mp); } - + private static int calcTransientRatio(float transientpoint) { int ret = (int) transientpoint; return !(ret <= 0 && transientpoint > 0.0f) ? ret : 1; } - + private Pair calcHpRatioTransient() { this.hp = calcTransientRatio(transienthp * localmaxhp); - + hpChangeAction(Short.MIN_VALUE); return new Pair<>(MapleStat.HP, hp); } - + private Pair calcMpRatioTransient() { this.mp = calcTransientRatio(transientmp * localmaxmp); return new Pair<>(MapleStat.MP, mp); } - + private int calcHpRatioUpdate(int curpoint, int maxpoint, int diffpoint) { int curMax = maxpoint; int nextMax = Math.min(30000, maxpoint + diffpoint); - + float temp = curpoint * nextMax; int ret = (int) Math.ceil(temp / curMax); - + transienthp = (maxpoint > nextMax) ? ((float) curpoint) / maxpoint : ((float) ret) / nextMax; return ret; } - + private int calcMpRatioUpdate(int curpoint, int maxpoint, int diffpoint) { int curMax = maxpoint; int nextMax = Math.min(30000, maxpoint + diffpoint); - + float temp = curpoint * nextMax; int ret = (int) Math.ceil(temp / curMax); - + transientmp = (maxpoint > nextMax) ? ((float) curpoint) / maxpoint : ((float) ret) / nextMax; return ret; } - + public boolean applyHpMpChange(int hpCon, int hpchange, int mpchange) { boolean zombify = hasDisease(MapleDisease.ZOMBIFY); - + effLock.lock(); statWlock.lock(); try { @@ -9104,7 +9109,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { statWlock.unlock(); effLock.unlock(); } - + // autopot on HPMP deplete... thanks shavit for finding out D. Roar doesn't trigger autopot request if (hpchange < 0) { KeyBinding autohpPot = this.getKeymap().get(91); @@ -9120,7 +9125,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + if (mpchange < 0) { KeyBinding autompPot = this.getKeymap().get(92); if (autompPot != null) { @@ -9135,10 +9140,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + return true; } - + public void setInventory(InventoryType type, Inventory inv) { inventory[type.ordinal()] = inv; } @@ -9162,11 +9167,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setLevel(int level) { this.level = level; } - + public void setMap(int PmapId) { this.mapid = PmapId; } - + public void setMessenger(MapleMessenger messenger) { this.messenger = messenger; } @@ -9179,7 +9184,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { this.miniGame = miniGame; } - public void setMiniGamePoints(MapleCharacter visitor, int winnerslot, boolean omok) { + public void setMiniGamePoints(Character visitor, int winnerslot, boolean omok) { if (omok) { if (winnerslot == 1) { this.omokwins++; @@ -9212,11 +9217,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setName(String name) { this.name = name; } - + public void setRPS(MapleRockPaperScissor rps) { this.rps = rps; } - + public void closeRPS() { MapleRockPaperScissor rps = this.rps; if (rps != null) { @@ -9238,14 +9243,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { e.printStackTrace(); } } - + public int getDoorSlot() { - if(doorSlot != -1) { + if (doorSlot != -1) { return doorSlot; } return fetchDoorSlot(); } - + public int fetchDoorSlot() { prtLock.lock(); try { @@ -9255,7 +9260,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + public void setParty(MapleParty p) { prtLock.lock(); try { @@ -9275,7 +9280,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setPlayerShop(MaplePlayerShop playerShop) { this.playerShop = playerShop; } - + public void setSearch(String find) { search = find; } @@ -9287,12 +9292,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public byte getSlots(int type) { return type == InventoryType.CASH.getType() ? 96 : inventory[type].getSlotLimit(); } - + public boolean canGainSlots(int type, int slots) { slots += inventory[type].getSlotLimit(); return slots <= 96; } - + public boolean gainSlots(int type, int slots) { return gainSlots(type, slots, true); } @@ -9309,7 +9314,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + private int gainSlotsInternal(int type, int slots) { inventory[type].lockInventory(); try { @@ -9324,32 +9329,32 @@ public class MapleCharacter extends AbstractMapleCharacterObject { inventory[type].unlockInventory(); } } - + public int sellAllItemsFromName(byte invTypeId, String name) { //player decides from which inventory items should be sold. InventoryType type = InventoryType.getByType(invTypeId); - + Inventory inv = getInventory(type); inv.lockInventory(); try { Item it = inv.findByName(name); - if(it == null) { - return(-1); + if (it == null) { + return (-1); } - return(sellAllItemsFromPosition(ii, type, it.getPosition())); + return (sellAllItemsFromPosition(ii, type, it.getPosition())); } finally { inv.unlockInventory(); } } - + public int sellAllItemsFromPosition(MapleItemInformationProvider ii, InventoryType type, short pos) { int mesoGain = 0; - + Inventory inv = getInventory(type); inv.lockInventory(); try { - for(short i = pos; i <= inv.getSlotLimit(); i++) { + for (short i = pos; i <= inv.getSlotLimit(); i++) { if (inv.getItem(i) == null) { continue; } @@ -9358,32 +9363,32 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } finally { inv.unlockInventory(); } - - return(mesoGain); + + return (mesoGain); } private int standaloneSell(MapleClient c, MapleItemInformationProvider ii, InventoryType type, short slot, short quantity) { if (quantity == 0xFFFF || quantity == 0) { quantity = 1; } - + Inventory inv = getInventory(type); inv.lockInventory(); try { - Item item = inv.getItem((short) slot); - if (item == null){ //Basic check - return(0); + Item item = inv.getItem(slot); + if (item == null) { //Basic check + return (0); } int itemid = item.getItemId(); if (ItemConstants.isRechargeable(itemid)) { quantity = item.getQuantity(); } else if (ItemConstants.isWeddingToken(itemid) || ItemConstants.isWeddingRing(itemid)) { - return(0); + return (0); } if (quantity < 0) { - return(0); + return (0); } short iQuant = item.getQuantity(); if (iQuant == 0xFFFF) { @@ -9395,59 +9400,59 @@ public class MapleCharacter extends AbstractMapleCharacterObject { int recvMesos = ii.getPrice(itemid, quantity); if (recvMesos > 0) { gainMeso(recvMesos, false); - return(recvMesos); + return (recvMesos); } } - return(0); + return (0); } finally { inv.unlockInventory(); } } - + private static boolean hasMergeFlag(Item item) { return (item.getFlag() & ItemConstants.MERGE_UNTRADEABLE) == ItemConstants.MERGE_UNTRADEABLE; } - + private static void setMergeFlag(Item item) { short flag = item.getFlag(); flag |= ItemConstants.MERGE_UNTRADEABLE; flag |= ItemConstants.UNTRADEABLE; item.setFlag(flag); } - + private List getUpgradeableEquipped() { List list = new LinkedList<>(); - + for (Item item : getInventory(InventoryType.EQUIPPED)) { if (ii.isUpgradeable(item.getItemId())) { list.add((Equip) item); } } - + return list; } - + private static List getEquipsWithStat(List>> equipped, StatUpgrade stat) { List equippedWithStat = new LinkedList<>(); - + for (Pair> eq : equipped) { if (eq.getRight().containsKey(stat)) { equippedWithStat.add(eq.getLeft()); } } - + return equippedWithStat; } - + public boolean mergeAllItemsFromName(String name) { InventoryType type = InventoryType.EQUIP; - + Inventory inv = getInventory(type); inv.lockInventory(); try { Item it = inv.findByName(name); - if(it == null) { + if (it == null) { return false; } @@ -9472,7 +9477,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { Set extraEquipped = new LinkedHashSet<>(equipUpgrades.keySet()); List statEquipped = getEquipsWithStat(upgradeableEquipped, e.getKey()); - float extraRate = (float)(0.2 * Math.random()); + float extraRate = (float) (0.2 * Math.random()); if (!statEquipped.isEmpty()) { float statRate = 1.0f - extraRate; @@ -9510,18 +9515,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { dropMessage(6, showStr); } } - + return true; } finally { inv.unlockInventory(); } } - + public void mergeAllItemsFromPosition(Map statups, short pos) { Inventory inv = getInventory(InventoryType.EQUIP); inv.lockInventory(); try { - for(short i = pos; i <= inv.getSlotLimit(); i++) { + for (short i = pos; i <= inv.getSlotLimit(); i++) { standaloneMerge(statups, getClient(), InventoryType.EQUIP, i, inv.getItem(i)); } } finally { @@ -9531,14 +9536,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private void standaloneMerge(Map statups, MapleClient c, InventoryType type, short slot, Item item) { short quantity; - if (item == null || (quantity = item.getQuantity()) < 1 || ii.isCash(item.getItemId()) || !ii.isUpgradeable(item.getItemId()) || hasMergeFlag(item)){ + if (item == null || (quantity = item.getQuantity()) < 1 || ii.isCash(item.getItemId()) || !ii.isUpgradeable(item.getItemId()) || hasMergeFlag(item)) { return; } - + Equip e = (Equip) item; for (Entry s : e.getStats().entrySet()) { Float newVal = statups.get(s.getKey()); - + float incVal = s.getValue().floatValue(); switch (s.getKey()) { case incPAD: @@ -9548,19 +9553,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { incVal = (float) Math.log(incVal); break; } - + if (newVal != null) { newVal += incVal; } else { newVal = incVal; } - + statups.put(s.getKey(), newVal); } - + InventoryManipulator.removeFromSlot(c, type, (byte) slot, quantity, false); } - + public void setShop(MapleShop shop) { this.shop = shop; } @@ -9568,7 +9573,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setSlot(int slotid) { slots = slotid; } - + public void setTrade(MapleTrade trade) { this.trade = trade; } @@ -9601,47 +9606,47 @@ public class MapleCharacter extends AbstractMapleCharacterObject { private long getDojoTimeLeft() { return client.getChannelServer().getDojoFinishTime(map.getId()) - Server.getInstance().getCurrentTime(); } - + public void showDojoClock() { if (GameConstants.isDojoBossArea(map.getId())) { sendPacket(PacketCreator.getClock((int) (getDojoTimeLeft() / 1000))); } } - + public void showUnderleveledInfo(MapleMonster mob) { long curTime = Server.getInstance().getCurrentTime(); - if(nextWarningTime < curTime) { + if (nextWarningTime < curTime) { nextWarningTime = curTime + (60 * 1000); // show underlevel info again after 1 minute - + showHint("You have gained #rno experience#k from defeating #e#b" + mob.getName() + "#k#n (lv. #b" + mob.getLevel() + "#k)! Take note you must have around the same level as the mob to start earning EXP from it."); } } - - public void showMapOwnershipInfo(MapleCharacter mapOwner) { + + public void showMapOwnershipInfo(Character mapOwner) { long curTime = Server.getInstance().getCurrentTime(); - if(nextWarningTime < curTime) { + if (nextWarningTime < curTime) { nextWarningTime = curTime + (60 * 1000); // show underlevel info again after 1 minute - + String medal = ""; Item medalItem = mapOwner.getInventory(InventoryType.EQUIPPED).getItem((short) -49); if (medalItem != null) { medal = "<" + ii.getName(medalItem.getItemId()) + "> "; } - + List strLines = new LinkedList<>(); strLines.add(""); strLines.add(""); strLines.add(""); strLines.add(this.getClient().getChannelServer().getServerMessage().isEmpty() ? 0 : 1, "Get off my lawn!!"); - + this.sendPacket(PacketCreator.getAvatarMega(mapOwner, medal, this.getClient().getChannel(), 5390006, strLines, true)); } } - + public void showHint(String msg) { showHint(msg, 500); } - + public void showHint(String msg, int length) { client.announceHint(msg, length); } @@ -9671,7 +9676,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void silentPartyUpdate() { silentPartyUpdateInternal(getParty()); } - + private void silentPartyUpdateInternal(MapleParty chrParty) { if (chrParty != null) { getWorldServer().updateParty(chrParty.getId(), PartyOperation.SILENT_UPDATE, getMPC()); @@ -9712,7 +9717,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (pet == null) { return; } - + int newFullness = pet.getFullness() - PetDataFactory.getHunger(pet.getItemId()); if (newFullness <= 5) { pet.setFullness(15); @@ -9728,11 +9733,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public boolean runTirednessSchedule() { - if(maplemount != null) { + if (maplemount != null) { int tiredness = maplemount.incrementAndGetTiredness(); - + this.getMap().broadcastMessage(PacketCreator.updateMount(this.getId(), maplemount, false)); if (tiredness > 99) { maplemount.setTiredness(99); @@ -9741,7 +9746,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + return true; } @@ -9759,7 +9764,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } }, duration); } - + public void unequipAllPets() { for (int i = 0; i < 3; i++) { Pet pet = getPet(i); @@ -9776,18 +9781,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void unequipPet(Pet pet, boolean shift_left, boolean hunger) { byte petIdx = this.getPetIndex(pet); Pet chrPet = this.getPet(petIdx); - + if (chrPet != null) { chrPet.setSummoned(false); chrPet.saveToDb(); } - + this.getClient().getWorldServer().unregisterPetHunger(this, petIdx); getMap().broadcastMessage(this, PacketCreator.showPet(this, pet, true, hunger), true); - + removePet(pet, shift_left); commitExcludedItems(); - + sendPacket(PacketCreator.petStatUpdate(this)); sendPacket(PacketCreator.enableActions()); } @@ -9804,21 +9809,21 @@ public class MapleCharacter extends AbstractMapleCharacterObject { prtLock.unlock(); } } - + private void updatePartyMemberHPInternal() { if (party != null) { int curmaxhp = getCurrentMaxHp(); int curhp = getHp(); - for (MapleCharacter partychar : this.getPartyMembersOnSameMap()) { + for (Character partychar : this.getPartyMembersOnSameMap()) { partychar.sendPacket(PacketCreator.updatePartyMemberHP(getId(), curhp, curmaxhp)); } } } - + public void setQuestProgress(int id, int infoNumber, String progress) { MapleQuest q = MapleQuest.getInstance(id); MapleQuestStatus qs = getQuest(q); - + if (qs.getInfoNumber() == infoNumber && infoNumber > 0) { MapleQuest iq = MapleQuest.getInstance(infoNumber); MapleQuestStatus iqs = getQuest(iq); @@ -9832,52 +9837,52 @@ public class MapleCharacter extends AbstractMapleCharacterObject { announceUpdateQuest(DelayedQuestUpdate.UPDATE, qs, true); } } - + public void awardQuestPoint(int awardedPoints) { if (YamlConfig.config.server.QUEST_POINT_REQUIREMENT < 1 || awardedPoints < 1) { return; } - + int delta; synchronized (quests) { quest_fame += awardedPoints; - + delta = quest_fame / YamlConfig.config.server.QUEST_POINT_REQUIREMENT; quest_fame %= YamlConfig.config.server.QUEST_POINT_REQUIREMENT; } - - if(delta > 0) { + + if (delta > 0) { gainFame(delta); } } - + public enum DelayedQuestUpdate { // quest updates allow player actions during NPC talk... UPDATE, FORFEIT, COMPLETE, INFO } - - private void announceUpdateQuestInternal(MapleCharacter chr, Pair questUpdate) { + + private void announceUpdateQuestInternal(Character chr, Pair questUpdate) { Object[] objs = questUpdate.getRight(); - + switch (questUpdate.getLeft()) { case UPDATE: sendPacket(PacketCreator.updateQuest(chr, (MapleQuestStatus) objs[0], (Boolean) objs[1])); break; - + case FORFEIT: sendPacket(PacketCreator.forfeitQuest((Short) objs[0])); break; - + case COMPLETE: sendPacket(PacketCreator.completeQuest((Short) objs[0], (Long) objs[1])); break; - + case INFO: MapleQuestStatus qs = (MapleQuestStatus) objs[0]; sendPacket(PacketCreator.updateQuestInfo(qs.getQuest().getId(), qs.getNpc())); break; } } - + public void announceUpdateQuest(DelayedQuestUpdate questUpdateType, Object... params) { Pair p = new Pair<>(questUpdateType, params); MapleClient c = this.getClient(); @@ -9889,20 +9894,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { announceUpdateQuestInternal(this, p); } } - + public void flushDelayedUpdateQuests() { List> qmQuestUpdateList; - + synchronized (npcUpdateQuests) { qmQuestUpdateList = new ArrayList<>(npcUpdateQuests); npcUpdateQuests.clear(); } - + for (Pair q : qmQuestUpdateList) { announceUpdateQuestInternal(this, q); } } - + public void updateQuestStatus(MapleQuestStatus qs) { synchronized (quests) { quests.put(qs.getQuestID(), qs); @@ -9931,13 +9936,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { // reminder: do not reset quest progress of infoNumbers, some quests cannot backtrack } } - + private void expireQuest(MapleQuest quest) { if (quest.forfeit(this)) { sendPacket(PacketCreator.questExpire(quest.getId())); } } - + public void cancelQuestExpirationTask() { evtLock.lock(); try { @@ -9949,25 +9954,25 @@ public class MapleCharacter extends AbstractMapleCharacterObject { evtLock.unlock(); } } - + public void forfeitExpirableQuests() { evtLock.lock(); try { - for(MapleQuest quest : questExpirations.keySet()) { + for (MapleQuest quest : questExpirations.keySet()) { quest.forfeit(this); } - + questExpirations.clear(); } finally { evtLock.unlock(); } } - + public void questExpirationTask() { evtLock.lock(); try { - if(!questExpirations.isEmpty()) { - if(questExpireTask == null) { + if (!questExpirations.isEmpty()) { + if (questExpireTask == null) { questExpireTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { @@ -9980,26 +9985,26 @@ public class MapleCharacter extends AbstractMapleCharacterObject { evtLock.unlock(); } } - + private void runQuestExpireTask() { evtLock.lock(); try { long timeNow = Server.getInstance().getCurrentTime(); List expireList = new LinkedList<>(); - - for(Entry qe : questExpirations.entrySet()) { - if(qe.getValue() <= timeNow) { + + for (Entry qe : questExpirations.entrySet()) { + if (qe.getValue() <= timeNow) { expireList.add(qe.getKey()); } } - - if(!expireList.isEmpty()) { - for(MapleQuest quest : expireList) { + + if (!expireList.isEmpty()) { + for (MapleQuest quest : expireList) { expireQuest(quest); questExpirations.remove(quest); } - - if(questExpirations.isEmpty()) { + + if (questExpirations.isEmpty()) { questExpireTask.cancel(false); questExpireTask = null; } @@ -10008,11 +10013,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { evtLock.unlock(); } } - + private void registerQuestExpire(MapleQuest quest, long time) { evtLock.lock(); try { - if(questExpireTask == null) { + if (questExpireTask == null) { questExpireTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { @@ -10020,22 +10025,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } }, 10 * 1000); } - + questExpirations.put(quest, Server.getInstance().getCurrentTime() + time); } finally { evtLock.unlock(); } } - + public void questTimeLimit(final MapleQuest quest, int seconds) { registerQuestExpire(quest, seconds * 1000); sendPacket(PacketCreator.addQuestTimeLimit(quest.getId(), seconds * 1000)); } - + public void questTimeLimit2(final MapleQuest quest, long expires) { long timeLeft = expires - System.currentTimeMillis(); - - if(timeLeft <= 0) { + + if (timeLeft <= 0) { expireQuest(quest); } else { registerQuestExpire(quest, timeLeft); @@ -10073,7 +10078,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void sendSpawnData(MapleClient client) { if (!this.isHidden() || client.getPlayer().gmLevel() > 1) { client.sendPacket(PacketCreator.spawnPlayerMapObject(client, this, false)); - + if (buffEffects.containsKey(getJobMapChair(job))) { // mustn't effLock, chrLock sendSpawnData client.sendPacket(PacketCreator.giveForeignChairSkillEffect(id)); } @@ -10104,37 +10109,37 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public CashShop getCashShop() { return cashshop; } - + public Set getNewYearRecords() { return newyears; } - + public Set getReceivedNewYearRecords() { Set received = new LinkedHashSet<>(); - - for(NewYearCardRecord nyc : newyears) { - if(nyc.isReceiverCardReceived()) { + + for (NewYearCardRecord nyc : newyears) { + if (nyc.isReceiverCardReceived()) { received.add(nyc); } } - + return received; } - + public NewYearCardRecord getNewYearRecord(int cardid) { - for(NewYearCardRecord nyc : newyears) { - if(nyc.getId() == cardid) { + for (NewYearCardRecord nyc : newyears) { + if (nyc.getId() == cardid) { return nyc; } } - + return null; } - + public void addNewYearRecord(NewYearCardRecord newyear) { newyears.add(newyear); } - + public void removeNewYearRecord(NewYearCardRecord newyear) { newyears.remove(newyear); } @@ -10186,10 +10191,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public void autoban(String reason) { - if (this.isGM() || this.isBanned()){ // thanks RedHat for noticing GM's being able to get banned + if (this.isGM() || this.isBanned()) { // thanks RedHat for noticing GM's being able to get banned return; } - + this.ban(reason); sendPacket(PacketCreator.sendPolice(String.format("You have been blocked by the#b %s Police for HACK reason.#k", "Cosmic"))); TimerManager.getInstance().schedule(new Runnable() { @@ -10198,8 +10203,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject { client.disconnect(false, false); } }, 5000); - - Server.getInstance().broadcastGMMessage(this.getWorld(), PacketCreator.serverNotice(6, MapleCharacter.makeMapleReadable(this.name) + " was autobanned for " + reason)); + + Server.getInstance().broadcastGMMessage(this.getWorld(), PacketCreator.serverNotice(6, Character.makeMapleReadable(this.name) + " was autobanned for " + reason)); } public void block(int reason, int days, String desc) { @@ -10256,11 +10261,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public boolean isTrockMap(int id) { int index = trockmaps.indexOf(id); - if (index != -1) { - return true; - } - - return false; + return index != -1; } public int getVipTrockSize() { @@ -10289,20 +10290,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public boolean isVipTrockMap(int id) { int index = viptrockmaps.indexOf(id); - if (index != -1) { - return true; - } - - return false; + return index != -1; } - + public AutobanManager getAutobanManager() { return autoban; } - + public void equippedItem(Equip equip) { int itemid = equip.getItemId(); - + if (itemid == 1122017) { this.equipPendantOfSpirit(); } else if (itemid == 1812000) { // meso magnet @@ -10313,10 +10310,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { equippedPetItemIgnore = true; } } - + public void unequippedItem(Equip equip) { int itemid = equip.getItemId(); - + if (itemid == 1122017) { this.unequipPendantOfSpirit(); } else if (itemid == 1812000) { // meso magnet @@ -10327,19 +10324,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { equippedPetItemIgnore = false; } } - + public boolean isEquippedMesoMagnet() { return equippedMesoMagnet; } - + public boolean isEquippedItemPouch() { return equippedItemPouch; } - + public boolean isEquippedPetItemIgnore() { return equippedPetItemIgnore; } - + private void equipPendantOfSpirit() { if (pendantOfSpirit == null) { pendantOfSpirit = TimerManager.getInstance().register(new Runnable() { @@ -10363,13 +10360,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } pendantExp = 0; } - + private Collection getUpgradeableEquipList() { Collection fullList = getInventory(InventoryType.EQUIPPED).list(); if (YamlConfig.config.server.USE_EQUIPMNT_LVLUP_CASH) { return fullList; } - + Collection eqpList = new LinkedHashSet<>(); for (Item it : fullList) { if (!ii.isCash(it.getItemId())) { @@ -10379,10 +10376,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return eqpList; } - + public void increaseEquipExp(int expGain) { if (allowExpGain) { // thanks Vcoc for suggesting equip EXP gain conditionally - if(expGain < 0) { + if (expGain < 0) { expGain = Integer.MAX_VALUE; } @@ -10397,33 +10394,33 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } } } - + public void showAllEquipFeatures() { String showMsg = ""; - + for (Item item : getInventory(InventoryType.EQUIPPED).list()) { Equip nEquip = (Equip) item; String itemName = ii.getName(nEquip.getItemId()); if (itemName == null) { continue; } - + showMsg += nEquip.showEquipFeatures(client); } - - if(!showMsg.isEmpty()) { + + if (!showMsg.isEmpty()) { this.showHint("#ePLAYER EQUIPMENTS:#n\r\n\r\n" + showMsg, 400); } } - + public void broadcastMarriageMessage() { MapleGuild guild = this.getGuild(); - if(guild != null) { + if (guild != null) { guild.broadcast(PacketCreator.marriageMessage(0, name)); } - + MapleFamily family = this.getFamily(); - if(family != null) { + if (family != null) { family.broadcast(PacketCreator.marriageMessage(1, name)); } } @@ -10443,26 +10440,38 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setCpqTimer(ScheduledFuture timer) { this.cpqSchedule = timer; } - + public void clearCpqTimer() { - if (cpqSchedule != null) { cpqSchedule.cancel(true); } + if (cpqSchedule != null) { + cpqSchedule.cancel(true); + } cpqSchedule = null; } - + public final void empty(final boolean remove) { - if (dragonBloodSchedule != null) { dragonBloodSchedule.cancel(true); } + if (dragonBloodSchedule != null) { + dragonBloodSchedule.cancel(true); + } dragonBloodSchedule = null; - if (hpDecreaseTask != null) { hpDecreaseTask.cancel(true); } + if (hpDecreaseTask != null) { + hpDecreaseTask.cancel(true); + } hpDecreaseTask = null; - if (beholderHealingSchedule != null) { beholderHealingSchedule.cancel(true); } + if (beholderHealingSchedule != null) { + beholderHealingSchedule.cancel(true); + } beholderHealingSchedule = null; - if (beholderBuffSchedule != null) { beholderBuffSchedule.cancel(true); } + if (beholderBuffSchedule != null) { + beholderBuffSchedule.cancel(true); + } beholderBuffSchedule = null; - if (berserkSchedule != null) { berserkSchedule.cancel(true); } + if (berserkSchedule != null) { + berserkSchedule.cancel(true); + } berserkSchedule = null; unregisterChairBuff(); @@ -10471,37 +10480,45 @@ public class MapleCharacter extends AbstractMapleCharacterObject { cancelSkillCooldownTask(); cancelExpirationTask(); - if (questExpireTask != null) { questExpireTask.cancel(true); } + if (questExpireTask != null) { + questExpireTask.cancel(true); + } questExpireTask = null; - if (recoveryTask != null) { recoveryTask.cancel(true); } + if (recoveryTask != null) { + recoveryTask.cancel(true); + } recoveryTask = null; - if (extraRecoveryTask != null) { extraRecoveryTask.cancel(true); } + if (extraRecoveryTask != null) { + extraRecoveryTask.cancel(true); + } extraRecoveryTask = null; // already done on unregisterChairBuff /* if (chairRecoveryTask != null) { chairRecoveryTask.cancel(true); } chairRecoveryTask = null; */ - if (pendantOfSpirit != null) { pendantOfSpirit.cancel(true); } + if (pendantOfSpirit != null) { + pendantOfSpirit.cancel(true); + } pendantOfSpirit = null; - + clearCpqTimer(); - + evtLock.lock(); try { if (questExpireTask != null) { questExpireTask.cancel(false); questExpireTask = null; - + questExpirations.clear(); questExpirations = null; } } finally { evtLock.unlock(); } - + if (maplemount != null) { maplemount.empty(); maplemount = null; @@ -10513,18 +10530,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { mgc = null; party = null; MapleFamilyEntry familyEntry = getFamilyEntry(); - if(familyEntry != null) { + if (familyEntry != null) { familyEntry.setCharacter(null); setFamilyEntry(null); } - + getWorldServer().registerTimedMapObject(new Runnable() { @Override public void run() { client = null; // clients still triggers handlers a few times after disconnecting map = null; setListener(null); - + // thanks Shavit for noticing a memory leak with inventories holding owner object for (int i = 0; i < inventory.length; i++) { inventory[i].dispose(); @@ -10547,15 +10564,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject { e.printStackTrace(); } } - + public void setLoginTime(long time) { this.loginTime = time; } - + public long getLoginTime() { return loginTime; } - + public long getLoggedInTime() { return System.currentTimeMillis() - loginTime; } @@ -10569,7 +10586,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } public boolean getWhiteChat() { - return !isGM() ? false : whiteChat; + return isGM() && whiteChat; } public void toggleWhiteChat() { @@ -10608,45 +10625,45 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setDragon(MapleDragon dragon) { this.dragon = dragon; } - + public void setAutopotHpAlert(float hpPortion) { autopotHpAlert = hpPortion; } - + public float getAutopotHpAlert() { return autopotHpAlert; } - + public void setAutopotMpAlert(float mpPortion) { autopotMpAlert = mpPortion; } - + public float getAutopotMpAlert() { return autopotMpAlert; } - + public long getJailExpirationTimeLeft() { return jailExpiration - System.currentTimeMillis(); } - + private void setFutureJailExpiration(long time) { jailExpiration = System.currentTimeMillis() + time; } - + public void addJailExpirationTime(long time) { long timeLeft = getJailExpirationTimeLeft(); - if(timeLeft <= 0) { + if (timeLeft <= 0) { setFutureJailExpiration(time); } else { setFutureJailExpiration(timeLeft + time); } } - + public void removeJailExpirationTime() { jailExpiration = 0; } - + public boolean registerNameChange(String newName) { try (Connection con = DatabaseConnection.getConnection()) { //check for pending name change @@ -10703,7 +10720,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + public void doPendingNameChange() { //called on logout if (!pendingNameChange) { return; @@ -10731,7 +10748,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { if (!success) { con.rollback(); } else { - FilePrinter.print(FilePrinter.CHANGE_CHARACTER_NAME, "Name change applied : from \"" + getName() + "\" to \"" + newName + "\" at " + Calendar.getInstance().getTime().toString()); + FilePrinter.print(FilePrinter.CHANGE_CHARACTER_NAME, "Name change applied : from \"" + getName() + "\" to \"" + newName + "\" at " + Calendar.getInstance().getTime()); } con.setAutoCommit(true); } catch (SQLException e) { @@ -10739,7 +10756,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e, "Failed to get DB connection."); } } - + public static void doNameChange(int characterId, String oldName, String newName, int nameChangeId) { //Don't do this while player is online try (Connection con = DatabaseConnection.getConnection()) { con.setAutoCommit(false); @@ -10753,7 +10770,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e, "Failed to get DB connection."); } } - + public static boolean doNameChange(Connection con, int characterId, String oldName, String newName, int nameChangeId) { try (PreparedStatement ps = con.prepareStatement("UPDATE characters SET name = ? WHERE id = ?")) { ps.setString(1, newName); @@ -10897,36 +10914,48 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return true; } - + public int checkWorldTransferEligibility() { - if(getLevel() < 20) { + if (getLevel() < 20) { return 2; - } else if(getClient().getTempBanCalendar() != null && getClient().getTempBanCalendar().getTimeInMillis() + (30*24*60*60*1000) < Calendar.getInstance().getTimeInMillis()) { + } else if (getClient().getTempBanCalendar() != null && getClient().getTempBanCalendar().getTimeInMillis() + (30 * 24 * 60 * 60 * 1000) < Calendar.getInstance().getTimeInMillis()) { return 3; - } else if(isMarried()) { + } else if (isMarried()) { return 4; - } else if(getGuildRank() < 2) { + } else if (getGuildRank() < 2) { return 5; - } else if(getFamily() != null) { + } else if (getFamily() != null) { return 8; } else { return 0; } } - + public static String checkWorldTransferEligibility(Connection con, int characterId, int oldWorld, int newWorld) { - if(!YamlConfig.config.server.ALLOW_CASHSHOP_WORLD_TRANSFER) return "World transfers disabled."; + if (!YamlConfig.config.server.ALLOW_CASHSHOP_WORLD_TRANSFER) { + return "World transfers disabled."; + } int accountId = -1; try (PreparedStatement ps = con.prepareStatement("SELECT accountid, level, guildid, guildrank, partnerId, familyId FROM characters WHERE id = ?")) { ps.setInt(1, characterId); ResultSet rs = ps.executeQuery(); - if(!rs.next()) return "Character does not exist."; + if (!rs.next()) { + return "Character does not exist."; + } accountId = rs.getInt("accountid"); - if(rs.getInt("level") < 20) return "Character is under level 20."; - if(rs.getInt("familyId") != -1) return "Character is in family."; - if(rs.getInt("partnerId") != 0) return "Character is married."; - if(rs.getInt("guildid") != 0 && rs.getInt("guildrank") < 2) return "Character is the leader of a guild."; - } catch(SQLException e) { + if (rs.getInt("level") < 20) { + return "Character is under level 20."; + } + if (rs.getInt("familyId") != -1) { + return "Character is in family."; + } + if (rs.getInt("partnerId") != 0) { + return "Character is married."; + } + if (rs.getInt("guildid") != 0 && rs.getInt("guildrank") < 2) { + return "Character is the leader of a guild."; + } + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e); return "SQL Error"; @@ -10938,10 +10967,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return "Account does not exist."; } LocalDateTime tempban = rs.getTimestamp("tempban").toLocalDateTime(); - if(!tempban.equals(DefaultDates.getTempban())) { + if (!tempban.equals(DefaultDates.getTempban())) { return "Account has been banned."; } - } catch(SQLException e) { + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e); return "SQL Error"; @@ -10950,16 +10979,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ps.setInt(1, accountId); ps.setInt(2, newWorld); ResultSet rs = ps.executeQuery(); - if(!rs.next()) return "SQL Error"; - if(rs.getInt("rowcount") >= 3) return "Too many characters on destination world."; - } catch(SQLException e) { + if (!rs.next()) { + return "SQL Error"; + } + if (rs.getInt("rowcount") >= 3) { + return "Too many characters on destination world."; + } + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e); return "SQL Error"; } return null; } - + public boolean registerWorldTransfer(int newWorld) { try (Connection con = DatabaseConnection.getConnection()) { //check for pending world transfer @@ -10997,7 +11030,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return false; } - + public boolean cancelPendingWorldTranfer() { try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM worldtransfers WHERE characterid=? AND completionTime IS NULL")) { @@ -11010,18 +11043,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject { return false; } } - + public static boolean doWorldTransfer(Connection con, int characterId, int oldWorld, int newWorld, int worldTransferId) { int mesos = 0; try (PreparedStatement ps = con.prepareStatement("SELECT meso FROM characters WHERE id = ?")) { ps.setInt(1, characterId); ResultSet rs = ps.executeQuery(); - if(!rs.next()) { + if (!rs.next()) { FilePrinter.printError(FilePrinter.WORLD_TRANSFER, "Character data invalid? (charid " + characterId + ")"); return false; } mesos = rs.getInt("meso"); - } catch(SQLException e) { + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.WORLD_TRANSFER, e, "Character ID : " + characterId); return false; @@ -11033,7 +11066,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ps.setInt(4, 5); ps.setInt(5, characterId); ps.executeUpdate(); - } catch(SQLException e) { + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.WORLD_TRANSFER, e, "Character ID : " + characterId); return false; @@ -11042,17 +11075,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject { ps.setInt(1, characterId); ps.setInt(2, characterId); ps.executeUpdate(); - } catch(SQLException e) { + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.WORLD_TRANSFER, e, "Character ID : " + characterId); return false; } - if(worldTransferId != -1) { + if (worldTransferId != -1) { try (PreparedStatement ps = con.prepareStatement("UPDATE worldtransfers SET completionTime = ? WHERE id = ?")) { ps.setTimestamp(1, new Timestamp(System.currentTimeMillis())); ps.setInt(2, worldTransferId); ps.executeUpdate(); - } catch(SQLException e) { + } catch (SQLException e) { e.printStackTrace(); FilePrinter.printError(FilePrinter.WORLD_TRANSFER, e, "Character ID : " + characterId); return false; @@ -11060,11 +11093,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { } return true; } - + public String getLastCommandMessage() { return this.commandtext; } - + public void setLastCommandMessage(String text) { this.commandtext = text; } @@ -11149,13 +11182,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject { setLevel(0); levelUp(true); } - + //EVENTS private byte team = 0; private MapleFitness fitness; private MapleOla ola; private long snowballattack; - + public byte getTeam() { return team; } @@ -11187,19 +11220,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setLastSnowballAttack(long time) { this.snowballattack = time; } - + // MCPQ - + public AriantColiseum ariantColiseum; private MonsterCarnival monsterCarnival; private MonsterCarnivalParty monsterCarnivalParty = null; - + private int cp = 0; private int totCP = 0; private int FestivalPoints; private boolean challenged = false; public short totalCP, availableCP; - + public void gainFestivalPoints(int gain) { this.FestivalPoints += gain; } @@ -11277,7 +11310,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setMonsterCarnival(MonsterCarnival monsterCarnival) { this.monsterCarnival = monsterCarnival; } - + public AriantColiseum getAriantColiseum() { return ariantColiseum; } @@ -11285,11 +11318,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setAriantColiseum(AriantColiseum ariantColiseum) { this.ariantColiseum = ariantColiseum; } - + public MonsterCarnivalParty getMonsterCarnivalParty() { return this.monsterCarnivalParty; } - + public void setMonsterCarnivalParty(MonsterCarnivalParty mcp) { this.monsterCarnivalParty = mcp; } @@ -11301,11 +11334,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject { public void setChallenged(boolean challenged) { this.challenged = challenged; } - + public void gainAriantPoints(int points) { this.ariantPoints += points; } - + public int getAriantPoints() { return this.ariantPoints; } diff --git a/src/main/java/client/MapleClient.java b/src/main/java/client/MapleClient.java index a6846a955e..53652d7ff1 100644 --- a/src/main/java/client/MapleClient.java +++ b/src/main/java/client/MapleClient.java @@ -94,7 +94,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { private volatile boolean inTransition; private io.netty.channel.Channel ioChannel; - private MapleCharacter player; + private Character player; private int channel = 1; private int accId = -4; private boolean loggedIn = false; @@ -288,11 +288,11 @@ public class MapleClient extends ChannelInboundHandlerAdapter { return getChannelServer().getEventSM().getEventManager(event); } - public MapleCharacter getPlayer() { + public Character getPlayer() { return player; } - public void setPlayer(MapleCharacter player) { + public void setPlayer(Character player) { this.player = player; } @@ -304,11 +304,11 @@ public class MapleClient extends ChannelInboundHandlerAdapter { this.sendPacket(PacketCreator.getCharList(this, server, 0)); } - public List loadCharacters(int serverId) { - List chars = new ArrayList<>(15); + public List loadCharacters(int serverId) { + List chars = new ArrayList<>(15); try { for (CharNameAndId cni : loadCharactersInternal(serverId)) { - chars.add(MapleCharacter.loadCharFromDB(cni.id, this, false)); + chars.add(Character.loadCharFromDB(cni.id, this, false)); } } catch (Exception e) { e.printStackTrace(); @@ -1091,7 +1091,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { public boolean deleteCharacter(int cid, int senderAccId) { try { - MapleCharacter chr = MapleCharacter.loadCharFromDB(cid, this, false); + Character chr = Character.loadCharFromDB(cid, this, false); Integer partyid = chr.getWorldServer().getCharacterPartyid(cid); if (partyid != null) { @@ -1105,7 +1105,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { this.setPlayer(null); } - return MapleCharacter.deleteCharFromDB(chr, senderAccId); + return Character.deleteCharFromDB(chr, senderAccId); } catch (SQLException ex) { ex.printStackTrace(); return false; @@ -1221,7 +1221,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { } for (World w : Server.getInstance().getWorlds()) { - for (MapleCharacter chr : w.getPlayerStorage().getAllCharacters()) { + for (Character chr : w.getPlayerStorage().getAllCharacters()) { if (accid == chr.getAccountID()) { FilePrinter.print(FilePrinter.EXPLOITS, "Player: " + chr.getName() + " has been removed from " + GameConstants.WORLD_NAMES[w.getId()] + ". Possible Dupe attempt."); chr.getClient().forceDisconnect(); diff --git a/src/main/java/client/MapleFamily.java b/src/main/java/client/MapleFamily.java index b0a295f5b4..9a7ec6d21c 100644 --- a/src/main/java/client/MapleFamily.java +++ b/src/main/java/client/MapleFamily.java @@ -158,7 +158,7 @@ public class MapleFamily { public void broadcast(Packet packet, int ignoreID) { for(MapleFamilyEntry entry : members.values()) { - MapleCharacter chr = entry.getChr(); + Character chr = entry.getChr(); if(chr != null) { if(chr.getId() == ignoreID) continue; chr.sendPacket(packet); @@ -168,7 +168,7 @@ public class MapleFamily { public void broadcastFamilyInfoUpdate() { for(MapleFamilyEntry entry : members.values()) { - MapleCharacter chr = entry.getChr(); + Character chr = entry.getChr(); if(chr != null) { chr.sendPacket(PacketCreator.getFamilyInfo(entry)); } diff --git a/src/main/java/client/MapleFamilyEntry.java b/src/main/java/client/MapleFamilyEntry.java index f42cf3d540..cd8c032d85 100644 --- a/src/main/java/client/MapleFamilyEntry.java +++ b/src/main/java/client/MapleFamilyEntry.java @@ -40,7 +40,7 @@ import java.util.List; public class MapleFamilyEntry { private final int characterID; private volatile MapleFamily family; - private volatile MapleCharacter character; + private volatile Character character; private volatile MapleFamilyEntry senior; private final MapleFamilyEntry[] juniors = new MapleFamilyEntry[2]; @@ -66,17 +66,17 @@ public class MapleFamilyEntry { this.job = job; } - public MapleCharacter getChr() { + public Character getChr() { return character; } - public void setCharacter(MapleCharacter newCharacter) { + public void setCharacter(Character newCharacter) { if(newCharacter == null) cacheOffline(newCharacter); else newCharacter.setFamilyEntry(this); this.character = newCharacter; } - private void cacheOffline(MapleCharacter chr) { + private void cacheOffline(Character chr) { if(chr != null) { charName = chr.getName(); level = chr.getLevel(); @@ -209,19 +209,19 @@ public class MapleFamilyEntry { } public String getName() { - MapleCharacter chr = character; + Character chr = character; if(chr != null) return chr.getName(); else return charName; } public int getLevel() { - MapleCharacter chr = character; + Character chr = character; if(chr != null) return chr.getLevel(); else return level; } public MapleJob getJob() { - MapleCharacter chr = character; + Character chr = character; if(chr != null) return chr.getJob(); else return job; } @@ -264,7 +264,7 @@ public class MapleFamilyEntry { if(gain > 0 && countTowardsTotal) { this.totalReputation += gain; } - MapleCharacter chr = getChr(); + Character chr = getChr(); if(chr != null) chr.sendPacket(PacketCreator.sendGainRep(gain, from != null ? from.getName() : "")); } @@ -424,7 +424,7 @@ public class MapleFamilyEntry { public void announceToSenior(Packet packet, boolean includeSuperSenior) { MapleFamilyEntry senior = getSenior(); if(senior != null) { - MapleCharacter seniorChr = senior.getChr(); + Character seniorChr = senior.getChr(); if(seniorChr != null) seniorChr.sendPacket(packet); senior = senior.getSenior(); if(includeSuperSenior && senior != null) { @@ -437,7 +437,7 @@ public class MapleFamilyEntry { public void updateSeniorFamilyInfo(boolean includeSuperSenior) { MapleFamilyEntry senior = getSenior(); if(senior != null) { - MapleCharacter seniorChr = senior.getChr(); + Character seniorChr = senior.getChr(); if(seniorChr != null) seniorChr.sendPacket(PacketCreator.getFamilyInfo(senior)); senior = senior.getSenior(); if(includeSuperSenior && senior != null) { diff --git a/src/main/java/client/MapleMount.java b/src/main/java/client/MapleMount.java index 242b711a7c..020eef4f26 100644 --- a/src/main/java/client/MapleMount.java +++ b/src/main/java/client/MapleMount.java @@ -30,10 +30,10 @@ public class MapleMount { private int tiredness; private int exp; private int level; - private MapleCharacter owner; + private Character owner; private boolean active; - public MapleMount(MapleCharacter owner, int id, int skillid) { + public MapleMount(Character owner, int id, int skillid) { this.itemid = id; this.skillid = skillid; this.tiredness = 0; diff --git a/src/main/java/client/MapleRing.java b/src/main/java/client/MapleRing.java index 0a5f921e6a..6565fc9e9a 100644 --- a/src/main/java/client/MapleRing.java +++ b/src/main/java/client/MapleRing.java @@ -103,7 +103,7 @@ public class MapleRing implements Comparable { } } - public static Pair createRing(int itemid, final MapleCharacter partner1, final MapleCharacter partner2) { + public static Pair createRing(int itemid, final Character partner1, final Character partner2) { try { if (partner1 == null) { return new Pair<>(-3, -3); diff --git a/src/main/java/client/autoban/AutobanFactory.java b/src/main/java/client/autoban/AutobanFactory.java index 481a7a0ee4..2fba4249a7 100644 --- a/src/main/java/client/autoban/AutobanFactory.java +++ b/src/main/java/client/autoban/AutobanFactory.java @@ -22,7 +22,7 @@ along with this program. If not, see . package client.autoban; -import client.MapleCharacter; +import client.Character; import config.YamlConfig; import net.packet.logging.MapleLogger; import net.server.Server; @@ -83,19 +83,19 @@ public enum AutobanFactory { ban.addPoint(this, reason); } - public void alert(MapleCharacter chr, String reason) { + public void alert(Character chr, String reason) { if(YamlConfig.config.server.USE_AUTOBAN == true) { if (chr != null && MapleLogger.ignored.contains(chr.getId())){ return; } - Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), PacketCreator.sendYellowTip((chr != null ? MapleCharacter.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason)); + Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), PacketCreator.sendYellowTip((chr != null ? Character.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason)); } if (YamlConfig.config.server.USE_AUTOBAN_LOG) { - FilePrinter.print(FilePrinter.AUTOBAN_WARNING, (chr != null ? MapleCharacter.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason); + FilePrinter.print(FilePrinter.AUTOBAN_WARNING, (chr != null ? Character.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason); } } - public void autoban(MapleCharacter chr, String value) { + public void autoban(Character chr, String value) { if(YamlConfig.config.server.USE_AUTOBAN == true) { chr.autoban("Autobanned for (" + this.name() + ": " + value + ")"); //chr.sendPolice("You will be disconnected for (" + this.name() + ": " + value + ")"); diff --git a/src/main/java/client/autoban/AutobanManager.java b/src/main/java/client/autoban/AutobanManager.java index e348fcfa29..1a3b782b20 100644 --- a/src/main/java/client/autoban/AutobanManager.java +++ b/src/main/java/client/autoban/AutobanManager.java @@ -5,7 +5,7 @@ package client.autoban; -import client.MapleCharacter; +import client.Character; import config.YamlConfig; import net.server.Server; import tools.FilePrinter; @@ -18,7 +18,7 @@ import java.util.Map; * @author kevintjuh93 */ public class AutobanManager { - private MapleCharacter chr; + private Character chr; private Map points = new HashMap<>(); private Map lastTime = new HashMap<>(); private int misses = 0; @@ -29,7 +29,7 @@ public class AutobanManager { private byte[] timestampcounter = new byte[20]; - public AutobanManager(MapleCharacter chr) { + public AutobanManager(Character chr) { this.chr = chr; } @@ -58,7 +58,7 @@ public class AutobanManager { } if (YamlConfig.config.server.USE_AUTOBAN_LOG) { // Lets log every single point too. - FilePrinter.print(FilePrinter.AUTOBAN_WARNING, MapleCharacter.makeMapleReadable(chr.getName()) + " caused " + fac.name() + " " + reason); + FilePrinter.print(FilePrinter.AUTOBAN_WARNING, Character.makeMapleReadable(chr.getName()) + " caused " + fac.name() + " " + reason); } } diff --git a/src/main/java/client/command/commands/gm0/GmCommand.java b/src/main/java/client/command/commands/gm0/GmCommand.java index 9c2a94105f..b3f04324a2 100644 --- a/src/main/java/client/command/commands/gm0/GmCommand.java +++ b/src/main/java/client/command/commands/gm0/GmCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -45,15 +45,15 @@ public class GmCommand extends Command { "Do not ask if you can receive help, just state your issue.", "Do not say 'I have a bug to report', just state it.", }; - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1 || params[0].length() < 3) { // #goodbye 'hi' player.dropMessage(5, "Your message was too short. Please provide as much detail as possible."); return; } String message = player.getLastCommandMessage(); - Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[GM Message]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[GM Message]:" + Character.makeMapleReadable(player.getName()) + ": " + message)); Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(1, message)); - FilePrinter.printError(FilePrinter.COMMAND_GM, MapleCharacter.makeMapleReadable(player.getName()) + ": " + message); + FilePrinter.printError(FilePrinter.COMMAND_GM, Character.makeMapleReadable(player.getName()) + ": " + message); player.dropMessage(5, "Your message '" + message + "' was sent to GMs."); player.dropMessage(5, tips[Randomizer.nextInt(tips.length)]); } diff --git a/src/main/java/client/command/commands/gm0/JoinEventCommand.java b/src/main/java/client/command/commands/gm0/JoinEventCommand.java index b0dc8e6be0..0f721272d4 100644 --- a/src/main/java/client/command/commands/gm0/JoinEventCommand.java +++ b/src/main/java/client/command/commands/gm0/JoinEventCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.events.gm.MapleEvent; @@ -36,7 +36,7 @@ public class JoinEventCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if(!FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) { MapleEvent event = c.getChannelServer().getEvent(); if(event != null) { diff --git a/src/main/java/client/command/commands/gm0/LeaveEventCommand.java b/src/main/java/client/command/commands/gm0/LeaveEventCommand.java index c8c5ef215d..721ed32829 100644 --- a/src/main/java/client/command/commands/gm0/LeaveEventCommand.java +++ b/src/main/java/client/command/commands/gm0/LeaveEventCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class LeaveEventCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int returnMap = player.getSavedLocation("EVENT"); if(returnMap != -1) { if(player.getOla() != null) { diff --git a/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java b/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java index 18f74f02aa..0cabe6293c 100644 --- a/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java +++ b/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -38,7 +38,7 @@ public class MapOwnerClaimCommand extends Command { public void execute(MapleClient c, String[] params) { if (c.tryacquireClient()) { try { - MapleCharacter chr = c.getPlayer(); + Character chr = c.getPlayer(); if (YamlConfig.config.server.USE_MAP_OWNERSHIP_SYSTEM) { if (chr.getEventInstance() == null) { diff --git a/src/main/java/client/command/commands/gm0/OnlineCommand.java b/src/main/java/client/command/commands/gm0/OnlineCommand.java index 683ac3e4ad..29edf19b47 100644 --- a/src/main/java/client/command/commands/gm0/OnlineCommand.java +++ b/src/main/java/client/command/commands/gm0/OnlineCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,12 +36,12 @@ public class OnlineCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (Channel ch : Server.getInstance().getChannelsFromWorld(player.getWorld())) { player.yellowMessage("Players in Channel " + ch.getId() + ":"); - for (MapleCharacter chr : ch.getPlayerStorage().getAllCharacters()) { + for (Character chr : ch.getPlayerStorage().getAllCharacters()) { if (!chr.isGM()) { - player.message(" >> " + MapleCharacter.makeMapleReadable(chr.getName()) + " is at " + chr.getMap().getMapName() + "."); + player.message(" >> " + Character.makeMapleReadable(chr.getName()) + " is at " + chr.getMap().getMapName() + "."); } } } diff --git a/src/main/java/client/command/commands/gm0/RanksCommand.java b/src/main/java/client/command/commands/gm0/RanksCommand.java index 8e517fae34..23682f0f4a 100644 --- a/src/main/java/client/command/commands/gm0/RanksCommand.java +++ b/src/main/java/client/command/commands/gm0/RanksCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -39,7 +39,7 @@ public class RanksCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); List> worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld()); player.sendPacket(GuildPackets.showPlayerRanks(9010000, worldRanking)); diff --git a/src/main/java/client/command/commands/gm0/RatesCommand.java b/src/main/java/client/command/commands/gm0/RatesCommand.java index 6052922a67..6764ff3a04 100644 --- a/src/main/java/client/command/commands/gm0/RatesCommand.java +++ b/src/main/java/client/command/commands/gm0/RatesCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class RatesCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); // travel rates not applicable since it's intrinsically a server/environment rate rather than a character rate String showMsg_ = "#eCHARACTER RATES#n" + "\r\n\r\n"; diff --git a/src/main/java/client/command/commands/gm0/ReadPointsCommand.java b/src/main/java/client/command/commands/gm0/ReadPointsCommand.java index f05ab1666d..368790bcc0 100644 --- a/src/main/java/client/command/commands/gm0/ReadPointsCommand.java +++ b/src/main/java/client/command/commands/gm0/ReadPointsCommand.java @@ -1,6 +1,6 @@ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -12,7 +12,7 @@ public class ReadPointsCommand extends Command { @Override public void execute(MapleClient client, String[] params) { - MapleCharacter player = client.getPlayer(); + Character player = client.getPlayer(); if (params.length > 2) { player.yellowMessage("Syntax: @points (rp|vp|all)"); return; diff --git a/src/main/java/client/command/commands/gm0/ReportBugCommand.java b/src/main/java/client/command/commands/gm0/ReportBugCommand.java index 7085dc730d..6ef44020bb 100644 --- a/src/main/java/client/command/commands/gm0/ReportBugCommand.java +++ b/src/main/java/client/command/commands/gm0/ReportBugCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,16 +37,16 @@ public class ReportBugCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Message too short and not sent. Please do @bug "); return; } String message = player.getLastCommandMessage(); - Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[Bug]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message)); + Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[Bug]:" + Character.makeMapleReadable(player.getName()) + ": " + message)); Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(1, message)); - FilePrinter.printError(FilePrinter.COMMAND_BUG, MapleCharacter.makeMapleReadable(player.getName()) + ": " + message); + FilePrinter.printError(FilePrinter.COMMAND_BUG, Character.makeMapleReadable(player.getName()) + ": " + message); player.dropMessage(5, "Your bug '" + message + "' was submitted successfully to our developers. Thank you!"); } diff --git a/src/main/java/client/command/commands/gm0/ShowRatesCommand.java b/src/main/java/client/command/commands/gm0/ShowRatesCommand.java index 4ab627330b..953568b443 100644 --- a/src/main/java/client/command/commands/gm0/ShowRatesCommand.java +++ b/src/main/java/client/command/commands/gm0/ShowRatesCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class ShowRatesCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); String showMsg = "#eEXP RATE#n" + "\r\n"; showMsg += "World EXP Rate: #k" + c.getWorldServer().getExpRate() + "x#k" + "\r\n"; showMsg += "Player EXP Rate: #k" + player.getRawExpRate() + "x#k" + "\r\n"; diff --git a/src/main/java/client/command/commands/gm0/StatDexCommand.java b/src/main/java/client/command/commands/gm0/StatDexCommand.java index fa93c26a8e..bdcc0130c9 100644 --- a/src/main/java/client/command/commands/gm0/StatDexCommand.java +++ b/src/main/java/client/command/commands/gm0/StatDexCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class StatDexCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int remainingAp = player.getRemainingAp(); int amount; diff --git a/src/main/java/client/command/commands/gm0/StatIntCommand.java b/src/main/java/client/command/commands/gm0/StatIntCommand.java index b40e4581ac..bb348728d8 100644 --- a/src/main/java/client/command/commands/gm0/StatIntCommand.java +++ b/src/main/java/client/command/commands/gm0/StatIntCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class StatIntCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int remainingAp = player.getRemainingAp(); int amount; diff --git a/src/main/java/client/command/commands/gm0/StatLukCommand.java b/src/main/java/client/command/commands/gm0/StatLukCommand.java index 4d7718eb89..d4c44f8462 100644 --- a/src/main/java/client/command/commands/gm0/StatLukCommand.java +++ b/src/main/java/client/command/commands/gm0/StatLukCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class StatLukCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int remainingAp = player.getRemainingAp(); int amount; diff --git a/src/main/java/client/command/commands/gm0/StatStrCommand.java b/src/main/java/client/command/commands/gm0/StatStrCommand.java index c83fdac3b4..34f548c51a 100644 --- a/src/main/java/client/command/commands/gm0/StatStrCommand.java +++ b/src/main/java/client/command/commands/gm0/StatStrCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm0; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class StatStrCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int remainingAp = player.getRemainingAp(); int amount; if (params.length > 0) { diff --git a/src/main/java/client/command/commands/gm1/BossHpCommand.java b/src/main/java/client/command/commands/gm1/BossHpCommand.java index da24831dd1..5658a2164f 100644 --- a/src/main/java/client/command/commands/gm1/BossHpCommand.java +++ b/src/main/java/client/command/commands/gm1/BossHpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleMonster; @@ -35,7 +35,7 @@ public class BossHpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for(MapleMonster monster : player.getMap().getAllMonsters()) { if(monster != null && monster.isBoss() && monster.getHp() > 0) { long percent = monster.getHp() * 100L / monster.getMaxHp(); diff --git a/src/main/java/client/command/commands/gm1/BuffMeCommand.java b/src/main/java/client/command/commands/gm1/BuffMeCommand.java index ae9629d9e0..4223af3f39 100644 --- a/src/main/java/client/command/commands/gm1/BuffMeCommand.java +++ b/src/main/java/client/command/commands/gm1/BuffMeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.SkillFactory; import client.command.Command; @@ -35,7 +35,7 @@ public class BuffMeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); SkillFactory.getSkill(4101004).getEffect(SkillFactory.getSkill(4101004).getMaxLevel()).applyTo(player); SkillFactory.getSkill(2311003).getEffect(SkillFactory.getSkill(2311003).getMaxLevel()).applyTo(player); SkillFactory.getSkill(1301007).getEffect(SkillFactory.getSkill(1301007).getMaxLevel()).applyTo(player); diff --git a/src/main/java/client/command/commands/gm1/GotoCommand.java b/src/main/java/client/command/commands/gm1/GotoCommand.java index 3568bd8250..587d062d71 100644 --- a/src/main/java/client/command/commands/gm1/GotoCommand.java +++ b/src/main/java/client/command/commands/gm1/GotoCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import constants.game.GameConstants; @@ -73,7 +73,7 @@ public class GotoCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1){ String sendStr = "Syntax: #b@goto #k. Available areas:\r\n\r\n#rTowns:#k\r\n" + GOTO_TOWNS_INFO; if (player.isGM()) { diff --git a/src/main/java/client/command/commands/gm1/MobHpCommand.java b/src/main/java/client/command/commands/gm1/MobHpCommand.java index 085cba6cd0..1b425f2c04 100644 --- a/src/main/java/client/command/commands/gm1/MobHpCommand.java +++ b/src/main/java/client/command/commands/gm1/MobHpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleMonster; @@ -35,7 +35,7 @@ public class MobHpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for(MapleMonster monster : player.getMap().getAllMonsters()) { if (monster != null && monster.getHp() > 0) { player.yellowMessage(monster.getName() + " (" + monster.getId() + ") has " + monster.getHp() + " / " + monster.getMaxHp() + " HP."); diff --git a/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java b/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java index 8b502268fc..0fdf15b24b 100644 --- a/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java +++ b/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.MapleItemInformationProvider; @@ -40,7 +40,7 @@ public class WhatDropsFromCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Please do @whatdropsfrom "); return; diff --git a/src/main/java/client/command/commands/gm1/WhoDropsCommand.java b/src/main/java/client/command/commands/gm1/WhoDropsCommand.java index c26c72acbf..782d9f4c1f 100644 --- a/src/main/java/client/command/commands/gm1/WhoDropsCommand.java +++ b/src/main/java/client/command/commands/gm1/WhoDropsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm1; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.MapleItemInformationProvider; @@ -43,7 +43,7 @@ public class WhoDropsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Please do @whodrops "); return; diff --git a/src/main/java/client/command/commands/gm2/ApCommand.java b/src/main/java/client/command/commands/gm2/ApCommand.java index d8891d6f3b..c44d19808a 100644 --- a/src/main/java/client/command/commands/gm2/ApCommand.java +++ b/src/main/java/client/command/commands/gm2/ApCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class ApCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !ap [] "); return; @@ -48,7 +48,7 @@ public class ApCommand extends Command { player.changeRemainingAp(newAp, false); } else { - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { int newAp = Integer.parseInt(params[1]); if (newAp < 0) newAp = 0; diff --git a/src/main/java/client/command/commands/gm2/BombCommand.java b/src/main/java/client/command/commands/gm2/BombCommand.java index 46d3f36f5a..345611d196 100644 --- a/src/main/java/client/command/commands/gm2/BombCommand.java +++ b/src/main/java/client/command/commands/gm2/BombCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,9 +37,9 @@ public class BombCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length > 0) { - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(9300166), victim.getPosition()); Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, player.getName() + " used !bomb on " + victim.getName())); diff --git a/src/main/java/client/command/commands/gm2/BuffCommand.java b/src/main/java/client/command/commands/gm2/BuffCommand.java index efd8fc97aa..424015015f 100644 --- a/src/main/java/client/command/commands/gm2/BuffCommand.java +++ b/src/main/java/client/command/commands/gm2/BuffCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.Skill; import client.SkillFactory; @@ -36,7 +36,7 @@ public class BuffCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !buff "); return; diff --git a/src/main/java/client/command/commands/gm2/BuffMapCommand.java b/src/main/java/client/command/commands/gm2/BuffMapCommand.java index 7cce5456d0..fdf9778817 100644 --- a/src/main/java/client/command/commands/gm2/BuffMapCommand.java +++ b/src/main/java/client/command/commands/gm2/BuffMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.SkillFactory; import client.command.Command; @@ -35,7 +35,7 @@ public class BuffMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); SkillFactory.getSkill(9101001).getEffect(SkillFactory.getSkill(9101001).getMaxLevel()).applyTo(player, true); SkillFactory.getSkill(9101002).getEffect(SkillFactory.getSkill(9101002).getMaxLevel()).applyTo(player, true); SkillFactory.getSkill(9101003).getEffect(SkillFactory.getSkill(9101003).getMaxLevel()).applyTo(player, true); diff --git a/src/main/java/client/command/commands/gm2/ClearDropsCommand.java b/src/main/java/client/command/commands/gm2/ClearDropsCommand.java index d2c19b69ae..f7ffefafbe 100644 --- a/src/main/java/client/command/commands/gm2/ClearDropsCommand.java +++ b/src/main/java/client/command/commands/gm2/ClearDropsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class ClearDropsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.getMap().clearDrops(player); player.dropMessage(5, "Cleared dropped items"); } diff --git a/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java b/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java index a6f152c50a..b3bc49632b 100644 --- a/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java +++ b/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.SavedLocationType; @@ -35,7 +35,7 @@ public class ClearSavedLocationsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(), victim; + Character player = c.getPlayer(), victim; if (params.length > 0) { victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); diff --git a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java b/src/main/java/client/command/commands/gm2/ClearSlotCommand.java index 13b354b427..f6ba53a872 100644 --- a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java +++ b/src/main/java/client/command/commands/gm2/ClearSlotCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.InventoryType; @@ -37,7 +37,7 @@ public class ClearSlotCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !clearslot "); return; diff --git a/src/main/java/client/command/commands/gm2/DcCommand.java b/src/main/java/client/command/commands/gm2/DcCommand.java index ef333e9981..8725a2010c 100644 --- a/src/main/java/client/command/commands/gm2/DcCommand.java +++ b/src/main/java/client/command/commands/gm2/DcCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,13 +34,13 @@ public class DcCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !dc "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { diff --git a/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java b/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java index a02c8dcfa3..beb40375c4 100644 --- a/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java +++ b/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.SkillFactory; import client.command.Command; @@ -35,7 +35,7 @@ public class EmpowerMeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); final int[] array = {2311003, 2301004, 1301007, 4101004, 2001002, 1101007, 1005, 2301003, 5121009, 1111002, 4111001, 4111002, 4211003, 4211005, 1321000, 2321004, 3121002}; for (int i : array) { SkillFactory.getSkill(i).getEffect(SkillFactory.getSkill(i).getMaxLevel()).applyTo(player); diff --git a/src/main/java/client/command/commands/gm2/HealCommand.java b/src/main/java/client/command/commands/gm2/HealCommand.java index 71356dc5ff..1b71c8bc06 100644 --- a/src/main/java/client/command/commands/gm2/HealCommand.java +++ b/src/main/java/client/command/commands/gm2/HealCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class HealCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.healHpMp(); } diff --git a/src/main/java/client/command/commands/gm2/HideCommand.java b/src/main/java/client/command/commands/gm2/HideCommand.java index d806c97879..dcba586058 100644 --- a/src/main/java/client/command/commands/gm2/HideCommand.java +++ b/src/main/java/client/command/commands/gm2/HideCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.SkillFactory; import client.command.Command; @@ -35,7 +35,7 @@ public class HideCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); SkillFactory.getSkill(9101004).getEffect(SkillFactory.getSkill(9101004).getMaxLevel()).applyTo(player); } diff --git a/src/main/java/client/command/commands/gm2/IdCommand.java b/src/main/java/client/command/commands/gm2/IdCommand.java index d37d84f4a8..231e12ae13 100644 --- a/src/main/java/client/command/commands/gm2/IdCommand.java +++ b/src/main/java/client/command/commands/gm2/IdCommand.java @@ -1,6 +1,6 @@ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.ThreadManager; @@ -31,7 +31,7 @@ public class IdCommand extends Command { @Override public void execute(MapleClient client, final String[] params) { - final MapleCharacter player = client.getPlayer(); + final Character player = client.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !id "); return; diff --git a/src/main/java/client/command/commands/gm2/ItemCommand.java b/src/main/java/client/command/commands/gm2/ItemCommand.java index da502495c2..f679382a27 100644 --- a/src/main/java/client/command/commands/gm2/ItemCommand.java +++ b/src/main/java/client/command/commands/gm2/ItemCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.Pet; @@ -39,7 +39,7 @@ public class ItemCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !item "); diff --git a/src/main/java/client/command/commands/gm2/ItemDropCommand.java b/src/main/java/client/command/commands/gm2/ItemDropCommand.java index 69f241c2de..06e3d5b5db 100644 --- a/src/main/java/client/command/commands/gm2/ItemDropCommand.java +++ b/src/main/java/client/command/commands/gm2/ItemDropCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.InventoryType; @@ -40,7 +40,7 @@ public class ItemDropCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !drop "); diff --git a/src/main/java/client/command/commands/gm2/JailCommand.java b/src/main/java/client/command/commands/gm2/JailCommand.java index 55c5ae82f7..eac11882cf 100644 --- a/src/main/java/client/command/commands/gm2/JailCommand.java +++ b/src/main/java/client/command/commands/gm2/JailCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -36,7 +36,7 @@ public class JailCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !jail []"); return; @@ -51,7 +51,7 @@ public class JailCommand extends Command { } } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.addJailExpirationTime(minutesJailed * 60 * 1000); diff --git a/src/main/java/client/command/commands/gm2/JobCommand.java b/src/main/java/client/command/commands/gm2/JobCommand.java index 7edf328f17..a3846d5138 100644 --- a/src/main/java/client/command/commands/gm2/JobCommand.java +++ b/src/main/java/client/command/commands/gm2/JobCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleJob; import client.command.Command; @@ -35,7 +35,7 @@ public class JobCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length == 1) { int jobid = Integer.parseInt(params[0]); if (jobid < 0 || jobid >= 2200) { @@ -46,7 +46,7 @@ public class JobCommand extends Command { player.changeJob(MapleJob.getById(jobid)); player.equipChanged(); } else if (params.length == 2) { - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { int jobid = Integer.parseInt(params[1]); diff --git a/src/main/java/client/command/commands/gm2/LevelCommand.java b/src/main/java/client/command/commands/gm2/LevelCommand.java index 6074fb4161..7a87917c5c 100644 --- a/src/main/java/client/command/commands/gm2/LevelCommand.java +++ b/src/main/java/client/command/commands/gm2/LevelCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class LevelCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !level "); return; diff --git a/src/main/java/client/command/commands/gm2/LevelProCommand.java b/src/main/java/client/command/commands/gm2/LevelProCommand.java index 4a86e7e017..0441a518e6 100644 --- a/src/main/java/client/command/commands/gm2/LevelProCommand.java +++ b/src/main/java/client/command/commands/gm2/LevelProCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class LevelProCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !levelpro "); return; diff --git a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java index e78b96c482..7d85807f70 100644 --- a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java +++ b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java @@ -23,6 +23,7 @@ */ package client.command.commands.gm2; +import client.Character; import client.*; import client.command.Command; import provider.MapleData; @@ -36,7 +37,7 @@ public class MaxSkillCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (MapleData skill_ : MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) { try { Skill skill = SkillFactory.getSkill(Integer.parseInt(skill_.getName())); diff --git a/src/main/java/client/command/commands/gm2/MaxStatCommand.java b/src/main/java/client/command/commands/gm2/MaxStatCommand.java index cadf709fec..5d6962ffb1 100644 --- a/src/main/java/client/command/commands/gm2/MaxStatCommand.java +++ b/src/main/java/client/command/commands/gm2/MaxStatCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleStat; import client.command.Command; @@ -36,7 +36,7 @@ public class MaxStatCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.loseExp(player.getExp(), false, false); player.setLevel(255); player.resetPlayerRates(); diff --git a/src/main/java/client/command/commands/gm2/ReachCommand.java b/src/main/java/client/command/commands/gm2/ReachCommand.java index 36c55c2768..6ef589081a 100644 --- a/src/main/java/client/command/commands/gm2/ReachCommand.java +++ b/src/main/java/client/command/commands/gm2/ReachCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -35,13 +35,13 @@ public class ReachCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !reach "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null && victim.isLoggedin()) { if (player.getClient().getChannel() != victim.getClient().getChannel()) { player.dropMessage(5, "Player '" + victim.getName() + "' is at channel " + victim.getClient().getChannel() + "."); diff --git a/src/main/java/client/command/commands/gm2/RechargeCommand.java b/src/main/java/client/command/commands/gm2/RechargeCommand.java index 4df653a8c1..ede20c56d2 100644 --- a/src/main/java/client/command/commands/gm2/RechargeCommand.java +++ b/src/main/java/client/command/commands/gm2/RechargeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.InventoryType; @@ -38,7 +38,7 @@ public class RechargeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance(); for (Item torecharge : c.getPlayer().getInventory(InventoryType.USE).list()) { if (ItemConstants.isThrowingStar(torecharge.getItemId())){ diff --git a/src/main/java/client/command/commands/gm2/ResetSkillCommand.java b/src/main/java/client/command/commands/gm2/ResetSkillCommand.java index 2c194c0ad6..1805858a5d 100644 --- a/src/main/java/client/command/commands/gm2/ResetSkillCommand.java +++ b/src/main/java/client/command/commands/gm2/ResetSkillCommand.java @@ -23,6 +23,7 @@ */ package client.command.commands.gm2; +import client.Character; import client.*; import client.command.Command; import provider.MapleData; @@ -36,7 +37,7 @@ public class ResetSkillCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (MapleData skill_ : MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) { try { Skill skill = SkillFactory.getSkill(Integer.parseInt(skill_.getName())); diff --git a/src/main/java/client/command/commands/gm2/SearchCommand.java b/src/main/java/client/command/commands/gm2/SearchCommand.java index e37eb609c0..cc7c442718 100644 --- a/src/main/java/client/command/commands/gm2/SearchCommand.java +++ b/src/main/java/client/command/commands/gm2/SearchCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import provider.MapleData; @@ -53,7 +53,7 @@ public class SearchCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !search "); return; diff --git a/src/main/java/client/command/commands/gm2/SetSlotCommand.java b/src/main/java/client/command/commands/gm2/SetSlotCommand.java index af8a6b7ec8..2b58e52170 100644 --- a/src/main/java/client/command/commands/gm2/SetSlotCommand.java +++ b/src/main/java/client/command/commands/gm2/SetSlotCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class SetSlotCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !setslot "); return; diff --git a/src/main/java/client/command/commands/gm2/SetStatCommand.java b/src/main/java/client/command/commands/gm2/SetStatCommand.java index 72807331f9..f73915321d 100644 --- a/src/main/java/client/command/commands/gm2/SetStatCommand.java +++ b/src/main/java/client/command/commands/gm2/SetStatCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class SetStatCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !setstat "); return; diff --git a/src/main/java/client/command/commands/gm2/SpCommand.java b/src/main/java/client/command/commands/gm2/SpCommand.java index 2ff1314d1e..ffca819dfe 100644 --- a/src/main/java/client/command/commands/gm2/SpCommand.java +++ b/src/main/java/client/command/commands/gm2/SpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import config.YamlConfig; @@ -35,7 +35,7 @@ public class SpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !sp [] "); return; @@ -48,7 +48,7 @@ public class SpCommand extends Command { player.updateRemainingSp(newSp); } else { - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { int newSp = Integer.parseInt(params[1]); if (newSp < 0) newSp = 0; diff --git a/src/main/java/client/command/commands/gm2/SummonCommand.java b/src/main/java/client/command/commands/gm2/SummonCommand.java index f18d39920c..ad7da632a7 100644 --- a/src/main/java/client/command/commands/gm2/SummonCommand.java +++ b/src/main/java/client/command/commands/gm2/SummonCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,13 +37,13 @@ public class SummonCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !warphere "); return; } - MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { //If victim isn't on current channel, loop all channels on current world. diff --git a/src/main/java/client/command/commands/gm2/UnHideCommand.java b/src/main/java/client/command/commands/gm2/UnHideCommand.java index a4652349ad..d7398df036 100644 --- a/src/main/java/client/command/commands/gm2/UnHideCommand.java +++ b/src/main/java/client/command/commands/gm2/UnHideCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.SkillFactory; import client.command.Command; @@ -35,7 +35,7 @@ public class UnHideCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); SkillFactory.getSkill(9101004).getEffect(SkillFactory.getSkill(9101004).getMaxLevel()).applyTo(player); } diff --git a/src/main/java/client/command/commands/gm2/UnJailCommand.java b/src/main/java/client/command/commands/gm2/UnJailCommand.java index 36b8c8aa66..c4ef47940f 100644 --- a/src/main/java/client/command/commands/gm2/UnJailCommand.java +++ b/src/main/java/client/command/commands/gm2/UnJailCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,13 +34,13 @@ public class UnJailCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !unjail "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { if (victim.getJailExpirationTimeLeft() <= 0) { player.message("This player is already free."); diff --git a/src/main/java/client/command/commands/gm2/WarpAreaCommand.java b/src/main/java/client/command/commands/gm2/WarpAreaCommand.java index 44817456b0..b3809ab4a7 100644 --- a/src/main/java/client/command/commands/gm2/WarpAreaCommand.java +++ b/src/main/java/client/command/commands/gm2/WarpAreaCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -38,7 +38,7 @@ public class WarpAreaCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !warparea "); return; @@ -53,9 +53,9 @@ public class WarpAreaCommand extends Command { Point pos = player.getPosition(); - Collection characters = player.getMap().getAllPlayers(); + Collection characters = player.getMap().getAllPlayers(); - for (MapleCharacter victim : characters) { + for (Character victim : characters) { if (victim.getPosition().distanceSq(pos) <= 50000) { victim.saveLocationOnWarp(); victim.changeMap(target, target.getRandomPlayerSpawnpoint()); diff --git a/src/main/java/client/command/commands/gm2/WarpCommand.java b/src/main/java/client/command/commands/gm2/WarpCommand.java index 776da6e327..53e90ee4e2 100644 --- a/src/main/java/client/command/commands/gm2/WarpCommand.java +++ b/src/main/java/client/command/commands/gm2/WarpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.FieldLimit; @@ -37,7 +37,7 @@ public class WarpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !warp "); return; diff --git a/src/main/java/client/command/commands/gm2/WarpMapCommand.java b/src/main/java/client/command/commands/gm2/WarpMapCommand.java index 6ea1da3515..cbc4069cd9 100644 --- a/src/main/java/client/command/commands/gm2/WarpMapCommand.java +++ b/src/main/java/client/command/commands/gm2/WarpMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -37,7 +37,7 @@ public class WarpMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !warpmap "); return; @@ -50,9 +50,9 @@ public class WarpMapCommand extends Command { return; } - Collection characters = player.getMap().getAllPlayers(); + Collection characters = player.getMap().getAllPlayers(); - for (MapleCharacter victim : characters) { + for (Character victim : characters) { victim.saveLocationOnWarp(); victim.changeMap(target, target.getRandomPlayerSpawnpoint()); } diff --git a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java b/src/main/java/client/command/commands/gm2/WhereaMiCommand.java index b0635c99cc..9ac5a9b263 100644 --- a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java +++ b/src/main/java/client/command/commands/gm2/WhereaMiCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm2; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleMonster; @@ -40,9 +40,9 @@ public class WhereaMiCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); - HashSet chars = new HashSet<>(); + HashSet chars = new HashSet<>(); HashSet npcs = new HashSet<>(); HashSet playernpcs = new HashSet<>(); HashSet mobs = new HashSet<>(); @@ -51,8 +51,8 @@ public class WhereaMiCommand extends Command { if (mmo instanceof MapleNPC) { MapleNPC npc = (MapleNPC) mmo; npcs.add(npc); - } else if (mmo instanceof MapleCharacter) { - MapleCharacter mc = (MapleCharacter) mmo; + } else if (mmo instanceof Character) { + Character mc = (Character) mmo; chars.add(mc); } else if (mmo instanceof MapleMonster) { MapleMonster mob = (MapleMonster) mmo; @@ -68,7 +68,7 @@ public class WhereaMiCommand extends Command { player.yellowMessage("Map ID: " + player.getMap().getId()); player.yellowMessage("Players on this map:"); - for (MapleCharacter chr : chars) { + for (Character chr : chars) { player.dropMessage(5, ">> " + chr.getName() + " - " + chr.getId() + " - Oid: " + chr.getObjectId()); } diff --git a/src/main/java/client/command/commands/gm3/BanCommand.java b/src/main/java/client/command/commands/gm3/BanCommand.java index a6524147e9..01a616f569 100644 --- a/src/main/java/client/command/commands/gm3/BanCommand.java +++ b/src/main/java/client/command/commands/gm3/BanCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -42,16 +42,16 @@ public class BanCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !ban (Please be descriptive)"); return; } String ign = params[0]; String reason = joinStringFrom(params, 1); - MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(ign); + Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(ign); if (target != null) { - String readableTargetName = MapleCharacter.makeMapleReadable(target.getName()); + String readableTargetName = Character.makeMapleReadable(target.getName()); String ip = target.getClient().getRemoteAddress(); //Ban ip try (Connection con = DatabaseConnection.getConnection()) { @@ -74,10 +74,10 @@ public class BanCommand extends Command { target.yellowMessage("You have been banned by #b" + c.getPlayer().getName() + " #k."); target.yellowMessage("Reason: " + reason); c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0)); - final MapleCharacter rip = target; + final Character rip = target; TimerManager.getInstance().schedule(() -> rip.getClient().disconnect(false, false), 5000); //5 Seconds Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned.")); - } else if (MapleCharacter.ban(ign, reason, false)) { + } else if (Character.ban(ign, reason, false)) { c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0)); Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned.")); } else { diff --git a/src/main/java/client/command/commands/gm3/ChatCommand.java b/src/main/java/client/command/commands/gm3/ChatCommand.java index 8931b55fd0..0b13070b2e 100644 --- a/src/main/java/client/command/commands/gm3/ChatCommand.java +++ b/src/main/java/client/command/commands/gm3/ChatCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class ChatCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.toggleWhiteChat(); player.message("Your chat is now " + (player.getWhiteChat() ? " white" : "normal") + "."); } diff --git a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java b/src/main/java/client/command/commands/gm3/CheckDmgCommand.java index b708812e21..1ca8c34906 100644 --- a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java +++ b/src/main/java/client/command/commands/gm3/CheckDmgCommand.java @@ -24,7 +24,7 @@ package client.command.commands.gm3; import client.BuffStat; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -35,8 +35,8 @@ public class CheckDmgCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character player = c.getPlayer(); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { int maxBase = victim.calculateMaxBaseDamage(victim.getTotalWatk()); Integer watkBuff = victim.getBuffedValue(BuffStat.WATK); diff --git a/src/main/java/client/command/commands/gm3/ClosePortalCommand.java b/src/main/java/client/command/commands/gm3/ClosePortalCommand.java index 5e0b5d6709..fafc049f64 100644 --- a/src/main/java/client/command/commands/gm3/ClosePortalCommand.java +++ b/src/main/java/client/command/commands/gm3/ClosePortalCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class ClosePortalCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !closeportal "); return; diff --git a/src/main/java/client/command/commands/gm3/DebuffCommand.java b/src/main/java/client/command/commands/gm3/DebuffCommand.java index c60e006b3d..a7fc558f49 100644 --- a/src/main/java/client/command/commands/gm3/DebuffCommand.java +++ b/src/main/java/client/command/commands/gm3/DebuffCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleDisease; import client.command.Command; @@ -41,7 +41,7 @@ public class DebuffCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !debuff SLOW|SEDUCE|ZOMBIFY|CONFUSE|STUN|POISON|SEAL|DARKNESS|WEAKEN|CURSE"); return; @@ -108,7 +108,7 @@ public class DebuffCommand extends Command { } for (MapleMapObject mmo : player.getMap().getMapObjectsInRange(player.getPosition(), 777777.7, Arrays.asList(MapleMapObjectType.PLAYER))) { - MapleCharacter chr = (MapleCharacter) mmo; + Character chr = (Character) mmo; if (chr.getId() != player.getId()) { chr.giveDebuff(disease, skill); diff --git a/src/main/java/client/command/commands/gm3/EndEventCommand.java b/src/main/java/client/command/commands/gm3/EndEventCommand.java index 3ccfb23c7a..d72674a098 100644 --- a/src/main/java/client/command/commands/gm3/EndEventCommand.java +++ b/src/main/java/client/command/commands/gm3/EndEventCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class EndEventCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); c.getChannelServer().setEvent(null); player.dropMessage(5, "You have ended the event. No more players may join."); } diff --git a/src/main/java/client/command/commands/gm3/ExpedsCommand.java b/src/main/java/client/command/commands/gm3/ExpedsCommand.java index 45e3ac2ff6..eb5d492b17 100644 --- a/src/main/java/client/command/commands/gm3/ExpedsCommand.java +++ b/src/main/java/client/command/commands/gm3/ExpedsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -40,7 +40,7 @@ public class ExpedsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (Channel ch : Server.getInstance().getChannelsFromWorld(c.getWorld())) { List expeds = ch.getExpeditions(); if (expeds.isEmpty()) { diff --git a/src/main/java/client/command/commands/gm3/FaceCommand.java b/src/main/java/client/command/commands/gm3/FaceCommand.java index e225159e69..13768eb78a 100644 --- a/src/main/java/client/command/commands/gm3/FaceCommand.java +++ b/src/main/java/client/command/commands/gm3/FaceCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleStat; import client.command.Command; @@ -37,7 +37,7 @@ public class FaceCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !face [] "); return; @@ -60,7 +60,7 @@ public class FaceCommand extends Command { player.yellowMessage("Face id '" + params[1] + "' does not exist."); } - MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { victim.setFace(itemId); victim.updateSingleStat(MapleStat.FACE, itemId); diff --git a/src/main/java/client/command/commands/gm3/FameCommand.java b/src/main/java/client/command/commands/gm3/FameCommand.java index 6d38c9dfb8..68c9f2b359 100644 --- a/src/main/java/client/command/commands/gm3/FameCommand.java +++ b/src/main/java/client/command/commands/gm3/FameCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleStat; import client.command.Command; @@ -35,13 +35,13 @@ public class FameCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !fame "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.setFame(Integer.parseInt(params[1])); victim.updateSingleStat(MapleStat.FAME, victim.getFame()); diff --git a/src/main/java/client/command/commands/gm3/FlyCommand.java b/src/main/java/client/command/commands/gm3/FlyCommand.java index 138dd9bdb6..9671f929ca 100644 --- a/src/main/java/client/command/commands/gm3/FlyCommand.java +++ b/src/main/java/client/command/commands/gm3/FlyCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -35,7 +35,7 @@ public class FlyCommand extends Command { @Override public void execute(MapleClient c, String[] params) { // fly option will become available for any character of that account - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !fly "); return; diff --git a/src/main/java/client/command/commands/gm3/GiveMesosCommand.java b/src/main/java/client/command/commands/gm3/GiveMesosCommand.java index 3d86c8ee06..a59f90f032 100644 --- a/src/main/java/client/command/commands/gm3/GiveMesosCommand.java +++ b/src/main/java/client/command/commands/gm3/GiveMesosCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class GiveMesosCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !givems [] "); return; @@ -66,7 +66,7 @@ public class GiveMesosCommand extends Command { } } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv_); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv_); if (victim != null) { victim.gainMeso((int) mesos_, true); player.message("MESO given."); diff --git a/src/main/java/client/command/commands/gm3/GiveNxCommand.java b/src/main/java/client/command/commands/gm3/GiveNxCommand.java index b04b2de021..ecb360aa6f 100644 --- a/src/main/java/client/command/commands/gm3/GiveNxCommand.java +++ b/src/main/java/client/command/commands/gm3/GiveNxCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class GiveNxCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !givenx [nx, mp, np] [] "); return; @@ -72,7 +72,7 @@ public class GiveNxCommand extends Command { value = Integer.parseInt(params[0]); } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv); if (victim != null) { victim.getCashShop().gainCash(type, value); player.message(typeStr.toUpperCase() + " given."); diff --git a/src/main/java/client/command/commands/gm3/GiveRpCommand.java b/src/main/java/client/command/commands/gm3/GiveRpCommand.java index f43d8753b1..2a2a88b41e 100644 --- a/src/main/java/client/command/commands/gm3/GiveRpCommand.java +++ b/src/main/java/client/command/commands/gm3/GiveRpCommand.java @@ -1,6 +1,6 @@ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -11,13 +11,13 @@ public class GiveRpCommand extends Command { @Override public void execute(MapleClient client, String[] params) { - MapleCharacter player = client.getPlayer(); + Character player = client.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !giverp "); return; } - MapleCharacter victim = client.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = client.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.setRewardPoints(victim.getRewardPoints() + Integer.parseInt(params[1])); player.message("RP given. Player " + params[0] + " now has " + victim.getRewardPoints() diff --git a/src/main/java/client/command/commands/gm3/GiveVpCommand.java b/src/main/java/client/command/commands/gm3/GiveVpCommand.java index f677e874cd..91fbe3d5f2 100644 --- a/src/main/java/client/command/commands/gm3/GiveVpCommand.java +++ b/src/main/java/client/command/commands/gm3/GiveVpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,13 +34,13 @@ public class GiveVpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !givevp "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.getClient().addVotePoints(Integer.parseInt(params[1])); player.message("VP given."); diff --git a/src/main/java/client/command/commands/gm3/HairCommand.java b/src/main/java/client/command/commands/gm3/HairCommand.java index 22f01cf49a..d4be80ed8f 100644 --- a/src/main/java/client/command/commands/gm3/HairCommand.java +++ b/src/main/java/client/command/commands/gm3/HairCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.MapleStat; import client.command.Command; @@ -37,7 +37,7 @@ public class HairCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !hair [] "); return; @@ -61,7 +61,7 @@ public class HairCommand extends Command { return; } - MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.setHair(itemId); victim.updateSingleStat(MapleStat.HAIR, itemId); diff --git a/src/main/java/client/command/commands/gm3/HealMapCommand.java b/src/main/java/client/command/commands/gm3/HealMapCommand.java index 8a870350ea..bff482dc19 100644 --- a/src/main/java/client/command/commands/gm3/HealMapCommand.java +++ b/src/main/java/client/command/commands/gm3/HealMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class HealMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - for (MapleCharacter mch : player.getMap().getCharacters()) { + Character player = c.getPlayer(); + for (Character mch : player.getMap().getCharacters()) { if (mch != null) { mch.healHpMp(); } diff --git a/src/main/java/client/command/commands/gm3/HealPersonCommand.java b/src/main/java/client/command/commands/gm3/HealPersonCommand.java index 9c2cde8e38..7e03ad41b3 100644 --- a/src/main/java/client/command/commands/gm3/HealPersonCommand.java +++ b/src/main/java/client/command/commands/gm3/HealPersonCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class HealPersonCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character player = c.getPlayer(); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.healHpMp(); } else { diff --git a/src/main/java/client/command/commands/gm3/HpMpCommand.java b/src/main/java/client/command/commands/gm3/HpMpCommand.java index c67a199faa..94baeacf56 100644 --- a/src/main/java/client/command/commands/gm3/HpMpCommand.java +++ b/src/main/java/client/command/commands/gm3/HpMpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class HpMpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - MapleCharacter victim = player; + Character player = c.getPlayer(); + Character victim = player; int statUpdate = 1; if (params.length == 2) { diff --git a/src/main/java/client/command/commands/gm3/HurtCommand.java b/src/main/java/client/command/commands/gm3/HurtCommand.java index 6eb93ca6c3..3ef3a655c4 100644 --- a/src/main/java/client/command/commands/gm3/HurtCommand.java +++ b/src/main/java/client/command/commands/gm3/HurtCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class HurtCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character player = c.getPlayer(); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.updateHp(1); } else { diff --git a/src/main/java/client/command/commands/gm3/IgnoreCommand.java b/src/main/java/client/command/commands/gm3/IgnoreCommand.java index d935639104..62183d52b5 100644 --- a/src/main/java/client/command/commands/gm3/IgnoreCommand.java +++ b/src/main/java/client/command/commands/gm3/IgnoreCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.packet.logging.MapleLogger; @@ -37,12 +37,12 @@ public class IgnoreCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !ignore "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { player.message("Player '" + params[0] + "' could not be found on this world."); return; diff --git a/src/main/java/client/command/commands/gm3/IgnoredCommand.java b/src/main/java/client/command/commands/gm3/IgnoredCommand.java index daf704699d..39bc60eca4 100644 --- a/src/main/java/client/command/commands/gm3/IgnoredCommand.java +++ b/src/main/java/client/command/commands/gm3/IgnoredCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.packet.logging.MapleLogger; @@ -35,9 +35,9 @@ public class IgnoredCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (Integer cid : MapleLogger.ignored) { - player.yellowMessage(MapleCharacter.getNameById(cid) + " is being ignored."); + player.yellowMessage(Character.getNameById(cid) + " is being ignored."); } } } diff --git a/src/main/java/client/command/commands/gm3/InMapCommand.java b/src/main/java/client/command/commands/gm3/InMapCommand.java index ef66e72085..8ad6c6bfcc 100644 --- a/src/main/java/client/command/commands/gm3/InMapCommand.java +++ b/src/main/java/client/command/commands/gm3/InMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,9 +34,9 @@ public class InMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); String st = ""; - for (MapleCharacter chr : player.getMap().getCharacters()) { + for (Character chr : player.getMap().getCharacters()) { st += chr.getName() + " "; } player.message(st); diff --git a/src/main/java/client/command/commands/gm3/KillAllCommand.java b/src/main/java/client/command/commands/gm3/KillAllCommand.java index db5e0cc40c..84c1c6b000 100644 --- a/src/main/java/client/command/commands/gm3/KillAllCommand.java +++ b/src/main/java/client/command/commands/gm3/KillAllCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleMonster; @@ -41,7 +41,7 @@ public class KillAllCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleMap map = player.getMap(); List monsters = map.getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER)); int count = 0; diff --git a/src/main/java/client/command/commands/gm3/KillCommand.java b/src/main/java/client/command/commands/gm3/KillCommand.java index 135474b096..3baae93d25 100644 --- a/src/main/java/client/command/commands/gm3/KillCommand.java +++ b/src/main/java/client/command/commands/gm3/KillCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,13 +36,13 @@ public class KillCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !kill "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { victim.updateHpMp(0); Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, player.getName() + " used !kill on " + victim.getName())); diff --git a/src/main/java/client/command/commands/gm3/KillMapCommand.java b/src/main/java/client/command/commands/gm3/KillMapCommand.java index 486bf8e628..d51ab22a22 100644 --- a/src/main/java/client/command/commands/gm3/KillMapCommand.java +++ b/src/main/java/client/command/commands/gm3/KillMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class KillMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - for (MapleCharacter mch : player.getMap().getCharacters()) { + Character player = c.getPlayer(); + for (Character mch : player.getMap().getCharacters()) { mch.updateHp(0); } } diff --git a/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java b/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java index f43b066c05..83045bf97e 100644 --- a/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java +++ b/src/main/java/client/command/commands/gm3/MaxEnergyCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class MaxEnergyCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); c.getPlayer().setDojoEnergy(10000); c.sendPacket(PacketCreator.getEnergy("energy", 10000)); } diff --git a/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java b/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java index 7100dcbf84..756357db91 100644 --- a/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java +++ b/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,8 +34,8 @@ public class MaxHpMpCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); - MapleCharacter victim = player; + Character player = c.getPlayer(); + Character victim = player; int statUpdate = 1; if (params.length >= 2) { diff --git a/src/main/java/client/command/commands/gm3/MonitorCommand.java b/src/main/java/client/command/commands/gm3/MonitorCommand.java index 7f05db7521..aa9f01f6dc 100644 --- a/src/main/java/client/command/commands/gm3/MonitorCommand.java +++ b/src/main/java/client/command/commands/gm3/MonitorCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.packet.logging.MapleLogger; @@ -37,12 +37,12 @@ public class MonitorCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !monitor "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { player.message("Player '" + params[0] + "' could not be found on this world."); return; diff --git a/src/main/java/client/command/commands/gm3/MonitorsCommand.java b/src/main/java/client/command/commands/gm3/MonitorsCommand.java index 97fd37a9d4..e6a4ef40ec 100644 --- a/src/main/java/client/command/commands/gm3/MonitorsCommand.java +++ b/src/main/java/client/command/commands/gm3/MonitorsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.packet.logging.MapleLogger; @@ -35,9 +35,9 @@ public class MonitorsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (Integer cid : MapleLogger.monitored) { - player.yellowMessage(MapleCharacter.getNameById(cid) + " is being monitored."); + player.yellowMessage(Character.getNameById(cid) + " is being monitored."); } } } diff --git a/src/main/java/client/command/commands/gm3/MusicCommand.java b/src/main/java/client/command/commands/gm3/MusicCommand.java index bca318bb10..34f747af36 100644 --- a/src/main/java/client/command/commands/gm3/MusicCommand.java +++ b/src/main/java/client/command/commands/gm3/MusicCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import constants.game.GameConstants; @@ -46,7 +46,7 @@ public class MusicCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { String sendMsg = ""; diff --git a/src/main/java/client/command/commands/gm3/MuteMapCommand.java b/src/main/java/client/command/commands/gm3/MuteMapCommand.java index 90dd6062ef..2c6e2558dc 100644 --- a/src/main/java/client/command/commands/gm3/MuteMapCommand.java +++ b/src/main/java/client/command/commands/gm3/MuteMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class MuteMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (player.getMap().isMuted()) { player.getMap().setMuted(false); player.dropMessage(5, "The map you are in has been un-muted."); diff --git a/src/main/java/client/command/commands/gm3/NightCommand.java b/src/main/java/client/command/commands/gm3/NightCommand.java index fa17256f5a..26389dba9d 100644 --- a/src/main/java/client/command/commands/gm3/NightCommand.java +++ b/src/main/java/client/command/commands/gm3/NightCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class NightCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.getMap().broadcastNightEffect(); player.yellowMessage("Done."); } diff --git a/src/main/java/client/command/commands/gm3/NoticeCommand.java b/src/main/java/client/command/commands/gm3/NoticeCommand.java index f321d170d0..656ce0fdcf 100644 --- a/src/main/java/client/command/commands/gm3/NoticeCommand.java +++ b/src/main/java/client/command/commands/gm3/NoticeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class NoticeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[Notice] " + player.getLastCommandMessage())); } } diff --git a/src/main/java/client/command/commands/gm3/NpcCommand.java b/src/main/java/client/command/commands/gm3/NpcCommand.java index 28c937a591..ce867159e3 100644 --- a/src/main/java/client/command/commands/gm3/NpcCommand.java +++ b/src/main/java/client/command/commands/gm3/NpcCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -37,7 +37,7 @@ public class NpcCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !npc "); return; diff --git a/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java b/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java index 103439efcf..f16dbc381b 100644 --- a/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java +++ b/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,15 +36,15 @@ public class OnlineTwoCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int total = 0; for (Channel ch : Server.getInstance().getChannelsFromWorld(player.getWorld())) { int size = ch.getPlayerStorage().getAllCharacters().size(); total += size; String s = "(Channel " + ch.getId() + " Online: " + size + ") : "; if (ch.getPlayerStorage().getAllCharacters().size() < 50) { - for (MapleCharacter chr : ch.getPlayerStorage().getAllCharacters()) { - s += MapleCharacter.makeMapleReadable(chr.getName()) + ", "; + for (Character chr : ch.getPlayerStorage().getAllCharacters()) { + s += Character.makeMapleReadable(chr.getName()) + ", "; } player.dropMessage(6, s.substring(0, s.length() - 2)); } diff --git a/src/main/java/client/command/commands/gm3/OpenPortalCommand.java b/src/main/java/client/command/commands/gm3/OpenPortalCommand.java index 46810f587e..b4466597ee 100644 --- a/src/main/java/client/command/commands/gm3/OpenPortalCommand.java +++ b/src/main/java/client/command/commands/gm3/OpenPortalCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class OpenPortalCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !openportal "); return; diff --git a/src/main/java/client/command/commands/gm3/PeCommand.java b/src/main/java/client/command/commands/gm3/PeCommand.java index e9a5e61de7..72c13f18b9 100644 --- a/src/main/java/client/command/commands/gm3/PeCommand.java +++ b/src/main/java/client/command/commands/gm3/PeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import io.netty.buffer.Unpooled; @@ -46,7 +46,7 @@ public class PeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); String packet = ""; try { InputStreamReader is = new FileReader("pe.txt"); diff --git a/src/main/java/client/command/commands/gm3/PosCommand.java b/src/main/java/client/command/commands/gm3/PosCommand.java index f4ebc8d758..4c4611a5da 100644 --- a/src/main/java/client/command/commands/gm3/PosCommand.java +++ b/src/main/java/client/command/commands/gm3/PosCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class PosCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); float xpos = player.getPosition().x; float ypos = player.getPosition().y; float fh = player.getMap().getFootholds().findBelow(player.getPosition()).getId(); diff --git a/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java b/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java index eb8bb787e0..17fa0885db 100644 --- a/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java +++ b/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.quest.MapleQuest; @@ -35,7 +35,7 @@ public class QuestCompleteCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1){ player.yellowMessage("Syntax: !completequest "); diff --git a/src/main/java/client/command/commands/gm3/QuestResetCommand.java b/src/main/java/client/command/commands/gm3/QuestResetCommand.java index 99fa79a106..cf650179bf 100644 --- a/src/main/java/client/command/commands/gm3/QuestResetCommand.java +++ b/src/main/java/client/command/commands/gm3/QuestResetCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.quest.MapleQuest; @@ -35,7 +35,7 @@ public class QuestResetCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1){ player.yellowMessage("Syntax: !resetquest "); diff --git a/src/main/java/client/command/commands/gm3/QuestStartCommand.java b/src/main/java/client/command/commands/gm3/QuestStartCommand.java index 70e3c5b6f4..444c9e3d07 100644 --- a/src/main/java/client/command/commands/gm3/QuestStartCommand.java +++ b/src/main/java/client/command/commands/gm3/QuestStartCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.quest.MapleQuest; @@ -35,7 +35,7 @@ public class QuestStartCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1){ player.yellowMessage("Syntax: !startquest "); diff --git a/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java b/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java index 71c3cd66e2..4367379459 100644 --- a/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java +++ b/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleMonsterInformationProvider; @@ -35,7 +35,7 @@ public class ReloadDropsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleMonsterInformationProvider.getInstance().clearDrops(); player.dropMessage(5, "Reloaded Drops"); } diff --git a/src/main/java/client/command/commands/gm3/ReloadEventsCommand.java b/src/main/java/client/command/commands/gm3/ReloadEventsCommand.java index 5eda37558d..b08b24fcc6 100644 --- a/src/main/java/client/command/commands/gm3/ReloadEventsCommand.java +++ b/src/main/java/client/command/commands/gm3/ReloadEventsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class ReloadEventsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (Channel ch : Server.getInstance().getAllChannels()) { ch.reloadEventScriptManager(); } diff --git a/src/main/java/client/command/commands/gm3/ReloadMapCommand.java b/src/main/java/client/command/commands/gm3/ReloadMapCommand.java index ed1910c45a..e0705bc85d 100644 --- a/src/main/java/client/command/commands/gm3/ReloadMapCommand.java +++ b/src/main/java/client/command/commands/gm3/ReloadMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -37,13 +37,13 @@ public class ReloadMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleMap newMap = c.getChannelServer().getMapFactory().resetMap(player.getMapId()); int callerid = c.getPlayer().getId(); - Collection characters = player.getMap().getAllPlayers(); + Collection characters = player.getMap().getAllPlayers(); - for (MapleCharacter chr : characters) { + for (Character chr : characters) { chr.saveLocationOnWarp(); chr.changeMap(newMap); if (chr.getId() != callerid) diff --git a/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java b/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java index 42722196a6..c5d54e169b 100644 --- a/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java +++ b/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import scripting.portal.PortalScriptManager; @@ -35,7 +35,7 @@ public class ReloadPortalsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); PortalScriptManager.getInstance().reloadPortalScripts(); player.dropMessage(5, "Reloaded Portals"); } diff --git a/src/main/java/client/command/commands/gm3/RipCommand.java b/src/main/java/client/command/commands/gm3/RipCommand.java index 06cbb73c9e..911af10115 100644 --- a/src/main/java/client/command/commands/gm3/RipCommand.java +++ b/src/main/java/client/command/commands/gm3/RipCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class RipCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + joinStringFrom(params, 1))); } } diff --git a/src/main/java/client/command/commands/gm3/SeedCommand.java b/src/main/java/client/command/commands/gm3/SeedCommand.java index 9824d4518a..765bb4278b 100644 --- a/src/main/java/client/command/commands/gm3/SeedCommand.java +++ b/src/main/java/client/command/commands/gm3/SeedCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.Item; @@ -37,7 +37,7 @@ public class SeedCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (player.getMapId() != 910010000) { player.yellowMessage("This command can only be used in HPQ."); return; diff --git a/src/main/java/client/command/commands/gm3/SpawnCommand.java b/src/main/java/client/command/commands/gm3/SpawnCommand.java index f9ec285b69..c027512848 100644 --- a/src/main/java/client/command/commands/gm3/SpawnCommand.java +++ b/src/main/java/client/command/commands/gm3/SpawnCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -36,7 +36,7 @@ public class SpawnCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !spawn []"); return; diff --git a/src/main/java/client/command/commands/gm3/StartEventCommand.java b/src/main/java/client/command/commands/gm3/StartEventCommand.java index 855fa36843..9863014e33 100644 --- a/src/main/java/client/command/commands/gm3/StartEventCommand.java +++ b/src/main/java/client/command/commands/gm3/StartEventCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,7 +37,7 @@ public class StartEventCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int players = 50; if (params.length > 1) players = Integer.parseInt(params[0]); diff --git a/src/main/java/client/command/commands/gm3/TimerAllCommand.java b/src/main/java/client/command/commands/gm3/TimerAllCommand.java index f58898dd43..606b30b01c 100644 --- a/src/main/java/client/command/commands/gm3/TimerAllCommand.java +++ b/src/main/java/client/command/commands/gm3/TimerAllCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,20 +35,20 @@ public class TimerAllCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !timerall |remove"); return; } if (params[0].equalsIgnoreCase("remove")) { - for (MapleCharacter victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) { + for (Character victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) { victim.sendPacket(PacketCreator.removeClock()); } } else { try { int seconds = Integer.parseInt(params[0]); - for (MapleCharacter victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) { + for (Character victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) { victim.sendPacket(PacketCreator.getClock(seconds)); } } catch (NumberFormatException e) { diff --git a/src/main/java/client/command/commands/gm3/TimerCommand.java b/src/main/java/client/command/commands/gm3/TimerCommand.java index 927dc40571..0d56682f80 100644 --- a/src/main/java/client/command/commands/gm3/TimerCommand.java +++ b/src/main/java/client/command/commands/gm3/TimerCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,13 +35,13 @@ public class TimerCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !timer |remove"); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { if (params[1].equalsIgnoreCase("remove")) { victim.sendPacket(PacketCreator.removeClock()); diff --git a/src/main/java/client/command/commands/gm3/TimerMapCommand.java b/src/main/java/client/command/commands/gm3/TimerMapCommand.java index 6b10b51092..540245df86 100644 --- a/src/main/java/client/command/commands/gm3/TimerMapCommand.java +++ b/src/main/java/client/command/commands/gm3/TimerMapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,20 +35,20 @@ public class TimerMapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !timermap |remove"); return; } if (params[0].equalsIgnoreCase("remove")) { - for (MapleCharacter victim : player.getMap().getCharacters()) { + for (Character victim : player.getMap().getCharacters()) { victim.sendPacket(PacketCreator.removeClock()); } } else { try { int seconds = Integer.parseInt(params[0]); - for (MapleCharacter victim : player.getMap().getCharacters()) { + for (Character victim : player.getMap().getCharacters()) { victim.sendPacket(PacketCreator.getClock(seconds)); } } catch (NumberFormatException e) { diff --git a/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java b/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java index e5bba02906..c8485103b6 100644 --- a/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java +++ b/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -35,7 +35,7 @@ public class ToggleCouponCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !togglecoupon "); return; diff --git a/src/main/java/client/command/commands/gm3/UnBanCommand.java b/src/main/java/client/command/commands/gm3/UnBanCommand.java index 1a67ecc59b..5865424a3f 100644 --- a/src/main/java/client/command/commands/gm3/UnBanCommand.java +++ b/src/main/java/client/command/commands/gm3/UnBanCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm3; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.DatabaseConnection; @@ -38,14 +38,14 @@ public class UnBanCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !unban "); return; } try (Connection con = DatabaseConnection.getConnection()) { - int aid = MapleCharacter.getAccountIdByName(params[0]); + int aid = Character.getAccountIdByName(params[0]); try (PreparedStatement p = con.prepareStatement("UPDATE accounts SET banned = -1 WHERE id = " + aid)) { p.executeUpdate(); diff --git a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java b/src/main/java/client/command/commands/gm4/BossDropRateCommand.java index 14cc40935a..2f80a806d9 100644 --- a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java +++ b/src/main/java/client/command/commands/gm4/BossDropRateCommand.java @@ -19,7 +19,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class BossDropRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !bossdroprate "); return; diff --git a/src/main/java/client/command/commands/gm4/CakeCommand.java b/src/main/java/client/command/commands/gm4/CakeCommand.java index 248c55361e..1aa6c99da6 100644 --- a/src/main/java/client/command/commands/gm4/CakeCommand.java +++ b/src/main/java/client/command/commands/gm4/CakeCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -36,7 +36,7 @@ public class CakeCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleMonster monster = MapleLifeFactory.getMonster(9400606); if (params.length == 1) { double mobHp = Double.parseDouble(params[0]); diff --git a/src/main/java/client/command/commands/gm4/DropRateCommand.java b/src/main/java/client/command/commands/gm4/DropRateCommand.java index 1dda95d9a9..bf7399abf0 100644 --- a/src/main/java/client/command/commands/gm4/DropRateCommand.java +++ b/src/main/java/client/command/commands/gm4/DropRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class DropRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !droprate "); return; diff --git a/src/main/java/client/command/commands/gm4/ExpRateCommand.java b/src/main/java/client/command/commands/gm4/ExpRateCommand.java index a1fe479708..ab025517ac 100644 --- a/src/main/java/client/command/commands/gm4/ExpRateCommand.java +++ b/src/main/java/client/command/commands/gm4/ExpRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class ExpRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !exprate "); return; diff --git a/src/main/java/client/command/commands/gm4/FishingRateCommand.java b/src/main/java/client/command/commands/gm4/FishingRateCommand.java index 768d896533..4cf57d21cd 100644 --- a/src/main/java/client/command/commands/gm4/FishingRateCommand.java +++ b/src/main/java/client/command/commands/gm4/FishingRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class FishingRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !fishrate "); return; diff --git a/src/main/java/client/command/commands/gm4/ForceVacCommand.java b/src/main/java/client/command/commands/gm4/ForceVacCommand.java index c744e5ba1e..1e7f9937f8 100644 --- a/src/main/java/client/command/commands/gm4/ForceVacCommand.java +++ b/src/main/java/client/command/commands/gm4/ForceVacCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.Pet; @@ -43,7 +43,7 @@ public class ForceVacCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); List items = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM)); for (MapleMapObject item : items) { MapleMapItem mapItem = (MapleMapItem) item; diff --git a/src/main/java/client/command/commands/gm4/HorntailCommand.java b/src/main/java/client/command/commands/gm4/HorntailCommand.java index 0a1282b05f..c236086740 100644 --- a/src/main/java/client/command/commands/gm4/HorntailCommand.java +++ b/src/main/java/client/command/commands/gm4/HorntailCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMap; @@ -37,7 +37,7 @@ public class HorntailCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); final Point targetPoint = player.getPosition(); final MapleMap targetMap = player.getMap(); diff --git a/src/main/java/client/command/commands/gm4/ItemVacCommand.java b/src/main/java/client/command/commands/gm4/ItemVacCommand.java index dc4dfe425b..9c3311e9fd 100644 --- a/src/main/java/client/command/commands/gm4/ItemVacCommand.java +++ b/src/main/java/client/command/commands/gm4/ItemVacCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.maps.MapleMapObject; @@ -39,7 +39,7 @@ public class ItemVacCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); List list = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM)); for (MapleMapObject item : list) { player.pickupItem(item); diff --git a/src/main/java/client/command/commands/gm4/MesoRateCommand.java b/src/main/java/client/command/commands/gm4/MesoRateCommand.java index 944a6bef9d..fb1eb57c90 100644 --- a/src/main/java/client/command/commands/gm4/MesoRateCommand.java +++ b/src/main/java/client/command/commands/gm4/MesoRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class MesoRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !mesorate "); return; diff --git a/src/main/java/client/command/commands/gm4/PapCommand.java b/src/main/java/client/command/commands/gm4/PapCommand.java index 7e51fb8da5..9b9baa029c 100644 --- a/src/main/java/client/command/commands/gm4/PapCommand.java +++ b/src/main/java/client/command/commands/gm4/PapCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -35,7 +35,7 @@ public class PapCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); // thanks Conrad for noticing mobid typo here player.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8500001), player.getPosition()); diff --git a/src/main/java/client/command/commands/gm4/PianusCommand.java b/src/main/java/client/command/commands/gm4/PianusCommand.java index a16cd355ee..361a23dec7 100644 --- a/src/main/java/client/command/commands/gm4/PianusCommand.java +++ b/src/main/java/client/command/commands/gm4/PianusCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -35,7 +35,7 @@ public class PianusCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8510000), player.getPosition()); } } diff --git a/src/main/java/client/command/commands/gm4/PinkbeanCommand.java b/src/main/java/client/command/commands/gm4/PinkbeanCommand.java index eb7fb8a38f..7e1d5aa125 100644 --- a/src/main/java/client/command/commands/gm4/PinkbeanCommand.java +++ b/src/main/java/client/command/commands/gm4/PinkbeanCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -35,7 +35,7 @@ public class PinkbeanCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(8820001), player.getPosition()); } diff --git a/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java b/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java index 264287d45f..2c1aaaec73 100644 --- a/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java +++ b/src/main/java/client/command/commands/gm4/PlayerNpcCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MaplePlayerNPC; @@ -35,7 +35,7 @@ public class PlayerNpcCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !playernpc "); return; diff --git a/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java b/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java index 6654b2b0c2..c7c9f24763 100644 --- a/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java +++ b/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MaplePlayerNPC; @@ -35,7 +35,7 @@ public class PlayerNpcRemoveCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !playernpcremove "); return; diff --git a/src/main/java/client/command/commands/gm4/PmobCommand.java b/src/main/java/client/command/commands/gm4/PmobCommand.java index 0b416980c8..e8d83e3ade 100644 --- a/src/main/java/client/command/commands/gm4/PmobCommand.java +++ b/src/main/java/client/command/commands/gm4/PmobCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.channel.Channel; @@ -44,7 +44,7 @@ public class PmobCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !pmob []"); return; diff --git a/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java b/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java index 98ea14acf5..715da68206 100644 --- a/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java +++ b/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.channel.Channel; @@ -46,7 +46,7 @@ public class PmobRemoveCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int mapId = player.getMapId(); int mobId = params.length > 0 ? Integer.parseInt(params[0]) : -1; diff --git a/src/main/java/client/command/commands/gm4/PnpcCommand.java b/src/main/java/client/command/commands/gm4/PnpcCommand.java index 1b15f81832..9d5206e148 100644 --- a/src/main/java/client/command/commands/gm4/PnpcCommand.java +++ b/src/main/java/client/command/commands/gm4/PnpcCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.channel.Channel; @@ -45,7 +45,7 @@ public class PnpcCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !pnpc "); return; diff --git a/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java b/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java index f441a95774..8ea17ada56 100644 --- a/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java +++ b/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.channel.Channel; @@ -46,7 +46,7 @@ public class PnpcRemoveCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); int mapId = player.getMapId(); int npcId = params.length > 0 ? Integer.parseInt(params[0]) : -1; diff --git a/src/main/java/client/command/commands/gm4/ProItemCommand.java b/src/main/java/client/command/commands/gm4/ProItemCommand.java index ecfb612b1d..2259ea391b 100644 --- a/src/main/java/client/command/commands/gm4/ProItemCommand.java +++ b/src/main/java/client/command/commands/gm4/ProItemCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.Equip; @@ -40,7 +40,7 @@ public class ProItemCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !proitem []"); return; diff --git a/src/main/java/client/command/commands/gm4/QuestRateCommand.java b/src/main/java/client/command/commands/gm4/QuestRateCommand.java index 855fe1caa8..7b54ec2a3c 100644 --- a/src/main/java/client/command/commands/gm4/QuestRateCommand.java +++ b/src/main/java/client/command/commands/gm4/QuestRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class QuestRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !questrate "); return; diff --git a/src/main/java/client/command/commands/gm4/ServerMessageCommand.java b/src/main/java/client/command/commands/gm4/ServerMessageCommand.java index a58e4d5466..bfb1481451 100644 --- a/src/main/java/client/command/commands/gm4/ServerMessageCommand.java +++ b/src/main/java/client/command/commands/gm4/ServerMessageCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,7 +34,7 @@ public class ServerMessageCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); c.getWorldServer().setServerMessage(player.getLastCommandMessage()); } } diff --git a/src/main/java/client/command/commands/gm4/SetEqStatCommand.java b/src/main/java/client/command/commands/gm4/SetEqStatCommand.java index 7b4ba19bc8..3549ca2bf8 100644 --- a/src/main/java/client/command/commands/gm4/SetEqStatCommand.java +++ b/src/main/java/client/command/commands/gm4/SetEqStatCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import client.inventory.Equip; @@ -38,7 +38,7 @@ public class SetEqStatCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !seteqstat []"); return; diff --git a/src/main/java/client/command/commands/gm4/TravelRateCommand.java b/src/main/java/client/command/commands/gm4/TravelRateCommand.java index 14da01f08f..6d988b14d3 100644 --- a/src/main/java/client/command/commands/gm4/TravelRateCommand.java +++ b/src/main/java/client/command/commands/gm4/TravelRateCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import tools.PacketCreator; @@ -35,7 +35,7 @@ public class TravelRateCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !travelrate "); return; diff --git a/src/main/java/client/command/commands/gm4/ZakumCommand.java b/src/main/java/client/command/commands/gm4/ZakumCommand.java index 2dbbfa1207..74b03ad936 100644 --- a/src/main/java/client/command/commands/gm4/ZakumCommand.java +++ b/src/main/java/client/command/commands/gm4/ZakumCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm4; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.life.MapleLifeFactory; @@ -35,7 +35,7 @@ public class ZakumCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); player.getMap().spawnFakeMonsterOnGroundBelow(MapleLifeFactory.getMonster(8800000), player.getPosition()); for (int x = 8800003; x < 8800011; x++) { player.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(x), player.getPosition()); diff --git a/src/main/java/client/command/commands/gm5/DebugCommand.java b/src/main/java/client/command/commands/gm5/DebugCommand.java index 019f703912..9523376eca 100644 --- a/src/main/java/client/command/commands/gm5/DebugCommand.java +++ b/src/main/java/client/command/commands/gm5/DebugCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm5; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -48,7 +48,7 @@ public class DebugCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !debug "); @@ -70,7 +70,7 @@ public class DebugCommand extends Command { List monsters = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER)); for (MapleMapObject monstermo : monsters) { MapleMonster monster = (MapleMonster) monstermo; - MapleCharacter controller = monster.getController(); + Character controller = monster.getController(); player.message("Monster ID: " + monster.getId() + " Aggro target: " + ((controller != null) ? controller.getName() + " Has aggro: " + monster.isControllerHasAggro() + " Knowns aggro: " + monster.isControllerKnowsAboutAggro() : "")); } break; diff --git a/src/main/java/client/command/commands/gm5/IpListCommand.java b/src/main/java/client/command/commands/gm5/IpListCommand.java index c7ae291fbd..35a19376ab 100644 --- a/src/main/java/client/command/commands/gm5/IpListCommand.java +++ b/src/main/java/client/command/commands/gm5/IpListCommand.java @@ -19,7 +19,7 @@ */ package client.command.commands.gm5; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import constants.game.GameConstants; @@ -44,12 +44,12 @@ public class IpListCommand extends Command { String str = "Player-IP relation:"; for (World w : Server.getInstance().getWorlds()) { - Collection chars = w.getPlayerStorage().getAllCharacters(); + Collection chars = w.getPlayerStorage().getAllCharacters(); if (!chars.isEmpty()) { str += "\r\n" + GameConstants.WORLD_NAMES[w.getId()] + "\r\n"; - for (MapleCharacter chr : chars) { + for (Character chr : chars) { str += " " + chr.getName() + " - " + chr.getClient().getRemoteAddress() + "\r\n"; } } diff --git a/src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java b/src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java index 19a49bc430..211a6a67e6 100644 --- a/src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java +++ b/src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.quest.MapleQuest; @@ -35,7 +35,7 @@ public class ClearQuestCacheCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); MapleQuest.clearCache(); player.dropMessage(5, "Quest Cache Cleared."); } diff --git a/src/main/java/client/command/commands/gm6/ClearQuestCommand.java b/src/main/java/client/command/commands/gm6/ClearQuestCommand.java index dfe63ac229..787529009b 100644 --- a/src/main/java/client/command/commands/gm6/ClearQuestCommand.java +++ b/src/main/java/client/command/commands/gm6/ClearQuestCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import server.quest.MapleQuest; @@ -35,7 +35,7 @@ public class ClearQuestCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Please include a quest ID."); return; diff --git a/src/main/java/client/command/commands/gm6/DCAllCommand.java b/src/main/java/client/command/commands/gm6/DCAllCommand.java index 139301174c..6aa0b9b8bc 100644 --- a/src/main/java/client/command/commands/gm6/DCAllCommand.java +++ b/src/main/java/client/command/commands/gm6/DCAllCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,9 +36,9 @@ public class DCAllCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (World world : Server.getInstance().getWorlds()) { - for (MapleCharacter chr : world.getPlayerStorage().getAllCharacters()) { + for (Character chr : world.getPlayerStorage().getAllCharacters()) { if (!chr.isGM()) { chr.getClient().disconnect(false, false); } diff --git a/src/main/java/client/command/commands/gm6/GetAccCommand.java b/src/main/java/client/command/commands/gm6/GetAccCommand.java index d0c550a8c3..a12e44bcf6 100644 --- a/src/main/java/client/command/commands/gm6/GetAccCommand.java +++ b/src/main/java/client/command/commands/gm6/GetAccCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,12 +34,12 @@ public class GetAccCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1) { player.yellowMessage("Syntax: !getacc "); return; } - MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim != null) { player.message(victim.getName() + "'s account name is " + victim.getClient().getAccountName() + "."); } else { diff --git a/src/main/java/client/command/commands/gm6/MapPlayersCommand.java b/src/main/java/client/command/commands/gm6/MapPlayersCommand.java index a5f42142d6..bf580cb018 100644 --- a/src/main/java/client/command/commands/gm6/MapPlayersCommand.java +++ b/src/main/java/client/command/commands/gm6/MapPlayersCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,11 +36,11 @@ public class MapPlayersCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); String names = ""; int map = player.getMapId(); for (World world : Server.getInstance().getWorlds()) { - for (MapleCharacter chr : world.getPlayerStorage().getAllCharacters()) { + for (Character chr : world.getPlayerStorage().getAllCharacters()) { int curMap = chr.getMapId(); String hp = Integer.toString(chr.getHp()); String maxhp = Integer.toString(chr.getCurrentMaxHp()); diff --git a/src/main/java/client/command/commands/gm6/SaveAllCommand.java b/src/main/java/client/command/commands/gm6/SaveAllCommand.java index d6a117a24f..9155cf8f9b 100644 --- a/src/main/java/client/command/commands/gm6/SaveAllCommand.java +++ b/src/main/java/client/command/commands/gm6/SaveAllCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,9 +37,9 @@ public class SaveAllCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); for (World world : Server.getInstance().getWorlds()) { - for (MapleCharacter chr : world.getPlayerStorage().getAllCharacters()) { + for (Character chr : world.getPlayerStorage().getAllCharacters()) { chr.saveCharToDB(); } } diff --git a/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java b/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java index 4e5cbcca39..75615ad3f2 100644 --- a/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class ServerAddChannelCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - final MapleCharacter player = c.getPlayer(); + final Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Syntax: @addchannel "); diff --git a/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java b/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java index 2fa045c58c..737d419167 100644 --- a/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class ServerAddWorldCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - final MapleCharacter player = c.getPlayer(); + final Character player = c.getPlayer(); ThreadManager.getInstance().newTask(() -> { int wid = Server.getInstance().addWorld(); diff --git a/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java b/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java index fa2b379d07..35dce0e49e 100644 --- a/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class ServerRemoveChannelCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - final MapleCharacter player = c.getPlayer(); + final Character player = c.getPlayer(); if (params.length < 1) { player.dropMessage(5, "Syntax: @removechannel "); diff --git a/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java b/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java index 0692b3ed51..9e8df91d1a 100644 --- a/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -36,7 +36,7 @@ public class ServerRemoveWorldCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - final MapleCharacter player = c.getPlayer(); + final Character player = c.getPlayer(); final int rwid = Server.getInstance().getWorldsSize() - 1; if(rwid <= 0) { diff --git a/src/main/java/client/command/commands/gm6/SetGmLevelCommand.java b/src/main/java/client/command/commands/gm6/SetGmLevelCommand.java index 00ca92a224..7bdb42305e 100644 --- a/src/main/java/client/command/commands/gm6/SetGmLevelCommand.java +++ b/src/main/java/client/command/commands/gm6/SetGmLevelCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; @@ -34,14 +34,14 @@ public class SetGmLevelCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 2) { player.yellowMessage("Syntax: !setgmlevel "); return; } int newLevel = Integer.parseInt(params[1]); - MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); + Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); if (target != null) { target.setGMLevel(newLevel); target.getClient().setGMLevel(newLevel); diff --git a/src/main/java/client/command/commands/gm6/ShutdownCommand.java b/src/main/java/client/command/commands/gm6/ShutdownCommand.java index 2f4797b606..acd7169b85 100644 --- a/src/main/java/client/command/commands/gm6/ShutdownCommand.java +++ b/src/main/java/client/command/commands/gm6/ShutdownCommand.java @@ -23,7 +23,7 @@ */ package client.command.commands.gm6; -import client.MapleCharacter; +import client.Character; import client.MapleClient; import client.command.Command; import net.server.Server; @@ -37,7 +37,7 @@ public class ShutdownCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleCharacter player = c.getPlayer(); + Character player = c.getPlayer(); if (params.length < 1){ player.yellowMessage("Syntax: !shutdown [