lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper count display for extractable items message.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-09-26 00:26:03 +00:00
parent f2eec3fd98
commit 358337b2b7
19 changed files with 133 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -126,7 +126,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -138,7 +138,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -181,7 +181,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -193,7 +193,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -223,15 +223,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -126,7 +126,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -138,7 +138,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -181,7 +181,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -193,7 +193,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -223,15 +223,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -118,7 +118,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -130,7 +130,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -165,7 +165,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -177,7 +177,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -207,7 +207,7 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
// Max equipable item grade configuration. // Max equipable item grade configuration.
final int itemCrystalLevel = newItem.getItem().getCrystalType().getLevel(); final int itemCrystalLevel = newItem.getItem().getCrystalType().getLevel();
@@ -218,11 +218,11 @@ public class ExtractableItems implements IItemHandler
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -126,7 +126,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -138,7 +138,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -181,7 +181,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -193,7 +193,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -223,15 +223,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }

14
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -126,7 +126,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -138,7 +138,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -181,7 +181,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, createItemAmount);
} }
else else
{ {
@@ -193,7 +193,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
addItem(extractedItems, newItem); addItem(extractedItems, newItem, 1);
createItemAmount--; createItemAmount--;
} }
} }
@@ -223,15 +223,15 @@ public class ExtractableItems implements IItemHandler
return true; return true;
} }
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem) private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem, long count)
{ {
if (extractedItems.containsKey(newItem)) if (extractedItems.containsKey(newItem))
{ {
extractedItems.put(newItem, extractedItems.get(newItem) + 1); extractedItems.put(newItem, extractedItems.get(newItem) + count);
} }
else else
{ {
extractedItems.put(newItem, 1L); extractedItems.put(newItem, count);
} }
} }