From 7246647ab6c964fa69fa04da8f056d66ccc51f45 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 22:14:19 +0200 Subject: [PATCH] Rename and clean up MapleLootInventory --- ...eLootInventory.java => LootInventory.java} | 19 +++++++++---------- .../java/server/loot/MapleLootManager.java | 8 ++++---- 2 files changed, 13 insertions(+), 14 deletions(-) rename src/main/java/server/loot/{MapleLootInventory.java => LootInventory.java} (87%) diff --git a/src/main/java/server/loot/MapleLootInventory.java b/src/main/java/server/loot/LootInventory.java similarity index 87% rename from src/main/java/server/loot/MapleLootInventory.java rename to src/main/java/server/loot/LootInventory.java index cb41b4dad6..4634a87e56 100644 --- a/src/main/java/server/loot/MapleLootInventory.java +++ b/src/main/java/server/loot/LootInventory.java @@ -28,19 +28,18 @@ import java.util.Map; /** - * * @author Ronan */ -public class MapleLootInventory { +public class LootInventory { Map items = new HashMap<>(50); - - public MapleLootInventory(Character from) { + + public LootInventory(Character from) { for (InventoryType values : InventoryType.values()) { - - for(Item it : from.getInventory(values).list()) { + + for (Item it : from.getInventory(values).list()) { Integer itemQty = items.get(it.getItemId()); - - if(itemQty == null) { + + if (itemQty == null) { items.put(it.getItemId(), (int) it.getQuantity()); } else { items.put(it.getItemId(), itemQty + it.getQuantity()); @@ -48,10 +47,10 @@ public class MapleLootInventory { } } } - + public int hasItem(int itemid, int quantity) { Integer itemQty = items.get(itemid); return itemQty == null ? 0 : itemQty >= quantity ? 2 : itemQty > 0 ? 1 : 0; } - + } diff --git a/src/main/java/server/loot/MapleLootManager.java b/src/main/java/server/loot/MapleLootManager.java index ec536dcbb2..1d450f91d0 100644 --- a/src/main/java/server/loot/MapleLootManager.java +++ b/src/main/java/server/loot/MapleLootManager.java @@ -33,7 +33,7 @@ import java.util.List; */ public class MapleLootManager { - private static boolean isRelevantDrop(MonsterDropEntry dropEntry, List players, List playersInv) { + private static boolean isRelevantDrop(MonsterDropEntry dropEntry, List players, List playersInv) { int qStartAmount = 0, qCompleteAmount = 0; MapleQuest quest = MapleQuest.getInstance(dropEntry.questid); if (quest != null) { @@ -43,7 +43,7 @@ public class MapleLootManager { //boolean restricted = MapleItemInformationProvider.getInstance().isPickupRestricted(dropEntry.itemId); for (int i = 0; i < players.size(); i++) { - MapleLootInventory chrInv = playersInv.get(i); + LootInventory chrInv = playersInv.get(i); if (dropEntry.questid > 0) { int qItemAmount, chrQuestStatus = players.get(i).getQuestStatus(dropEntry.questid); @@ -77,9 +77,9 @@ public class MapleLootManager { List loots = MonsterInformationProvider.getInstance().retrieveEffectiveDrop(monsterId); if(loots.isEmpty()) return loots; - List playersInv = new LinkedList<>(); + List playersInv = new LinkedList<>(); for(Character chr : players) { - MapleLootInventory lootInv = new MapleLootInventory(chr); + LootInventory lootInv = new LootInventory(chr); playersInv.add(lootInv); }