Minor RequestAcquireSkill improvement and cleanup.
This commit is contained in:
@@ -640,15 +640,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -640,15 +640,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -640,15 +640,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -640,15 +640,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -590,15 +590,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -590,15 +590,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -590,15 +590,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -507,9 +507,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -592,15 +590,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -614,7 +609,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -515,9 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -621,15 +619,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -643,7 +638,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -515,9 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -621,15 +619,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -643,7 +638,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -515,9 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -621,15 +619,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -643,7 +638,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -515,9 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -621,15 +619,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -643,7 +638,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -474,9 +474,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -559,15 +557,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -581,7 +576,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -555,9 +555,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -640,15 +638,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -662,7 +657,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -489,9 +489,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -595,15 +593,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -617,7 +612,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -489,9 +489,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -595,15 +593,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -617,7 +612,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -489,9 +489,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -595,15 +593,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -617,7 +612,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -489,9 +489,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
*/
|
||||
private boolean checkPlayerSkill(Player player, Npc trainer, SkillLearn skillLearn)
|
||||
{
|
||||
if (skillLearn != null)
|
||||
{
|
||||
if ((skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
if ((skillLearn != null) && (skillLearn.getSkillId() == _id) && (skillLearn.getSkillLevel() == _level))
|
||||
{
|
||||
// Hack check.
|
||||
if (skillLearn.getGetLevel() > player.getLevel())
|
||||
@@ -595,15 +593,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
if (!skillLearn.getRemoveSkills().isEmpty())
|
||||
{
|
||||
skillLearn.getRemoveSkills().forEach(skillId ->
|
||||
{
|
||||
if (player.getSkillLevel(skillId) > 0)
|
||||
{
|
||||
final Skill skillToRemove = player.getKnownSkill(skillId);
|
||||
if (skillToRemove != null)
|
||||
{
|
||||
player.removeSkill(skillToRemove, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -617,7 +612,6 @@ public class RequestAcquireSkill implements IClientIncomingPacket
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user