From 8b2571eecb30a9e5880018d77a8f4a2653f05c8c Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 30 Aug 2015 08:30:53 +0000
Subject: [PATCH] First ShoulShot bug fix. Contributed by Sahar.

---
 .../com/l2jserver/gameserver/model/actor/L2Character.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java b/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java
index 811d2f4fc7..23e05860eb 100644
--- a/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java
+++ b/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java
@@ -1164,9 +1164,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			}
 			else
 			{
-				// If we didn't miss the hit, discharge the shoulshots, if any
-				setChargedShot(ShotType.SOULSHOTS, false);
-				
 				if (player != null)
 				{
 					if (player.isCursedWeaponEquipped())
@@ -4959,6 +4956,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			}
 			notifyAttackAvoid(target, false);
 		}
+		else
+		{
+			// If we didn't miss the hit, discharge the shoulshots, if any
+			setChargedShot(ShotType.SOULSHOTS, false);
+		}
 		
 		// Send message about damage/crit or miss
 		sendDamageMessage(target, damage, false, crit, miss);