Extra checks for trigger skills by attack.

2017-09-21 22:04:12 +00:00
parent 99897b17c9
commit 23d3883d34
11 changed files with 151 additions and 55 deletions
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java
@@ -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())
 		{