From 374c53df4b6759da46a2a7a5527f684ff9b994c1 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 23 Aug 2017 02:18:56 +0000 Subject: [PATCH] Added checks for appearance stone item ids. --- .../dist/game/data/AppearanceStones.xml | 606 ------------------ .../data/xml/impl/AppearanceItemData.java | 9 +- .../dist/game/data/AppearanceStones.xml | 109 ---- .../data/xml/impl/AppearanceItemData.java | 9 +- .../data/xml/impl/AppearanceItemData.java | 9 +- .../data/xml/impl/AppearanceItemData.java | 9 +- 6 files changed, 32 insertions(+), 719 deletions(-) diff --git a/L2J_Mobius_Classic/dist/game/data/AppearanceStones.xml b/L2J_Mobius_Classic/dist/game/data/AppearanceStones.xml index 3bc04b4f99..58933185b0 100644 --- a/L2J_Mobius_Classic/dist/game/data/AppearanceStones.xml +++ b/L2J_Mobius_Classic/dist/game/data/AppearanceStones.xml @@ -1,609 +1,3 @@ - - - - R - R95 - R99 - - - S - S80 - - - - - - - - - R - R95 - R99 - - - S - S80 - - - - - - - - - R - R95 - R99 - - - S - S80 - - - - - - - - - - R - R95 - R99 - - - S - S80 - - - - - - - - - R - R95 - R99 - - - S - S80 - - - - - - - - - R - R95 - R99 - - - S - S80 - - - - - - - - - R - R95 - R99 - WEAPON - ARMOR - - - S - S80 - WEAPON - ARMOR - - - WEAPON - ARMOR - - - WEAPON - ARMOR - - - WEAPON - ARMOR - - - WEAPON - ARMOR - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - chest - fullarmor - - - - chest - fullarmor - - - - - - hair - hair2 - hairall - - - - chest - fullarmor - - - - - - hair - hair2 - hairall - - - - - - - - - - - - - - - - - chest - fullarmor - - - chest - fullarmor - - - - chest - fullarmor - - - chest - fullarmor - - - - chest - fullarmor - - - - - - hair - hair2 - hairall - - - - chest - fullarmor - - - - - - hair - hair2 - hairall - - - - chest - fullarmor - - - - - - - chest - fullarmor - - - - - - - chest - fullarmor - - - - - - - hair - hair2 - hairall - - - chest - fullarmor - - - - chest - fullarmor - - - - chest - fullarmor - - - - - - hair - hair2 - hairall - - - - - - - - - - - - - - - - - - - - - chest - fullarmor - - - - chest - fullarmor - - - - chest - fullarmor - - - hair - hair2 - hairall - - - - chest - fullarmor - - - - chest - fullarmor - - - hair - hair2 - hairall - - - - chest - fullarmor - - - hair - hair2 - hairall - - - - chest - fullarmor - - - hair - hair2 - hairall - - - - chest - fullarmor - - - - chest - fullarmor - - - - hair - hair2 - hairall - - - - - - - - hair - hair2 - hairall - - - - - - - - hair - hair2 - hairall - - - - - - - - hair - hair2 - hairall - - - - - - - - hair - hair2 - hairall - - - - - - - - chest - fullarmor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - hair - hair2 - hairall - - - chest - fullarmor - - - - hair - hair2 - hairall - - - chest - fullarmor - - - - chest - - - legs - - - gloves - - - feet - - - - chest - - - legs - - - gloves - - - feet - - - - chest - - - legs - - - gloves - - - feet - - - - chest - fullarmor - diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index f0a0535f59..b02157ee4d 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -131,7 +131,14 @@ public class AppearanceItemData implements IGameXmlReader } } } - _stones.put(stone.getId(), stone); + if (ItemTable.getInstance().getTemplate(stone.getId()) != null) + { + _stones.put(stone.getId(), stone); + } + else + { + LOGGER.info(getClass().getSimpleName() + ": Could not find appearance stone item " + stone.getId()); + } } } } diff --git a/L2J_Mobius_Ertheia/dist/game/data/AppearanceStones.xml b/L2J_Mobius_Ertheia/dist/game/data/AppearanceStones.xml index 3bc04b4f99..db77a01535 100644 --- a/L2J_Mobius_Ertheia/dist/game/data/AppearanceStones.xml +++ b/L2J_Mobius_Ertheia/dist/game/data/AppearanceStones.xml @@ -378,71 +378,6 @@ hair2 hairall - - - chest - fullarmor - - - - chest - fullarmor - - - - hair - hair2 - hairall - - - - - - - - hair - hair2 - hairall - - - - - - - - hair - hair2 - hairall - - - - - - - - hair - hair2 - hairall - - - - - - - - hair - hair2 - hairall - - - - - - - - chest - fullarmor - @@ -562,48 +497,4 @@ chest fullarmor - - - chest - - - legs - - - gloves - - - feet - - - - chest - - - legs - - - gloves - - - feet - - - - chest - - - legs - - - gloves - - - feet - - - - chest - fullarmor - diff --git a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index f0a0535f59..b02157ee4d 100644 --- a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -131,7 +131,14 @@ public class AppearanceItemData implements IGameXmlReader } } } - _stones.put(stone.getId(), stone); + if (ItemTable.getInstance().getTemplate(stone.getId()) != null) + { + _stones.put(stone.getId(), stone); + } + else + { + LOGGER.info(getClass().getSimpleName() + ": Could not find appearance stone item " + stone.getId()); + } } } } diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index f0a0535f59..b02157ee4d 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -131,7 +131,14 @@ public class AppearanceItemData implements IGameXmlReader } } } - _stones.put(stone.getId(), stone); + if (ItemTable.getInstance().getTemplate(stone.getId()) != null) + { + _stones.put(stone.getId(), stone); + } + else + { + LOGGER.info(getClass().getSimpleName() + ": Could not find appearance stone item " + stone.getId()); + } } } } diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index f0a0535f59..b02157ee4d 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -131,7 +131,14 @@ public class AppearanceItemData implements IGameXmlReader } } } - _stones.put(stone.getId(), stone); + if (ItemTable.getInstance().getTemplate(stone.getId()) != null) + { + _stones.put(stone.getId(), stone); + } + else + { + LOGGER.info(getClass().getSimpleName() + ": Could not find appearance stone item " + stone.getId()); + } } } }