Sync with L2jServer HighFive Nov 14th 2015.

2015-11-14 16:31:37 +00:00
parent 887fbcc6b5
commit e38353e409
125 changed files with 1998 additions and 1419 deletions
--- a/trunk/java/com/l2jserver/gameserver/model/skills/Skill.java
+++ b/trunk/java/com/l2jserver/gameserver/model/skills/Skill.java
@ -1372,6 +1372,21 @@ public final class Skill implements IIdentifiable
 			return;
 		}
 		
+		if (isDebuff())
+		{
+			if (effected.isDebuffBlocked())
+			{
+				return;
+			}
+		}
+		else
+		{
+			if (effected.isBuffBlocked() && !isBad())
+			{
+				return;
+			}
+		}
+		
 		if (effected.isInvulAgainst(getId(), getLevel()))
 		{
 			effected.sendDebugMessage("Skill " + toString() + " has been ignored (invul against)");