diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 1d1695c2ef..863a5fa245 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -58,6 +58,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 			
 			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()))
@@ -90,6 +91,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		
 		final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
 		player.addSkill(addedSkill, false);
+		player.removeReplacedSkill(_existingSkill.getSkillId());
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
 			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
index ae03887751..83285a8b1b 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
@@ -710,6 +710,11 @@ public class SkillTreeData implements IXmlReader
 				continue;
 			}
 			
+			if (player.hasReplacedSkill(skill.getSkillId()))
+			{
+				continue;
+			}
+			
 			if (player.getLevel() >= skill.getGetLevel())
 			{
 				if (skill.getSkillLevel() > SkillData.getInstance().getMaxLevel(skill.getSkillId()))
@@ -1512,6 +1517,11 @@ public class SkillTreeData implements IXmlReader
 					continue;
 				}
 				
+				if (player.hasReplacedSkill(skill.getSkillId()))
+				{
+					continue;
+				}
+				
 				if (minLevelForNewSkill <= skill.getGetLevel())
 				{
 					final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
index 28f5348673..41889c97ff 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -806,6 +806,7 @@ public class Player extends Playable
 	
 	/** Map containing all custom skills of this player. */
 	private Map<Integer, Skill> _customSkills = null;
+	public final Set<Integer> _replacedSkills = ConcurrentHashMap.newKeySet(1);
 	
 	private volatile int _actionMask;
 	
@@ -13236,6 +13237,21 @@ public class Player extends Playable
 		}
 	}
 	
+	public void addReplacedSkill(int skillId)
+	{
+		_replacedSkills.add(skillId);
+	}
+	
+	public void removeReplacedSkill(int skillId)
+	{
+		_replacedSkills.remove(skillId);
+	}
+	
+	public boolean hasReplacedSkill(int skillId)
+	{
+		return _replacedSkills.contains(skillId);
+	}
+	
 	/**
 	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 1d1695c2ef..863a5fa245 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -58,6 +58,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 			
 			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()))
@@ -90,6 +91,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		
 		final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
 		player.addSkill(addedSkill, false);
+		player.removeReplacedSkill(_existingSkill.getSkillId());
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
 			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
index ae03887751..83285a8b1b 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
@@ -710,6 +710,11 @@ public class SkillTreeData implements IXmlReader
 				continue;
 			}
 			
+			if (player.hasReplacedSkill(skill.getSkillId()))
+			{
+				continue;
+			}
+			
 			if (player.getLevel() >= skill.getGetLevel())
 			{
 				if (skill.getSkillLevel() > SkillData.getInstance().getMaxLevel(skill.getSkillId()))
@@ -1512,6 +1517,11 @@ public class SkillTreeData implements IXmlReader
 					continue;
 				}
 				
+				if (player.hasReplacedSkill(skill.getSkillId()))
+				{
+					continue;
+				}
+				
 				if (minLevelForNewSkill <= skill.getGetLevel())
 				{
 					final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
index df1e79902a..a42b44a310 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -806,6 +806,7 @@ public class Player extends Playable
 	
 	/** Map containing all custom skills of this player. */
 	private Map<Integer, Skill> _customSkills = null;
+	public final Set<Integer> _replacedSkills = ConcurrentHashMap.newKeySet(1);
 	
 	private volatile int _actionMask;
 	
@@ -13239,6 +13240,21 @@ public class Player extends Playable
 		}
 	}
 	
