Skip to content
Snippets Groups Projects
Commit b89fe33b authored by Zoey76's avatar Zoey76
Browse files

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

Reported by: badboy29, lucan, LeoDetona
parent e95f0ff5
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.effects.EffectFlag; ...@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.effects.EffectFlag;
import com.l2jserver.gameserver.model.effects.EffectTemplate; import com.l2jserver.gameserver.model.effects.EffectTemplate;
import com.l2jserver.gameserver.model.effects.L2Effect; import com.l2jserver.gameserver.model.effects.L2Effect;
import com.l2jserver.gameserver.model.effects.L2EffectType; 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.model.stats.Env;
import com.l2jserver.gameserver.network.SystemMessageId; import com.l2jserver.gameserver.network.SystemMessageId;
...@@ -57,12 +56,6 @@ public class ChameleonRest extends L2Effect ...@@ -57,12 +56,6 @@ public class ChameleonRest extends L2Effect
return false; return false;
} }
// Only cont skills shouldn't end
if (getSkill().getSkillType() != L2SkillType.CONT)
{
return false;
}
if (getEffected().isPlayer()) if (getEffected().isPlayer())
{ {
if (!getEffected().getActingPlayer().isSitting()) if (!getEffected().getActingPlayer().isSitting())
......
...@@ -37,7 +37,7 @@ public class MpConsumePerLevel extends L2Effect ...@@ -37,7 +37,7 @@ public class MpConsumePerLevel extends L2Effect
@Override @Override
public L2EffectType getEffectType() public L2EffectType getEffectType()
{ {
return L2EffectType.MP_CONSUME_PER_LEVEL; return L2EffectType.NONE;
} }
@Override @Override
...@@ -49,7 +49,7 @@ public class MpConsumePerLevel extends L2Effect ...@@ -49,7 +49,7 @@ public class MpConsumePerLevel extends L2Effect
} }
final double base = calc() * getEffectTemplate().getTotalTickCount(); 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()) if (consume > getEffected().getCurrentMp())
{ {
getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP); getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
......
...@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.effects.EffectFlag; ...@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.effects.EffectFlag;
import com.l2jserver.gameserver.model.effects.EffectTemplate; import com.l2jserver.gameserver.model.effects.EffectTemplate;
import com.l2jserver.gameserver.model.effects.L2Effect; import com.l2jserver.gameserver.model.effects.L2Effect;
import com.l2jserver.gameserver.model.effects.L2EffectType; 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.model.stats.Env;
import com.l2jserver.gameserver.network.SystemMessageId; import com.l2jserver.gameserver.network.SystemMessageId;
...@@ -62,12 +61,6 @@ public class SilentMove extends L2Effect ...@@ -62,12 +61,6 @@ public class SilentMove extends L2Effect
@Override @Override
public boolean onActionTime() public boolean onActionTime()
{ {
// Only cont skills shouldn't end
if (getSkill().getSkillType() != L2SkillType.CONT)
{
return false;
}
if (getEffected().isDead()) if (getEffected().isDead())
{ {
return false; return false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment