diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index e2ad5651c6..645bfd565e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -152,7 +152,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index e2ad5651c6..645bfd565e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -152,7 +152,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index e2ad5651c6..645bfd565e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -152,7 +152,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index e2ad5651c6..645bfd565e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -152,7 +152,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index f63b614467..0ab4f0bbee 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -152,7 +152,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index f63b614467..0ab4f0bbee 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -152,7 +152,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index f63b614467..0ab4f0bbee 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -152,7 +152,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index f63b614467..0ab4f0bbee 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -152,7 +152,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index f63b614467..0ab4f0bbee 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -152,7 +152,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 2e7e156940..5fd3bd1682 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -153,7 +153,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 2e7e156940..5fd3bd1682 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -153,7 +153,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index e5445beeac..7eeb4451a5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -155,7 +155,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index e5445beeac..7eeb4451a5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -155,7 +155,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 0e877c15bf..3d328042b3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -155,7 +155,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 0e877c15bf..3d328042b3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -155,7 +155,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 0e877c15bf..3d328042b3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -155,7 +155,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 0e877c15bf..3d328042b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -155,7 +155,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index e5445beeac..7eeb4451a5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -155,7 +155,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /** diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index 0e877c15bf..3d328042b3 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -155,7 +155,11 @@ public class AppearanceItemData implements IXmlReader public AppearanceStone getStone(int stone) { - return _stones[stone]; + if (_stones.length >= stone) + { + return _stones[stone]; + } + return null; } /** diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java index 5c0ae8d627..2fd3da12c9 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -119,7 +119,11 @@ public class OptionData implements IXmlReader public Options getOptions(int id) { - return _options[id]; + if (_options.length >= id) + { + return _options[id]; + } + return null; } /**