Addition of ReplaceSkillBySkill canStart transformation condition.

Thanks to Liamxroy.

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

@@ -44,39 +44,42 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
 	}
 	
+	@Override
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
+	{
+		return effected.isPlayer() && !effected.isTransformed();
+	}
+	
 	@Override
 	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if (effected.isPlayer())
+		final Player player = effected.getActingPlayer();
+		final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
+		if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
 		{
-			final Player player = effected.getActingPlayer();
+			return;
-			final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
-			if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
-			{
-				return;
-			}
-			
-			final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
-			player.addSkill(addedSkill, false);
-			player.addReplacedSkill(_existingSkill.getSkillId());
-			for (Shortcut shortcut : player.getAllShortCuts())
-			{
-				if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
-				{
-					final int slot = shortcut.getSlot();
-					final int page = shortcut.getPage();
-					final int characterType = shortcut.getCharacterType();
-					player.deleteShortCut(slot, page);
-					final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
-					player.registerShortCut(newShortcut);
-					player.sendPacket(new ShortCutRegister(newShortcut));
-				}
-			}
-			
-			player.removeSkill(knownSkill, false);
-			player.sendSkillList();
-			ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 		}
+		
+		final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
+		player.addSkill(addedSkill, false);
+		player.addReplacedSkill(_existingSkill.getSkillId());
+		for (Shortcut shortcut : player.getAllShortCuts())
+		{
+			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
+			{
+				final int slot = shortcut.getSlot();
+				final int page = shortcut.getPage();
+				final int characterType = shortcut.getCharacterType();
+				player.deleteShortCut(slot, page);
+				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
+				player.registerShortCut(newShortcut);
+				player.sendPacket(new ShortCutRegister(newShortcut));
+			}
+		}
+		
+		player.removeSkill(knownSkill, false);
+		player.sendSkillList();
+		ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 	}
 	
 	@Override

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

@@ -44,39 +44,42 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
 	}
 	
+	@Override
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
+	{
+		return effected.isPlayer() && !effected.isTransformed();
+	}
+	
 	@Override
 	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if (effected.isPlayer())
+		final Player player = effected.getActingPlayer();
+		final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
+		if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
 		{
-			final Player player = effected.getActingPlayer();
+			return;
-			final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
-			if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
-			{
-				return;
-			}
-			
-			final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
-			player.addSkill(addedSkill, false);
-			player.addReplacedSkill(_existingSkill.getSkillId());
-			for (Shortcut shortcut : player.getAllShortCuts())
-			{
-				if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
-				{
-					final int slot = shortcut.getSlot();
-					final int page = shortcut.getPage();
-					final int characterType = shortcut.getCharacterType();
-					player.deleteShortCut(slot, page);
-					final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
-					player.registerShortCut(newShortcut);
-					player.sendPacket(new ShortCutRegister(newShortcut));
-				}
-			}
-			
-			player.removeSkill(knownSkill, false);
-			player.sendSkillList();
-			ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 		}
+		
+		final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
+		player.addSkill(addedSkill, false);
+		player.addReplacedSkill(_existingSkill.getSkillId());
+		for (Shortcut shortcut : player.getAllShortCuts())
+		{
+			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
+			{
+				final int slot = shortcut.getSlot();
+				final int page = shortcut.getPage();
+				final int characterType = shortcut.getCharacterType();
+				player.deleteShortCut(slot, page);
+				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
+				player.registerShortCut(newShortcut);
+				player.sendPacket(new ShortCutRegister(newShortcut));
+			}
+		}
+		
+		player.removeSkill(knownSkill, false);
+		player.sendSkillList();
+		ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 	}
 	
 	@Override

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

@@ -44,39 +44,42 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
 	}
 	
+	@Override
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
+	{
+		return effected.isPlayer() && !effected.isTransformed();
+	}
+	
 	@Override
 	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if (effected.isPlayer())
