Cancel effect and recalculate stats with AddSkillBySkill onExit.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java

@@ -16,9 +16,9 @@
  */
 package handlers.effecthandlers;
 
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.skill.Skill;
@@ -50,13 +50,14 @@ public class AddSkillBySkill extends AbstractEffect
 	{
 		if (effected.isPlayer())
 		{
-			((Player) effected).addSkill(_addedSkill.getSkill(), false);
+			effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
 		}
 	}
 	
 	@Override
 	public void onExit(Creature effector, Creature effected, Skill skill)
 	{
-		effected.removeSkill(_addedSkill.getSkill(), false);
+		effected.removeSkill(_addedSkill.getSkill(), true);
+		ThreadPool.schedule(() -> effected.getStat().recalculateStats(false), 1000);
 	}
 }