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

Extra checks for trigger skills by attack.

Browse Source
This commit is contained in:
MobiusDev
2017-09-21 22:04:12 +00:00
parent 99897b17c9
commit 23d3883d34
11 changed files with 151 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java vendored
View File

@@ -151,7 +151,11 @@ public final class TriggerSkillByAttack extends AbstractEffect
if ((target != null) && target.isCharacter())
{
SkillCaster.triggerCast(event.getAttacker(), (L2Character) target, triggerSkill);
final BuffInfo info = ((L2Character) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId());
if ((info == null) || (info.getSkill().getLevel() < triggerSkill.getLevel()))
{
SkillCaster.triggerCast(event.getAttacker(), (L2Character) target, triggerSkill);
}
}
}

14
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java
View File

@@ -1109,6 +1109,20 @@ public final class CharEffectList
return;
}
// Fix for stacking trigger skills
if (skill.isTriggeredSkill())
{
final BuffInfo triggerInfo = info.getEffected().getEffectList().getBuffInfoBySkillId(skill.getId());
if (triggerInfo != null)
{
if (triggerInfo.getSkill().getLevel() >= skill.getLevel())
{
return;
}
stopAndRemove(triggerInfo);
}
}
// Passive effects are treated specially
if (skill.isPassive())
{