Browse Source

BETA: Core Part for [DP8558]

Rumen Nikiforov 13 years ago
parent
commit
aa2c2a7e71

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -7928,7 +7928,7 @@ public final class L2PcInstance extends L2Playable
 					switch (effect.getEffectType())
 					{
 						case HEAL_OVER_TIME:
-						case COMBAT_POINT_HEAL_OVER_TIME:
+						case CPHEAL_OVER_TIME:
 							// TODO: Fix me.
 						case HIDE:
 							continue;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -999,7 +999,7 @@ public class L2PetInstance extends L2Summon
 					switch (effect.getEffectType())
 					{
 						case HEAL_OVER_TIME:
-						case COMBAT_POINT_HEAL_OVER_TIME:
+						case CPHEAL_OVER_TIME:
 							// TODO: Fix me.
 						case HIDE:
 							continue;

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2SummonInstance.java

@@ -358,7 +358,7 @@ public class L2SummonInstance extends L2Summon
 					switch (effect.getEffectType())
 					{
 						case HEAL_OVER_TIME:
-						case COMBAT_POINT_HEAL_OVER_TIME:
+						case CPHEAL_OVER_TIME:
 							// TODO: Fix me.
 						case HIDE:
 							continue;
@@ -499,8 +499,8 @@ public class L2SummonInstance extends L2Summon
 	
 	static class SummonLifetime implements Runnable
 	{
-		private L2PcInstance _activeChar;
-		private L2SummonInstance _summon;
+		private final L2PcInstance _activeChar;
+		private final L2SummonInstance _summon;
 		
 		SummonLifetime(L2PcInstance activeChar, L2SummonInstance newpet)
 		{

+ 2 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/templates/skills/L2EffectType.java

@@ -35,17 +35,15 @@ public enum L2EffectType
 	MANAHEAL_PERCENT,
 	MANA_DMG_OVER_TIME,
 	MANA_HEAL_OVER_TIME,
-	CPHEAL_PERCENT,
 	CPHEAL,
-	COMBAT_POINT_HEAL,
-	COMBAT_POINT_HEAL_OVER_TIME,
+	CPHEAL_PERCENT,
+	CPHEAL_OVER_TIME,
 	CPDAMPERCENT,
 	MP_CONSUME_PER_LEVEL,
 	RELAXING,
 	STUN,
 	ROOT,
 	SLEEP,
-	HATE,
 	FAKE_DEATH,
 	RANDOMIZE_HATE,
 	CONFUSION,
@@ -53,7 +51,6 @@ public enum L2EffectType
 	MUTE,
 	FEAR,
 	SILENT_MOVE,
-	SEED,
 	PARALYZE,
 	PHYSICAL_MUTE,
 	PHYSICAL_ATTACK_MUTE,
@@ -65,7 +62,6 @@ public enum L2EffectType
 	PETRIFICATION,
 	BLUFF,
 	CHARM_OF_LUCK,
-	LUCKY,
 	INVINCIBLE,
 	TRANSFORMATION,
 	DISARM,