From 0c957b261a197b4cd2d7bc0f015361264e9acfee Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 27 Jan 2022 16:30:20 +0000
Subject: [PATCH] Updated LimitShop data. Contributed by nasseka.
---
.../dist/game/data/LimitShop.xml | 175 ++++++++++++++----
.../gameserver/data/xml/LimitShopData.java | 11 +-
.../gameserver/data/xml/LimitShopData.java | 11 +-
.../gameserver/data/xml/LimitShopData.java | 11 +-
.../gameserver/data/xml/LimitShopData.java | 11 +-
5 files changed, 162 insertions(+), 57 deletions(-)
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/LimitShop.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/LimitShop.xml
index fcb8da9db5..7d661723af 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/LimitShop.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/LimitShop.xml
@@ -3,113 +3,113 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -117,7 +117,7 @@
-
+
@@ -125,63 +125,63 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -191,4 +191,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
index c798ce89d7..26856b6d4e 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
@@ -121,11 +121,14 @@ public class LimitShopData implements IXmlReader
final long ingredientQuantity = parseLong(attrs, "count", 1L);
final int ingredientEnchant = parseInteger(attrs, "enchant", 0);
- final ItemTemplate item = ItemTable.getInstance().getTemplate(ingredientId);
- if (item == null)
+ if (ingredientId > 0)
{
- LOGGER.severe(getClass().getSimpleName() + ": Item template null for itemId: " + productionId + " productId: " + id);
- continue;
+ final ItemTemplate item = ItemTable.getInstance().getTemplate(ingredientId);
+ if (item == null)
+ {
+ LOGGER.severe(getClass().getSimpleName() + ": Item template null for itemId: " + productionId + " productId: " + id);
+ continue;
+ }
}
if (ingredientIds[0] == 0)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
index a64f2529b7..5d53365d61 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
@@ -115,11 +115,14 @@ public class LimitShopData implements IXmlReader
final long ingredientQuantity = parseLong(attrs, "count", 1L);
final int ingredientEnchant = parseInteger(attrs, "enchant", 0);
- final ItemTemplate item = ItemTable.getInstance().getTemplate(ingredientId);
- if (item == null)
+ if (ingredientId > 0)
{
- LOGGER.severe(getClass().getSimpleName() + ": Item template null for itemId: " + productionId + " productId: " + id);
- continue;
+ final ItemTemplate item = ItemTable.getInstance().getTemplate(ingredientId);
+ if (item == null)
+ {
+ LOGGER.severe(getClass().getSimpleName() + ": Item template null for itemId: " + productionId + " productId: " + id);
+ continue;
+ }
}
if (ingredientIds[0] == 0)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
index c798ce89d7..26856b6d4e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
@@ -121,11 +121,14 @@ public class LimitShopData implements IXmlReader
final long ingredientQuantity = parseLong(attrs, "count", 1L);
final int ingredientEnchant = parseInteger(attrs, "enchant", 0);
- final ItemTemplate item = ItemTable.getInstance().getTemplate(ingredientId);
- if (item == null)
+ if (ingredientId > 0)
{
- LOGGER.severe(getClass().getSimpleName() + ": Item template null for itemId: " + productionId + " productId: " + id);
- continue;
+ final ItemTemplate item = ItemTable.getInstance().getTemplate(ingredientId);
+ if (item == null)
+ {
+ LOGGER.severe(getClass().getSimpleName() + ": Item template null for itemId: " + productionId + " productId: " + id);
+ continue;
+ }
}
if (ingredientIds[0] == 0)
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
index c798ce89d7..26856b6d4e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java
@@ -121,11 +121,14 @@ public class LimitShopData implements IXmlReader
final long ingredientQuantity = parseLong(attrs, "count", 1L);
final int ingredientEnchant = parseInteger(attrs, "enchant", 0);
- final ItemTemplate item = ItemTable.getInstance().getTemplate(ingredientId);
- if (item == null)
+ if (ingredientId > 0)
{
- LOGGER.severe(getClass().getSimpleName() + ": Item template null for itemId: " + productionId + " productId: " + id);
- continue;
+ final ItemTemplate item = ItemTable.getInstance().getTemplate(ingredientId);
+ if (item == null)
+ {
+ LOGGER.severe(getClass().getSimpleName() + ": Item template null for itemId: " + productionId + " productId: " + id);
+ continue;
+ }
}
if (ingredientIds[0] == 0)