lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly restore finished skill stack effects for previous commit.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-07-20 08:36:46 +00:00
parent cf38303ace
commit e72b2f470b
2 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/EffectList.java
View File

@ -1434,22 +1434,33 @@ public class EffectList
// Skills are only replaced if the incoming buff has greater or equal abnormal level. // Skills are only replaced if the incoming buff has greater or equal abnormal level.
if ((stackedInfo != null) && (skill.getAbnormalLvl() >= stackedInfo.getSkill().getAbnormalLvl())) if ((stackedInfo != null) && (skill.getAbnormalLvl() >= stackedInfo.getSkill().getAbnormalLvl()))
{ {
stopSkillEffects(false, skill.getAbnormalType());
// If it is an herb, set as not in use the lesser buff. // If it is an herb, set as not in use the lesser buff.
// Effect will be present in the effect list. // Effect will be present in the effect list.
// Effects stats are removed and onActionTime() is not called. // Effects stats are removed and onActionTime() is not called.
// But finish task continues to run, and ticks as well. // But finish task continues to run, and ticks as well.
if (stackedInfo.getSkill().isAbnormalInstant()) if (skill.isAbnormalInstant())
{ {
stackedInfo = _stackedEffects.get(skill.getAbnormalType()); if (stackedInfo.getSkill().isAbnormalInstant())
{
stopSkillEffects(false, skill.getAbnormalType());
stackedInfo = _stackedEffects.get(skill.getAbnormalType());
}
if (stackedInfo != null)
{
stackedInfo.setInUse(false);
// Remove stats
stackedInfo.removeStats();
_hiddenBuffs.incrementAndGet();
}
} }
else // Remove buff that will stack with the abnormal type.
if (stackedInfo != null)
{ {
stackedInfo.setInUse(false); if (stackedInfo.getSkill().isAbnormalInstant())
stackedInfo.removeStats(); {
_hiddenBuffs.incrementAndGet(); stopSkillEffects(false, skill.getAbnormalType());
}
stopSkillEffects(false, skill.getAbnormalType());
} }
} }
else // If the new buff is a lesser buff, then don't add it. else // If the new buff is a lesser buff, then don't add it.

29
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/EffectList.java
View File

@ -1435,22 +1435,33 @@ public class EffectList
// Skills are only replaced if the incoming buff has greater or equal abnormal level. // Skills are only replaced if the incoming buff has greater or equal abnormal level.
if ((stackedInfo != null) && (skill.getAbnormalLvl() >= stackedInfo.getSkill().getAbnormalLvl())) if ((stackedInfo != null) && (skill.getAbnormalLvl() >= stackedInfo.getSkill().getAbnormalLvl()))
{ {
stopSkillEffects(false, skill.getAbnormalType());
// If it is an herb, set as not in use the lesser buff. // If it is an herb, set as not in use the lesser buff.
// Effect will be present in the effect list. // Effect will be present in the effect list.
// Effects stats are removed and onActionTime() is not called. // Effects stats are removed and onActionTime() is not called.
// But finish task continues to run, and ticks as well. // But finish task continues to run, and ticks as well.
if (stackedInfo.getSkill().isAbnormalInstant()) if (skill.isAbnormalInstant())
{ {
stackedInfo = _stackedEffects.get(skill.getAbnormalType()); if (stackedInfo.getSkill().isAbnormalInstant())
{
stopSkillEffects(false, skill.getAbnormalType());
stackedInfo = _stackedEffects.get(skill.getAbnormalType());
}
if (stackedInfo != null)
{
stackedInfo.setInUse(false);
// Remove stats
stackedInfo.removeStats();
_hiddenBuffs.incrementAndGet();
}
} }
else // Remove buff that will stack with the abnormal type.
if (stackedInfo != null)
{ {
stackedInfo.setInUse(false); if (stackedInfo.getSkill().isAbnormalInstant())
stackedInfo.removeStats(); {
_hiddenBuffs.incrementAndGet(); stopSkillEffects(false, skill.getAbnormalType());
}
stopSkillEffects(false, skill.getAbnormalType());
} }
} }
else // If the new buff is a lesser buff, then don't add it. else // If the new buff is a lesser buff, then don't add it.