From 66fc6fb921ff00419ef88f3078ea36d600f36c3f Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 11 Dec 2022 22:09:01 +0000
Subject: [PATCH] Prevent NPE from EnchantItemData null scroll or support item.

---
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 .../gameserver/data/xml/EnchantItemData.java     | 16 ++++++++++++----
 29 files changed, 348 insertions(+), 116 deletions(-)

diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 1b4c433c0c..bfbad08cc9 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -138,21 +138,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 1b4c433c0c..bfbad08cc9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -138,21 +138,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 1b4c433c0c..bfbad08cc9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -138,21 +138,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}
 	
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
index 788777b1f9..4f100489b6 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java
@@ -140,21 +140,29 @@ public class EnchantItemData implements IXmlReader
 	
 	/**
 	 * Gets the enchant scroll.
-	 * @param scroll the scroll
+	 * @param item the scroll item
 	 * @return enchant template for scroll
 	 */
-	public EnchantScroll getEnchantScroll(Item scroll)
+	public EnchantScroll getEnchantScroll(Item item)
 	{
-		return _scrolls.get(scroll.getId());
+		if (item == null)
+		{
+			return null;
+		}
+		return _scrolls.get(item.getId());
 	}
 	
 	/**
 	 * Gets the support item.
-	 * @param item the item
+	 * @param item the support item
 	 * @return enchant template for support item
 	 */
 	public EnchantSupportItem getSupportItem(Item item)
 	{
+		if (item == null)
+		{
+			return null;
+		}
 		return _supports.get(item.getId());
 	}