+		final Player player = effected.getActingPlayer();
+		final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
+		if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
 		{
-			final Player player = effected.getActingPlayer();
+			return;
-			final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
-			if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
-			{
-				return;
-			}
-			
-			final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
-			player.addSkill(addedSkill, false);
-			player.addReplacedSkill(_existingSkill.getSkillId());
-			for (Shortcut shortcut : player.getAllShortCuts())
-			{
-				if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
-				{
-					final int slot = shortcut.getSlot();
-					final int page = shortcut.getPage();
-					final int characterType = shortcut.getCharacterType();
-					player.deleteShortCut(slot, page);
-					final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
-					player.registerShortCut(newShortcut);
-					player.sendPacket(new ShortCutRegister(newShortcut));
-				}
-			}
-			
-			player.removeSkill(knownSkill, false);
-			player.sendSkillList();
-			ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 		}
+		
+		final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
+		player.addSkill(addedSkill, false);
+		player.addReplacedSkill(_existingSkill.getSkillId());
+		for (Shortcut shortcut : player.getAllShortCuts())
+		{
+			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
+			{
+				final int slot = shortcut.getSlot();
+				final int page = shortcut.getPage();
+				final int characterType = shortcut.getCharacterType();
+				player.deleteShortCut(slot, page);
+				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
+				player.registerShortCut(newShortcut);
+				player.sendPacket(new ShortCutRegister(newShortcut));
+			}
+		}
+		
+		player.removeSkill(knownSkill, false);
+		player.sendSkillList();
+		ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 	}
 	
 	@Override

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

@@ -44,39 +44,42 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
 	}
 	
+	@Override
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
+	{
+		return effected.isPlayer() && !effected.isTransformed();
+	}
+	
 	@Override
 	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if (effected.isPlayer())
+		final Player player = effected.getActingPlayer();
+		final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
+		if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
 		{
-			final Player player = effected.getActingPlayer();
+			return;
-			final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
-			if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
-			{
-				return;
-			}
-			
-			final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
-			player.addSkill(addedSkill, false);
-			player.addReplacedSkill(_existingSkill.getSkillId());
-			for (Shortcut shortcut : player.getAllShortCuts())
-			{
-				if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
-				{
-					final int slot = shortcut.getSlot();
-					final int page = shortcut.getPage();
-					final int characterType = shortcut.getCharacterType();
-					player.deleteShortCut(slot, page);
-					final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
-					player.registerShortCut(newShortcut);
-					player.sendPacket(new ShortCutRegister(newShortcut));
-				}
-			}
-			
-			player.removeSkill(knownSkill, false);
-			player.sendSkillList();
-			ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 		}
+		
+		final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
+		player.addSkill(addedSkill, false);
+		player.addReplacedSkill(_existingSkill.getSkillId());
+		for (Shortcut shortcut : player.getAllShortCuts())
+		{
+			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
+			{
+				final int slot = shortcut.getSlot();
+				final int page = shortcut.getPage();
+				final int characterType = shortcut.getCharacterType();
+				player.deleteShortCut(slot, page);
+				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
+				player.registerShortCut(newShortcut);
+				player.sendPacket(new ShortCutRegister(newShortcut));
+			}
+		}
+		
+		player.removeSkill(knownSkill, false);
+		player.sendSkillList();
+		ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 	}
 	
 	@Override

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

@@ -44,39 +44,42 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
 	}
 	
+	@Override
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
+	{
+		return effected.isPlayer() && !effected.isTransformed();
+	}
+	
 	@Override
 	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if (effected.isPlayer())
