From 068aaddc0e480c5bbaeb283f990eedb762426bd4 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 10 May 2019 13:50:32 +0000
Subject: [PATCH] Check pre-existing mastery skill after prohibition checks.

---
 .../pledgeV2/RequestExPledgeSkillActivate.java     | 14 +++++++-------
 .../pledgeV2/RequestExPledgeSkillActivate.java     | 14 +++++++-------
 .../pledgeV2/RequestExPledgeSkillActivate.java     | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
index 95f255746e..da1bf947c2 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
@@ -56,13 +56,6 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
 			return;
 		}
 		
-		// Check if already enabled.
-		if (clan.getMasterySkillRemainingTime(_skillId) > 0)
-		{
-			clan.removeMasterySkill(_skillId);
-			return;
-		}
-		
 		// Check if it can be learned.
 		int previous = 0;
 		int cost = 0;
@@ -110,6 +103,13 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
 			return;
 		}
 		
+		// Check if already enabled.
+		if (clan.getMasterySkillRemainingTime(_skillId) > 0)
+		{
+			clan.removeMasterySkill(_skillId);
+			return;
+		}
+		
 		// Learn.
 		clan.takeReputationScore(cost, true);
 		clan.addMasterySkill(_skillId);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
index 95f255746e..da1bf947c2 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
@@ -56,13 +56,6 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
 			return;
 		}
 		
-		// Check if already enabled.
-		if (clan.getMasterySkillRemainingTime(_skillId) > 0)
-		{
-			clan.removeMasterySkill(_skillId);
-			return;
-		}
-		
 		// Check if it can be learned.
 		int previous = 0;
 		int cost = 0;
@@ -110,6 +103,13 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
 			return;
 		}
 		
+		// Check if already enabled.
+		if (clan.getMasterySkillRemainingTime(_skillId) > 0)
+		{
+			clan.removeMasterySkill(_skillId);
+			return;
+		}
+		
 		// Learn.
 		clan.takeReputationScore(cost, true);
 		clan.addMasterySkill(_skillId);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
index 95f255746e..da1bf947c2 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeSkillActivate.java
@@ -56,13 +56,6 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
 			return;
 		}
 		
-		// Check if already enabled.
-		if (clan.getMasterySkillRemainingTime(_skillId) > 0)
-		{
-			clan.removeMasterySkill(_skillId);
-			return;
-		}
-		
 		// Check if it can be learned.
 		int previous = 0;
 		int cost = 0;
@@ -110,6 +103,13 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
 			return;
 		}
 		
+		// Check if already enabled.
+		if (clan.getMasterySkillRemainingTime(_skillId) > 0)
+		{
+			clan.removeMasterySkill(_skillId);
+			return;
+		}
+		
 		// Learn.
 		clan.takeReputationScore(cost, true);
 		clan.addMasterySkill(_skillId);