+	public void addReplacedSkill(int skillId)
+	{
+		_replacedSkills.add(skillId);
+	}
+	
+	public void removeReplacedSkill(int skillId)
+	{
+		_replacedSkills.remove(skillId);
+	}
+	
+	public boolean hasReplacedSkill(int skillId)
+	{
+		return _replacedSkills.contains(skillId);
+	}
+	
 	/**
 	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 1d1695c2ef..863a5fa245 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -58,6 +58,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 			
 			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()))
@@ -90,6 +91,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		
 		final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
 		player.addSkill(addedSkill, false);
+		player.removeReplacedSkill(_existingSkill.getSkillId());
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
 			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
index 0a9e42df98..9056cd66a1 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
@@ -712,6 +712,11 @@ public class SkillTreeData implements IXmlReader
 				continue;
 			}
 			
+			if (player.hasReplacedSkill(skill.getSkillId()))
+			{
+				continue;
+			}
+			
 			if (player.getLevel() >= skill.getGetLevel())
 			{
 				if (skill.getSkillLevel() > SkillData.getInstance().getMaxLevel(skill.getSkillId()))
@@ -1515,6 +1520,11 @@ public class SkillTreeData implements IXmlReader
 					continue;
 				}
 				
+				if (player.hasReplacedSkill(skill.getSkillId()))
+				{
+					continue;
+				}
+				
 				if (minLevelForNewSkill <= skill.getGetLevel())
 				{
 					final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
index 2a8b8d420d..1908f1c696 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -806,6 +806,7 @@ public class Player extends Playable
 	
 	/** Map containing all custom skills of this player. */
 	private Map<Integer, Skill> _customSkills = null;
+	public final Set<Integer> _replacedSkills = ConcurrentHashMap.newKeySet(1);
 	
 	private volatile int _actionMask;
 	
@@ -13245,6 +13246,21 @@ public class Player extends Playable
 		}
 	}
 	
+	public void addReplacedSkill(int skillId)
+	{
+		_replacedSkills.add(skillId);
+	}
+	
+	public void removeReplacedSkill(int skillId)
+	{
+		_replacedSkills.remove(skillId);
+	}
+	
+	public boolean hasReplacedSkill(int skillId)
+	{
+		return _replacedSkills.contains(skillId);
+	}
+	
 	/**
 	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 1d1695c2ef..863a5fa245 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -58,6 +58,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 			
 			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()))
@@ -90,6 +91,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		
 		final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
 		player.addSkill(addedSkill, false);
+		player.removeReplacedSkill(_existingSkill.getSkillId());
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
 			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
index cfd84cbe2d..de4a59e53a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
@@ -712,6 +712,11 @@ public class SkillTreeData implements IXmlReader
 				continue;
 			}
 			
+			if (player.hasReplacedSkill(skill.getSkillId()))
+			{
+				continue;
+			}
+			
 			if (player.getLevel() >= skill.getGetLevel())
 			{
 				if (skill.getSkillLevel() > SkillData.getInstance().getMaxLevel(skill.getSkillId()))
@@ -1515,6 +1520,11 @@ public class SkillTreeData implements IXmlReader
 					continue;
 				}
 				
+				if (player.hasReplacedSkill(skill.getSkillId()))
+				{
+					continue;
+				}
+				
 				if (minLevelForNewSkill <= skill.getGetLevel())
 				{
 					final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
index 8cc6359ba3..8c2c9ae51b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -818,6 +818,7 @@ public class Player extends Playable
 	
 	/** Map containing all custom skills of this player. */
 	private Map<Integer, Skill> _customSkills = null;
+	public final Set<Integer> _replacedSkills = ConcurrentHashMap.newKeySet(1);
 	
 	private volatile int _actionMask;
 	
@@ -13281,6 +13282,21 @@ public class Player extends Playable
 		}
 	}
 	