+		final Player player = effected.getActingPlayer();
+		final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
+		if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
 		{
-			final Player player = effected.getActingPlayer();
+			return;
-			final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
-			if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
-			{
-				return;
-			}
-			
-			final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
-			player.addSkill(addedSkill, false);
-			player.addReplacedSkill(_existingSkill.getSkillId());
-			for (Shortcut shortcut : player.getAllShortCuts())
-			{
-				if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
-				{
-					final int slot = shortcut.getSlot();
-					final int page = shortcut.getPage();
-					final int characterType = shortcut.getCharacterType();
-					player.deleteShortCut(slot, page);
-					final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
-					player.registerShortCut(newShortcut);
-					player.sendPacket(new ShortCutRegister(newShortcut));
-				}
-			}
-			
-			player.removeSkill(knownSkill, false);
-			player.sendSkillList();
-			ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 		}
+		
+		final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
+		player.addSkill(addedSkill, false);
+		player.addReplacedSkill(_existingSkill.getSkillId());
+		for (Shortcut shortcut : player.getAllShortCuts())
+		{
+			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
+			{
+				final int slot = shortcut.getSlot();
+				final int page = shortcut.getPage();
+				final int characterType = shortcut.getCharacterType();
+				player.deleteShortCut(slot, page);
+				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
+				player.registerShortCut(newShortcut);
+				player.sendPacket(new ShortCutRegister(newShortcut));
+			}
+		}
+		
+		player.removeSkill(knownSkill, false);
+		player.sendSkillList();
+		ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 	}
 	
 	@Override

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

@@ -44,39 +44,42 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
 	}
 	
+	@Override
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
+	{
+		return effected.isPlayer() && !effected.isTransformed();
+	}
+	
 	@Override
 	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if (effected.isPlayer())
+		final Player player = effected.getActingPlayer();
+		final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
+		if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
 		{
-			final Player player = effected.getActingPlayer();
+			return;
-			final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
-			if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
-			{
-				return;
-			}
-			
-			final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
-			player.addSkill(addedSkill, false);
-			player.addReplacedSkill(_existingSkill.getSkillId());
-			for (Shortcut shortcut : player.getAllShortCuts())
-			{
-				if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
-				{
-					final int slot = shortcut.getSlot();
-					final int page = shortcut.getPage();
-					final int characterType = shortcut.getCharacterType();
-					player.deleteShortCut(slot, page);
-					final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
-					player.registerShortCut(newShortcut);
-					player.sendPacket(new ShortCutRegister(newShortcut));
-				}
-			}
-			
-			player.removeSkill(knownSkill, false);
-			player.sendSkillList();
-			ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 		}
+		
+		final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
+		player.addSkill(addedSkill, false);
+		player.addReplacedSkill(_existingSkill.getSkillId());
+		for (Shortcut shortcut : player.getAllShortCuts())
+		{
+			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
+			{
+				final int slot = shortcut.getSlot();
+				final int page = shortcut.getPage();
+				final int characterType = shortcut.getCharacterType();
+				player.deleteShortCut(slot, page);
+				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
+				player.registerShortCut(newShortcut);
+				player.sendPacket(new ShortCutRegister(newShortcut));
+			}
+		}
+		
+		player.removeSkill(knownSkill, false);
+		player.sendSkillList();
+		ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 	}
 	
 	@Override

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

@@ -44,39 +44,42 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
 	}
 	
+	@Override
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
+	{
+		return effected.isPlayer() && !effected.isTransformed();
+	}
+	
 	@Override
 	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if (effected.isPlayer())
+		final Player player = effected.getActingPlayer();
+		final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
+		if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
 		{
-			final Player player = effected.getActingPlayer();
+			return;
-			final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
-			if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
-			{
-				return;
-			}
-			
-			final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
-			player.addSkill(addedSkill, false);
-			player.addReplacedSkill(_existingSkill.getSkillId());
-			for (Shortcut shortcut : player.getAllShortCuts())
-			{
-				if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
-				{
-					final int slot = shortcut.getSlot();
-					final int page = shortcut.getPage();
-					final int characterType = shortcut.getCharacterType();
-					player.deleteShortCut(slot, page);
-					final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
-					player.registerShortCut(newShortcut);
-					player.sendPacket(new ShortCutRegister(newShortcut));
-				}
-			}
-			
-			player.removeSkill(knownSkill, false);
-			player.sendSkillList();
-			ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 		}
+		
+		final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
+		player.addSkill(addedSkill, false);
+		player.addReplacedSkill(_existingSkill.getSkillId());
+		for (Shortcut shortcut : player.getAllShortCuts())
+		{
+			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
+			{
+				final int slot = shortcut.getSlot();
+				final int page = shortcut.getPage();
+				final int characterType = shortcut.getCharacterType();
+				player.deleteShortCut(slot, page);
+				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
+				player.registerShortCut(newShortcut);
+				player.sendPacket(new ShortCutRegister(newShortcut));
+			}
+		}
+		
+		player.removeSkill(knownSkill, false);
+		player.sendSkillList();
+		ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 	}
 	
 	@Override

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

