Check pre-existing mastery skill after prohibition checks.
This commit is contained in:
@@ -56,13 +56,6 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if already enabled.
|
|
||||||
if (clan.getMasterySkillRemainingTime(_skillId) > 0)
|
|
||||||
{
|
|
||||||
clan.removeMasterySkill(_skillId);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if it can be learned.
|
// Check if it can be learned.
|
||||||
int previous = 0;
|
int previous = 0;
|
||||||
int cost = 0;
|
int cost = 0;
|
||||||
@@ -110,6 +103,13 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if already enabled.
|
||||||
|
if (clan.getMasterySkillRemainingTime(_skillId) > 0)
|
||||||
|
{
|
||||||
|
clan.removeMasterySkill(_skillId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Learn.
|
// Learn.
|
||||||
clan.takeReputationScore(cost, true);
|
clan.takeReputationScore(cost, true);
|
||||||
clan.addMasterySkill(_skillId);
|
clan.addMasterySkill(_skillId);
|
||||||
|
@@ -56,13 +56,6 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if already enabled.
|
|
||||||
if (clan.getMasterySkillRemainingTime(_skillId) > 0)
|
|
||||||
{
|
|
||||||
clan.removeMasterySkill(_skillId);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if it can be learned.
|
// Check if it can be learned.
|
||||||
int previous = 0;
|
int previous = 0;
|
||||||
int cost = 0;
|
int cost = 0;
|
||||||
@@ -110,6 +103,13 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if already enabled.
|
||||||
|
if (clan.getMasterySkillRemainingTime(_skillId) > 0)
|
||||||
|
{
|
||||||
|
clan.removeMasterySkill(_skillId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Learn.
|
// Learn.
|
||||||
clan.takeReputationScore(cost, true);
|
clan.takeReputationScore(cost, true);
|
||||||
clan.addMasterySkill(_skillId);
|
clan.addMasterySkill(_skillId);
|
||||||
|
@@ -56,13 +56,6 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if already enabled.
|
|
||||||
if (clan.getMasterySkillRemainingTime(_skillId) > 0)
|
|
||||||
{
|
|
||||||
clan.removeMasterySkill(_skillId);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if it can be learned.
|
// Check if it can be learned.
|
||||||
int previous = 0;
|
int previous = 0;
|
||||||
int cost = 0;
|
int cost = 0;
|
||||||
@@ -110,6 +103,13 @@ public class RequestExPledgeSkillActivate implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if already enabled.
|
||||||
|
if (clan.getMasterySkillRemainingTime(_skillId) > 0)
|
||||||
|
{
|
||||||
|
clan.removeMasterySkill(_skillId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Learn.
|
// Learn.
|
||||||
clan.takeReputationScore(cost, true);
|
clan.takeReputationScore(cost, true);
|
||||||
clan.addMasterySkill(_skillId);
|
clan.addMasterySkill(_skillId);
|
||||||
|
Reference in New Issue
Block a user