+	public void addReplacedSkill(int skillId)
+	{
+		_replacedSkills.add(skillId);
+	}
+	
+	public void removeReplacedSkill(int skillId)
+	{
+		_replacedSkills.remove(skillId);
+	}
+	
+	public boolean hasReplacedSkill(int skillId)
+	{
+		return _replacedSkills.contains(skillId);
+	}
+	
 	/**
 	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 1d1695c2ef..863a5fa245 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -58,6 +58,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 			
 			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()))
@@ -90,6 +91,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		
 		final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
 		player.addSkill(addedSkill, false);
+		player.removeReplacedSkill(_existingSkill.getSkillId());
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
 			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
index e4810a22e7..9820a0491b 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
@@ -718,6 +718,11 @@ public class SkillTreeData implements IXmlReader
 				continue;
 			}
 			
+			if (player.hasReplacedSkill(skill.getSkillId()))
+			{
+				continue;
+			}
+			
 			if (player.getLevel() >= skill.getGetLevel())
 			{
 				if (skill.getSkillLevel() > SkillData.getInstance().getMaxLevel(skill.getSkillId()))
@@ -1521,6 +1526,11 @@ public class SkillTreeData implements IXmlReader
 					continue;
 				}
 				
+				if (player.hasReplacedSkill(skill.getSkillId()))
+				{
+					continue;
+				}
+				
 				if (minLevelForNewSkill <= skill.getGetLevel())
 				{
 					final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
index a91f6d80d4..75e56e798d 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -823,6 +823,7 @@ public class Player extends Playable
 	
 	/** Map containing all custom skills of this player. */
 	private Map<Integer, Skill> _customSkills = null;
+	public final Set<Integer> _replacedSkills = ConcurrentHashMap.newKeySet(1);
 	
 	private volatile int _actionMask;
 	
@@ -13397,6 +13398,21 @@ public class Player extends Playable
 		}
 	}
 	
+	public void addReplacedSkill(int skillId)
+	{
+		_replacedSkills.add(skillId);
+	}
+	
+	public void removeReplacedSkill(int skillId)
+	{
+		_replacedSkills.remove(skillId);
+	}
+	
+	public boolean hasReplacedSkill(int skillId)
+	{
+		return _replacedSkills.contains(skillId);
+	}
+	
 	/**
 	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 1d1695c2ef..863a5fa245 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -58,6 +58,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 			
 			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()))
@@ -90,6 +91,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		
 		final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
 		player.addSkill(addedSkill, false);
+		player.removeReplacedSkill(_existingSkill.getSkillId());
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
 			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
index e4810a22e7..9820a0491b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
@@ -718,6 +718,11 @@ public class SkillTreeData implements IXmlReader
 				continue;
 			}
 			
+			if (player.hasReplacedSkill(skill.getSkillId()))
+			{
+				continue;
+			}
+			
 			if (player.getLevel() >= skill.getGetLevel())
 			{
 				if (skill.getSkillLevel() > SkillData.getInstance().getMaxLevel(skill.getSkillId()))
@@ -1521,6 +1526,11 @@ public class SkillTreeData implements IXmlReader
 					continue;
 				}
 				
+				if (player.hasReplacedSkill(skill.getSkillId()))
+				{
+					continue;
+				}
+				
 				if (minLevelForNewSkill <= skill.getGetLevel())
 				{
 					final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
index 07fc5f0510..7dde9598c5 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -836,6 +836,7 @@ public class Player extends Playable
 	
 	/** Map containing all custom skills of this player. */
 	private Map<Integer, Skill> _customSkills = null;
+	public final Set<Integer> _replacedSkills = ConcurrentHashMap.newKeySet(1);
 	
 	private volatile int _actionMask;
 	
@@ -13435,6 +13436,21 @@ public class Player extends Playable
 		}
 	}
 	
