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/effects/EffectFlag.java
+++ b/trunk/java/com/l2jserver/gameserver/model/effects/EffectFlag.java
@ -24,6 +24,10 @@ package com.l2jserver.gameserver.model.effects;
 public enum EffectFlag
 {
 	NONE,
+	BLOCK_BUFF,
+	BLOCK_DEBUFF,
+	BLOCK_HP,
+	BLOCK_MP,
 	RESURRECTION_SPECIAL,
 	NOBLESS_BLESSING,
 	SILENT_MOVE,
@ -39,7 +43,6 @@ public enum EffectFlag
 	SLEEP,
 	STUNNED,
 	BETRAYED,
-	INVUL,
 	PARALYZED,
 	BLOCK_RESURRECTION,
 	SERVITOR_SHARE;
--- a/trunk/java/com/l2jserver/gameserver/model/effects/L2EffectType.java
+++ b/trunk/java/com/l2jserver/gameserver/model/effects/L2EffectType.java
@ -25,6 +25,9 @@ package com.l2jserver.gameserver.model.effects;
 public enum L2EffectType
 {
 	AGGRESSION,
+	BLOCK_BUFF,
+	BLOCK_DAMAGE,
+	BLOCK_DEBUFF,
 	BUFF,
 	CHARM_OF_LUCK,
 	CHAT_BLOCK,
@ -66,5 +69,5 @@ public enum L2EffectType
 	SUMMON_PET,
 	SUMMON_NPC,
 	TELEPORT,
-	TELEPORT_TO_TARGET,
+	TELEPORT_TO_TARGET
 }