Fixed items enchanted by specific scrolls.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -130,6 +131,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -21,6 +21,7 @@ import java.util.Set;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -93,6 +94,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -101,6 +107,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -130,6 +131,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -21,6 +21,7 @@ import java.util.Set;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -93,6 +94,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -101,6 +107,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -132,6 +133,11 @@ public class EnchantItemData implements IXmlReader
 		}
 	}
 	
+	public Collection<EnchantScroll> getScrolls()
+	{
+		return _scrolls.values();
+	}
+	
 	/**
 	 * Gets the enchant scroll.
 	 * @param scroll the scroll

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -20,6 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.l2jmobius.commons.util.Rnd;
+import org.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
 import org.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -99,6 +100,11 @@ public class EnchantScroll extends AbstractEnchantItem
 		_items.add(itemId);
 	}
 	
+	public Set<Integer> getItems()
+	{
+		return _items;
+	}
+	
 	/**
 	 * @param itemToEnchant the item to be enchanted
 	 * @param supportItem the support item used when enchanting (can be null)
@@ -107,6 +113,18 @@ public class EnchantScroll extends AbstractEnchantItem
 	@Override
 	public boolean isValid(ItemInstance itemToEnchant, EnchantSupportItem supportItem)
 	{
+		for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls())
+		{
+			if (scroll.getId() == getId())
+			{
+				continue;
+			}
+			final Set<Integer> scrollItems = scroll.getItems();
+			if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId()))
+			{
+				return false;
+			}
+		}
 		if ((_items != null) && !_items.contains(itemToEnchant.getId()))
 		{
 			return false;