+	public void addReplacedSkill(int skillId)
+	{
+		_replacedSkills.add(skillId);
+	}
+	
+	public void removeReplacedSkill(int skillId)
+	{
+		_replacedSkills.remove(skillId);
+	}
+	
+	public boolean hasReplacedSkill(int skillId)
+	{
+		return _replacedSkills.contains(skillId);
+	}
+	
 	/**
 	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 1d1695c2ef..863a5fa245 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -58,6 +58,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 			
 			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()))
@@ -90,6 +91,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		
 		final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
 		player.addSkill(addedSkill, false);
+		player.removeReplacedSkill(_existingSkill.getSkillId());
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
 			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
index e4810a22e7..9820a0491b 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
@@ -718,6 +718,11 @@ public class SkillTreeData implements IXmlReader
 				continue;
 			}
 			
+			if (player.hasReplacedSkill(skill.getSkillId()))
+			{
+				continue;
+			}
+			
 			if (player.getLevel() >= skill.getGetLevel())
 			{
 				if (skill.getSkillLevel() > SkillData.getInstance().getMaxLevel(skill.getSkillId()))
@@ -1521,6 +1526,11 @@ public class SkillTreeData implements IXmlReader
 					continue;
 				}
 				
+				if (player.hasReplacedSkill(skill.getSkillId()))
+				{
+					continue;
+				}
+				
 				if (minLevelForNewSkill <= skill.getGetLevel())
 				{
 					final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
index 350703d284..65e7b71114 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -838,6 +838,7 @@ public class Player extends Playable
 	
 	/** Map containing all custom skills of this player. */
 	private Map<Integer, Skill> _customSkills = null;
+	public final Set<Integer> _replacedSkills = ConcurrentHashMap.newKeySet(1);
 	
 	private volatile int _actionMask;
 	
@@ -13485,6 +13486,21 @@ public class Player extends Playable
 		}
 	}
 	
+	public void addReplacedSkill(int skillId)
+	{
+		_replacedSkills.add(skillId);
+	}
+	
+	public void removeReplacedSkill(int skillId)
+	{
+		_replacedSkills.remove(skillId);
+	}
+	
+	public boolean hasReplacedSkill(int skillId)
+	{
+		return _replacedSkills.contains(skillId);
+	}
+	
 	/**
 	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 1d1695c2ef..863a5fa245 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -58,6 +58,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 			
 			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()))
@@ -90,6 +91,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		
 		final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
 		player.addSkill(addedSkill, false);
+		player.removeReplacedSkill(_existingSkill.getSkillId());
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
 			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
index e4810a22e7..9820a0491b 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
@@ -718,6 +718,11 @@ public class SkillTreeData implements IXmlReader
 				continue;
 			}
 			
+			if (player.hasReplacedSkill(skill.getSkillId()))
+			{
+				continue;
+			}
+			
 			if (player.getLevel() >= skill.getGetLevel())
 			{
 				if (skill.getSkillLevel() > SkillData.getInstance().getMaxLevel(skill.getSkillId()))
@@ -1521,6 +1526,11 @@ public class SkillTreeData implements IXmlReader
 					continue;
 				}
 				
+				if (player.hasReplacedSkill(skill.getSkillId()))
+				{
+					continue;
+				}
+				
 				if (minLevelForNewSkill <= skill.getGetLevel())
 				{
 					final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
index ab487fb196..72fe029dd8 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -838,6 +838,7 @@ public class Player extends Playable
 	
 	/** Map containing all custom skills of this player. */
 	private Map<Integer, Skill> _customSkills = null;
+	public final Set<Integer> _replacedSkills = ConcurrentHashMap.newKeySet(1);
 	
 	private volatile int _actionMask;
 	
@@ -13513,6 +13514,21 @@ public class Player extends Playable
 		}
 	}
 	