@@ -26,6 +26,7 @@ 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.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -44,39 +45,42 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
 	}
 	
+	@Override
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
+	{
+		return effected.isPlayer() && (!effected.isTransformed() || effected.hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM));
+	}
+	
 	@Override
 	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if (effected.isPlayer())
+		final Player player = effected.getActingPlayer();
+		final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
+		if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
 		{
-			final Player player = effected.getActingPlayer();
+			return;
-			final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
-			if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
-			{
-				return;
-			}
-			
-			final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
-			player.addSkill(addedSkill, false);
-			player.addReplacedSkill(_existingSkill.getSkillId());
-			for (Shortcut shortcut : player.getAllShortCuts())
-			{
-				if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
-				{
-					final int slot = shortcut.getSlot();
-					final int page = shortcut.getPage();
-					final int characterType = shortcut.getCharacterType();
-					player.deleteShortCut(slot, page);
-					final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
-					player.registerShortCut(newShortcut);
-					player.sendPacket(new ShortCutRegister(newShortcut));
-				}
-			}
-			
-			player.removeSkill(knownSkill, false);
-			player.sendSkillList();
-			ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 		}
+		
+		final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
+		player.addSkill(addedSkill, false);
+		player.addReplacedSkill(_existingSkill.getSkillId());
+		for (Shortcut shortcut : player.getAllShortCuts())
+		{
+			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
+			{
+				final int slot = shortcut.getSlot();
+				final int page = shortcut.getPage();
+				final int characterType = shortcut.getCharacterType();
+				player.deleteShortCut(slot, page);
+				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
+				player.registerShortCut(newShortcut);
+				player.sendPacket(new ShortCutRegister(newShortcut));
+			}
+		}
+		
+		player.removeSkill(knownSkill, false);
+		player.sendSkillList();
+		ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 	}
 	
 	@Override

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

@@ -26,6 +26,7 @@ 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.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -44,39 +45,42 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
 	}
 	
+	@Override
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
+	{
+		return effected.isPlayer() && (!effected.isTransformed() || effected.hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM));
+	}
+	
 	@Override
 	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if (effected.isPlayer())
+		final Player player = effected.getActingPlayer();
+		final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
+		if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
 		{
-			final Player player = effected.getActingPlayer();
+			return;
-			final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
-			if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
-			{
-				return;
-			}
-			
-			final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
-			player.addSkill(addedSkill, false);
-			player.addReplacedSkill(_existingSkill.getSkillId());
-			for (Shortcut shortcut : player.getAllShortCuts())
-			{
-				if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
-				{
-					final int slot = shortcut.getSlot();
-					final int page = shortcut.getPage();
-					final int characterType = shortcut.getCharacterType();
-					player.deleteShortCut(slot, page);
-					final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
-					player.registerShortCut(newShortcut);
-					player.sendPacket(new ShortCutRegister(newShortcut));
-				}
-			}
-			
-			player.removeSkill(knownSkill, false);
-			player.sendSkillList();
-			ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 		}
+		
+		final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
+		player.addSkill(addedSkill, false);
+		player.addReplacedSkill(_existingSkill.getSkillId());
+		for (Shortcut shortcut : player.getAllShortCuts())
+		{
+			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
+			{
+				final int slot = shortcut.getSlot();
+				final int page = shortcut.getPage();
+				final int characterType = shortcut.getCharacterType();
+				player.deleteShortCut(slot, page);
+				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
+				player.registerShortCut(newShortcut);
+				player.sendPacket(new ShortCutRegister(newShortcut));
+			}
+		}
+		
+		player.removeSkill(knownSkill, false);
+		player.sendSkillList();
+		ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 	}
 	
 	@Override

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

