From 358337b2b7aab35b99f613b3fa631fffe874e586 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 26 Sep 2021 00:26:03 +0000 Subject: [PATCH] Proper count display for extractable items message. --- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- .../handlers/itemhandlers/ExtractableItems.java | 14 +++++++------- 19 files changed, 133 insertions(+), 133 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 76d865f863..b36a1d7a48 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 216a6949f7..9f9cd968cc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 216a6949f7..9f9cd968cc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 216a6949f7..9f9cd968cc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 216a6949f7..9f9cd968cc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 216a6949f7..9f9cd968cc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 216a6949f7..9f9cd968cc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index d6fd612a03..2c19d8f6f4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 5994b9e3f9..84a23a483d 100644 --- a/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -126,7 +126,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -138,7 +138,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -181,7 +181,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -193,7 +193,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -223,15 +223,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 5994b9e3f9..84a23a483d 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -126,7 +126,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -138,7 +138,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -181,7 +181,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -193,7 +193,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -223,15 +223,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 72f1f16ce0..b4b8f0c903 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 28dd3e5789..619106aa3d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 28dd3e5789..619106aa3d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 28dd3e5789..619106aa3d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 28dd3e5789..619106aa3d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 28dd3e5789..619106aa3d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -117,7 +117,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -129,7 +129,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -164,7 +164,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -176,7 +176,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -206,15 +206,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 37bcaec4d9..7e964833e2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -118,7 +118,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -130,7 +130,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -165,7 +165,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -177,7 +177,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -207,7 +207,7 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { // Max equipable item grade configuration. final int itemCrystalLevel = newItem.getItem().getCrystalType().getLevel(); @@ -218,11 +218,11 @@ public class ExtractableItems implements IItemHandler if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index a01707a98f..490d934aeb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -126,7 +126,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -138,7 +138,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -181,7 +181,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -193,7 +193,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -223,15 +223,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index a01707a98f..490d934aeb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -126,7 +126,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -138,7 +138,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -181,7 +181,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, createItemAmount); } else { @@ -193,7 +193,7 @@ public class ExtractableItems implements IItemHandler newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); enchantedItems.add(newItem); } - addItem(extractedItems, newItem); + addItem(extractedItems, newItem, 1); createItemAmount--; } } @@ -223,15 +223,15 @@ public class ExtractableItems implements IItemHandler return true; } - private void addItem(Map extractedItems, ItemInstance newItem) + private void addItem(Map extractedItems, ItemInstance newItem, long count) { if (extractedItems.containsKey(newItem)) { - extractedItems.put(newItem, extractedItems.get(newItem) + 1); + extractedItems.put(newItem, extractedItems.get(newItem) + count); } else { - extractedItems.put(newItem, 1L); + extractedItems.put(newItem, count); } }