+	public void addReplacedSkill(int skillId)
+	{
+		_replacedSkills.add(skillId);
+	}
+	
+	public void removeReplacedSkill(int skillId)
+	{
+		_replacedSkills.remove(skillId);
+	}
+	
+	public boolean hasReplacedSkill(int skillId)
+	{
+		return _replacedSkills.contains(skillId);
+	}
+	
 	/**
 	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 1d1695c2ef..863a5fa245 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -58,6 +58,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 			
 			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()))
@@ -90,6 +91,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		
 		final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
 		player.addSkill(addedSkill, false);
+		player.removeReplacedSkill(_existingSkill.getSkillId());
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
 			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt
index 393569e8d2..8e203417d1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/documentation.txt
@@ -273,6 +273,7 @@ ReflectMagic: Deflects magical damage back to the attacker.
 ReflectSkill: Deflects physical/magical debuffs back to the attacker.
 RefuelAirship: Increases Airship's fuel.
 Relax: Sits down and increases HP regeneration until full.
+ReplaceSkillBySkill: While active replaces a skill with an alternative skill. (l2jmobius)
 ResetInstanceEntry: Resets instance re-entry time. (l2jmobius)
 ResistAbnormalByCategory: Buff/debuff resist stat.
 ResistDDMagic: Magic resist stat (magic attack 50% effective or 1 damage)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
index 2a1d6b29c9..f78184a0b2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
@@ -709,6 +709,11 @@ public class SkillTreeData implements IXmlReader
 				continue;
 			}
 			
+			if (player.hasReplacedSkill(skill.getSkillId()))
+			{
+				continue;
+			}
+			
 			if (player.getLevel() >= skill.getGetLevel())
 			{
 				if (skill.getSkillLevel() > SkillData.getInstance().getMaxLevel(skill.getSkillId()))
@@ -1483,6 +1488,11 @@ public class SkillTreeData implements IXmlReader
 					continue;
 				}
 				
+				if (player.hasReplacedSkill(skill.getSkillId()))
+				{
+					continue;
+				}
+				
 				if (minLevelForNewSkill <= skill.getGetLevel())
 				{
 					final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
index 996c5ece3f..76443bc9c3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -873,6 +873,7 @@ public class Player extends Playable
 	
 	/** Map containing all custom skills of this player. */
 	private Map<Integer, Skill> _customSkills = null;
+	public final Set<Integer> _replacedSkills = ConcurrentHashMap.newKeySet(1);
 	
 	private volatile int _actionMask;
 	
@@ -13434,6 +13435,21 @@ public class Player extends Playable
 		}
 	}
 	
+	public void addReplacedSkill(int skillId)
+	{
+		_replacedSkills.add(skillId);
+	}
+	
+	public void removeReplacedSkill(int skillId)
+	{
+		_replacedSkills.remove(skillId);
+	}
+	
+	public boolean hasReplacedSkill(int skillId)
+	{
+		return _replacedSkills.contains(skillId);
+	}
+	
 	/**
 	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 1d1695c2ef..863a5fa245 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -58,6 +58,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 			
 			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()))
@@ -90,6 +91,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		
 		final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
 		player.addSkill(addedSkill, false);
+		player.removeReplacedSkill(_existingSkill.getSkillId());
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
 			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/documentation.txt
index 5e3c43ea09..8ef05444ef 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/stats/skills/documentation.txt
@@ -275,6 +275,7 @@ ReflectMagic: Deflects magical damage back to the attacker.
 ReflectSkill: Deflects physical/magical debuffs back to the attacker.
 RefuelAirship: Increases Airship's fuel.
 Relax: Sits down and increases HP regeneration until full.
+ReplaceSkillBySkill: While active replaces a skill with an alternative skill. (l2jmobius)
 ResetInstanceEntry: Resets instance re-entry time. (l2jmobius)
 ResistAbnormalByCategory: Buff/debuff resist stat.
 ResistDDMagic: Magic resist stat (magic attack 50% effective or 1 damage)
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
index 2a1d6b29c9..f78184a0b2 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
@@ -709,6 +709,11 @@ public class SkillTreeData implements IXmlReader
 				continue;
 			}
 			
+			if (player.hasReplacedSkill(skill.getSkillId()))
+			{
+				continue;
+			}
+			
 			if (player.getLevel() >= skill.getGetLevel())
 			{
 				if (skill.getSkillLevel() > SkillData.getInstance().getMaxLevel(skill.getSkillId()))
@@ -1483,6 +1488,11 @@ public class SkillTreeData implements IXmlReader
 					continue;
 				}
 				
+				if (player.hasReplacedSkill(skill.getSkillId()))
+				{
+					continue;
+				}
+				
 				if (minLevelForNewSkill <= skill.getGetLevel())
 				{
 					final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
index 5fe521395e..01d87ca205 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -879,6 +879,7 @@ public class Player extends Playable
 	
 	/** Map containing all custom skills of this player. */
 	private Map<Integer, Skill> _customSkills = null;
