From 9343132e4b1ba35449ca971d9cb96b3592800bf6 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 13 Dec 2022 07:07:52 +0000
Subject: [PATCH] Multi enchant RequestEnchantItem improvements. Contributed by
 Fakee.

---
 .../enchant/multi/ExRequestStartMultiEnchantScroll.java         | 2 +-
 .../enchant/multi/ExRequestStartMultiEnchantScroll.java         | 2 +-
 .../enchant/multi/ExRequestStartMultiEnchantScroll.java         | 2 +-
 .../enchant/multi/ExRequestStartMultiEnchantScroll.java         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
index dbf4e44c4f..acbde4b941 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
@@ -56,7 +56,7 @@ public class ExRequestStartMultiEnchantScroll implements ClientPacket
 		
 		final Item scroll = player.getInventory().getItemByObjectId(_scrollObjectId);
 		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
-		if (scrollTemplate == null)
+		if (scrollTemplate == null || scrollTemplate.isBlessed() || scrollTemplate.isBlessedDown() || scrollTemplate.isSafe() || scrollTemplate.isGiant())
 		{
 			player.sendPacket(new ExResetSelectMultiEnchantScroll(player, _scrollObjectId, 1));
 			return;
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
index dbf4e44c4f..acbde4b941 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
@@ -56,7 +56,7 @@ public class ExRequestStartMultiEnchantScroll implements ClientPacket
 		
 		final Item scroll = player.getInventory().getItemByObjectId(_scrollObjectId);
 		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
-		if (scrollTemplate == null)
+		if (scrollTemplate == null || scrollTemplate.isBlessed() || scrollTemplate.isBlessedDown() || scrollTemplate.isSafe() || scrollTemplate.isGiant())
 		{
 			player.sendPacket(new ExResetSelectMultiEnchantScroll(player, _scrollObjectId, 1));
 			return;
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
index dbf4e44c4f..acbde4b941 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
@@ -56,7 +56,7 @@ public class ExRequestStartMultiEnchantScroll implements ClientPacket
 		
 		final Item scroll = player.getInventory().getItemByObjectId(_scrollObjectId);
 		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
-		if (scrollTemplate == null)
+		if (scrollTemplate == null || scrollTemplate.isBlessed() || scrollTemplate.isBlessedDown() || scrollTemplate.isSafe() || scrollTemplate.isGiant())
 		{
 			player.sendPacket(new ExResetSelectMultiEnchantScroll(player, _scrollObjectId, 1));
 			return;
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
index dbf4e44c4f..acbde4b941 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestStartMultiEnchantScroll.java
@@ -56,7 +56,7 @@ public class ExRequestStartMultiEnchantScroll implements ClientPacket
 		
 		final Item scroll = player.getInventory().getItemByObjectId(_scrollObjectId);
 		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
-		if (scrollTemplate == null)
+		if (scrollTemplate == null || scrollTemplate.isBlessed() || scrollTemplate.isBlessedDown() || scrollTemplate.isSafe() || scrollTemplate.isGiant())
 		{
 			player.sendPacket(new ExResetSelectMultiEnchantScroll(player, _scrollObjectId, 1));
 			return;