Browse Source

BETA: Fixing MP consume (and logic) in some skills.

Reported by: badboy29, lucan, LeoDetona
Zoey76 12 years ago
parent
commit
b89fe33bb0

+ 0 - 7
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java

@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.effects.EffectFlag;
 import com.l2jserver.gameserver.model.effects.EffectTemplate;
 import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
@@ -57,12 +56,6 @@ public class ChameleonRest extends L2Effect
 			return false;
 		}
 		
-		// Only cont skills shouldn't end
-		if (getSkill().getSkillType() != L2SkillType.CONT)
-		{
-			return false;
-		}
-		
 		if (getEffected().isPlayer())
 		{
 			if (!getEffected().getActingPlayer().isSitting())

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java

@@ -37,7 +37,7 @@ public class MpConsumePerLevel extends L2Effect
 	@Override
 	public L2EffectType getEffectType()
 	{
-		return L2EffectType.MP_CONSUME_PER_LEVEL;
+		return L2EffectType.NONE;
 	}
 	
 	@Override
@@ -49,7 +49,7 @@ public class MpConsumePerLevel extends L2Effect
 		}
 		
 		final double base = calc() * getEffectTemplate().getTotalTickCount();
-		double consume = ((getEffected().getLevel() - 1) / 7.5) * base * getAbnormalTime();
+		final double consume = (getAbnormalTime() > 0) ? ((getEffected().getLevel() - 1) / 7.5) * base * getAbnormalTime() : base;
 		if (consume > getEffected().getCurrentMp())
 		{
 			getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);

+ 0 - 7
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.effects.EffectFlag;
 import com.l2jserver.gameserver.model.effects.EffectTemplate;
 import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.stats.Env;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
@@ -62,12 +61,6 @@ public class SilentMove extends L2Effect
 	@Override
 	public boolean onActionTime()
 	{
-		// Only cont skills shouldn't end
-		if (getSkill().getSkillType() != L2SkillType.CONT)
-		{
-			return false;
-		}
-		
 		if (getEffected().isDead())
 		{
 			return false;