+	public final Set<Integer> _replacedSkills = ConcurrentHashMap.newKeySet(1);
 	
 	private volatile int _actionMask;
 	
@@ -13614,6 +13615,21 @@ public class Player extends Playable
 		}
 	}
 	
+	public void addReplacedSkill(int skillId)
+	{
+		_replacedSkills.add(skillId);
+	}
+	
+	public void removeReplacedSkill(int skillId)
+	{
+		_replacedSkills.remove(skillId);
+	}
+	
+	public boolean hasReplacedSkill(int skillId)
+	{
+		return _replacedSkills.contains(skillId);
+	}
+	
 	/**
 	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
 	 */
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
index 1d1695c2ef..863a5fa245 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java
@@ -58,6 +58,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 			
 			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()))
@@ -90,6 +91,7 @@ public class ReplaceSkillBySkill extends AbstractEffect
 		
 		final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
 		player.addSkill(addedSkill, false);
+		player.removeReplacedSkill(_existingSkill.getSkillId());
 		for (Shortcut shortcut : player.getAllShortCuts())
 		{
 			if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/documentation.txt
index b5a3e7d1a7..ebd42e1bc4 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/documentation.txt
@@ -278,6 +278,7 @@ ReflectMagic: Deflects magical damage back to the attacker.
 ReflectSkill: Deflects physical/magical debuffs back to the attacker.
 RefuelAirship: Increases Airship's fuel.
 Relax: Sits down and increases HP regeneration until full.
+ReplaceSkillBySkill: While active replaces a skill with an alternative skill. (l2jmobius)
 ResetInstanceEntry: Resets instance re-entry time. (l2jmobius)
 ResistAbnormalByCategory: Buff/debuff resist stat.
 ResistDDMagic: Magic resist stat (magic attack 50% effective or 1 damage)
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
index 2a1d6b29c9..f78184a0b2 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
@@ -709,6 +709,11 @@ public class SkillTreeData implements IXmlReader
 				continue;
 			}
 			
+			if (player.hasReplacedSkill(skill.getSkillId()))
+			{
+				continue;
+			}
+			
 			if (player.getLevel() >= skill.getGetLevel())
 			{
 				if (skill.getSkillLevel() > SkillData.getInstance().getMaxLevel(skill.getSkillId()))
@@ -1483,6 +1488,11 @@ public class SkillTreeData implements IXmlReader
 					continue;
 				}
 				
+				if (player.hasReplacedSkill(skill.getSkillId()))
+				{
+					continue;
+				}
+				
 				if (minLevelForNewSkill <= skill.getGetLevel())
 				{
 					final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
index 4d0d03a3a1..4fd7e2d94e 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -884,6 +884,7 @@ public class Player extends Playable
 	
 	/** Map containing all custom skills of this player. */
 	private Map<Integer, Skill> _customSkills = null;
+	public final Set<Integer> _replacedSkills = ConcurrentHashMap.newKeySet(1);
 	
 	private volatile int _actionMask;
 	
@@ -13695,6 +13696,21 @@ public class Player extends Playable
 		}
 	}
 	
+	public void addReplacedSkill(int skillId)
+	{
+		_replacedSkills.add(skillId);
+	}
+	
+	public void removeReplacedSkill(int skillId)
+	{
+		_replacedSkills.remove(skillId);
+	}
+	
+	public boolean hasReplacedSkill(int skillId)
+	{
+		return _replacedSkills.contains(skillId);
+	}
+	
 	/**
 	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
 	 */