From e65012e277e18f0368139c9ec5d92e56ccee2a48 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 10 Jan 2023 22:24:07 +0000 Subject: [PATCH] ExtractableItems warning when product does not exist. --- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- .../itemhandlers/ExtractableItems.java | 19 +++++++++++++++++-- 26 files changed, 442 insertions(+), 52 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index ade1c2018b..36b6c9913e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -109,7 +110,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -156,7 +164,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 4933104fec..a219ba3c05 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -109,7 +110,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -156,7 +164,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 60b641d7ea..5d78f82e29 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 60b641d7ea..5d78f82e29 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 60b641d7ea..5d78f82e29 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 60b641d7ea..5d78f82e29 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 60b641d7ea..5d78f82e29 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 80a107b2a7..1ea209bbb5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 50460aa8cd..554dbdff20 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -119,7 +120,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -174,7 +182,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 50460aa8cd..554dbdff20 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -119,7 +120,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -174,7 +182,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 9450f90da7..31ac7ff1d3 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -119,7 +120,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -174,7 +182,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index dd4a4663f1..611527cce8 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.AutoPeelRequest; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -124,7 +125,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -179,7 +187,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 1f3235cb75..2aeeb371f4 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 1f3235cb75..2aeeb371f4 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) 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 1f3235cb75..2aeeb371f4 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 1f3235cb75..2aeeb371f4 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 1f3235cb75..2aeeb371f4 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 1f3235cb75..2aeeb371f4 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 1f3235cb75..2aeeb371f4 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 1f3235cb75..2aeeb371f4 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) 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 1f3235cb75..2aeeb371f4 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -110,7 +111,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -157,7 +165,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) 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 03f3e98e89..6f3bd6fe78 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -111,7 +112,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -158,7 +166,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) 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 700da6541b..e550a0403c 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -119,7 +120,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -174,7 +182,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) 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 8b96275152..d848bcff02 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -126,7 +127,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -188,7 +196,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index eb58ce4ad1..1b26105dda 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.AutoPeelRequest; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -131,7 +132,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -193,7 +201,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index eb58ce4ad1..1b26105dda 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.AutoPeelRequest; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -131,7 +132,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0) @@ -193,7 +201,14 @@ public class ExtractableItems implements IItemHandler continue; } - if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1)) + final ItemTemplate template = ItemTable.getInstance().getTemplate(expi.getId()); + if (template == null) + { + LOGGER.warning("ExtractableItems: Could not find " + item + " product template with id " + expi.getId() + "!"); + continue; + } + + if (template.isStackable() || (createItemAmount == 1)) { final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false); if (expi.getMaxEnchant() > 0)