@@ -26,6 +26,7 @@ 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.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -44,39 +45,42 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
 	}
 	
+	@Override
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
+	{
+		return effected.isPlayer() && (!effected.isTransformed() || effected.hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM));
+	}
+	
 	@Override
 	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if (effected.isPlayer())
+		final Player player = effected.getActingPlayer();
+		final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
+		if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
 		{
-			final Player player = effected.getActingPlayer();
+			return;
-			final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
-			if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
-			{
-				return;
-			}
-			
-			final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
-			player.addSkill(addedSkill, false);
-			player.addReplacedSkill(_existingSkill.getSkillId());
-			for (Shortcut shortcut : player.getAllShortCuts())
-			{
-				if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
-				{
-					final int slot = shortcut.getSlot();
-					final int page = shortcut.getPage();
-					final int characterType = shortcut.getCharacterType();
-					player.deleteShortCut(slot, page);
-					final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
-					player.registerShortCut(newShortcut);
-					player.sendPacket(new ShortCutRegister(newShortcut));
-				}
-			}
-			
-			player.removeSkill(knownSkill, false);
-			player.sendSkillList();
-			ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 		}
+		
+		final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
+		player.addSkill(addedSkill, false);
+		player.addReplacedSkill(_existingSkill.getSkillId());
+		for (Shortcut shortcut : player.getAllShortCuts())
+		{
+			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
+			{
+				final int slot = shortcut.getSlot();
+				final int page = shortcut.getPage();
+				final int characterType = shortcut.getCharacterType();
+				player.deleteShortCut(slot, page);
+				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
+				player.registerShortCut(newShortcut);
+				player.sendPacket(new ShortCutRegister(newShortcut));
+			}
+		}
+		
+		player.removeSkill(knownSkill, false);
+		player.sendSkillList();
+		ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 	}
 	
 	@Override

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

@@ -26,6 +26,7 @@ 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.item.instance.Item;
+import org.l2jmobius.gameserver.model.skill.AbnormalType;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
@@ -44,39 +45,42 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
 	}
 	
+	@Override
+	public boolean canStart(Creature effector, Creature effected, Skill skill)
+	{
+		return effected.isPlayer() && (!effected.isTransformed() || effected.hasAbnormalType(AbnormalType.KAMAEL_TRANSFORM));
+	}
+	
 	@Override
 	public void onStart(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if (effected.isPlayer())
+		final Player player = effected.getActingPlayer();
+		final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
+		if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
 		{
-			final Player player = effected.getActingPlayer();
+			return;
-			final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
-			if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
-			{
-				return;
-			}
-			
-			final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
-			player.addSkill(addedSkill, false);
-			player.addReplacedSkill(_existingSkill.getSkillId());
-			for (Shortcut shortcut : player.getAllShortCuts())
-			{
-				if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
-				{
-					final int slot = shortcut.getSlot();
-					final int page = shortcut.getPage();
-					final int characterType = shortcut.getCharacterType();
-					player.deleteShortCut(slot, page);
-					final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
-					player.registerShortCut(newShortcut);
-					player.sendPacket(new ShortCutRegister(newShortcut));
-				}
-			}
-			
-			player.removeSkill(knownSkill, false);
-			player.sendSkillList();
-			ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 		}
+		
+		final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
+		player.addSkill(addedSkill, false);
+		player.addReplacedSkill(_existingSkill.getSkillId());
+		for (Shortcut shortcut : player.getAllShortCuts())
+		{
+			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
+			{
+				final int slot = shortcut.getSlot();
+				final int page = shortcut.getPage();
+				final int characterType = shortcut.getCharacterType();
+				player.deleteShortCut(slot, page);
+				final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
+				player.registerShortCut(newShortcut);
+				player.sendPacket(new ShortCutRegister(newShortcut));
+			}
+		}
+		
+		player.removeSkill(knownSkill, false);
+		player.sendSkillList();
+		ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
 	}
 	
 	@Override