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

Rename and clean up MapleLootInventory

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:14:19 +02:00
parent a20267aee9
commit 7246647ab6
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/server/loot/MapleLootInventory.java → src/main/java/server/loot/LootInventory.java
View File

@@ -28,19 +28,18 @@ import java.util.Map;
/**
*
* @author Ronan
*/
public class MapleLootInventory {
public class LootInventory {
Map<Integer, Integer> 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;
}
}

8
src/main/java/server/loot/MapleLootManager.java
View File

@@ -33,7 +33,7 @@ import java.util.List;
*/
public class MapleLootManager {
private static boolean isRelevantDrop(MonsterDropEntry dropEntry, List<Character> players, List<MapleLootInventory> playersInv) {
private static boolean isRelevantDrop(MonsterDropEntry dropEntry, List<Character> players, List<LootInventory> 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<MonsterDropEntry> loots = MonsterInformationProvider.getInstance().retrieveEffectiveDrop(monsterId);
if(loots.isEmpty()) return loots;
List<MapleLootInventory> playersInv = new LinkedList<>();
List<LootInventory> playersInv = new LinkedList<>();
for(Character chr : players) {
MapleLootInventory lootInv = new MapleLootInventory(chr);
LootInventory lootInv = new LootInventory(chr);
playersInv.add(lootInv);
}