From 867ae8727018fb8fa7af6e99c41e673e5adf1c32 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 30 Jan 2021 22:09:52 +0000
Subject: [PATCH] Fixed Scroll of Escape abort action.

---
 .../gameserver/handler/itemhandlers/ScrollOfEscape.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
index 1d7e3ebce6..75cf4e7ee0 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
@@ -158,6 +158,12 @@ public class ScrollOfEscape implements IItemHandler
 			return;
 		}
 		
+		if (player.isCastingNow())
+		{
+			player.sendMessage("You may not use this item while casting a skill.");
+			return;
+		}
+		
 		// Check if this is a blessed scroll, if it is then shorten the cast time.
 		final int itemId = item.getItemId();
 		final SystemMessage sm3 = new SystemMessage(SystemMessageId.USE_S1);
@@ -183,7 +189,6 @@ public class ScrollOfEscape implements IItemHandler
 		// Abort combat.
 		player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 		player.abortAttack();
-		player.abortCast(true);
 		player.disableAllSkills();
 		
 		final Skill skill = SkillTable.getInstance().getSkill(escapeSkill, 1);