Added latest commits for todays sync.

2015-02-03 22:02:10 +00:00
parent fe25f74122
commit 094651541b
36 changed files with 216 additions and 67 deletions
--- a/trunk/java/com/l2jserver/gameserver/model/Hit.java
+++ b/trunk/java/com/l2jserver/gameserver/model/Hit.java
@@ -41,11 +41,6 @@ public class Hit
 			addMask(AttackType.MISSED);
 			return;
 		}
-		else if (target.isInvul() || (shld > 0))
-		{
-			addMask(AttackType.BLOCKED);
-			return;
-		}
 		
 		if (crit)
 		{
@@ -56,6 +51,11 @@ public class Hit
 		{
 			addMask(AttackType.SHOT_USED);
 		}
+		
+		if (target.isInvul() || (shld > 0))
+		{
+			addMask(AttackType.BLOCKED);
+		}
 	}
 	
 	private void addMask(AttackType type)