lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with L2jServer HighFive Oct 10th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-10-10 13:28:13 +00:00
parent 2a827d8120
commit 2dd6094e0f
39 changed files with 601 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -1437,22 +1437,13 @@ public final class SkillTreesData implements IXmlReader
*/
public boolean isGMSkill(int skillId, int skillLevel)
{
final Map<Integer, L2SkillLearn> gmSkills = new HashMap<>();
gmSkills.putAll(_gameMasterSkillTree);
gmSkills.putAll(_gameMasterAuraSkillTree);
if (gmSkills.containsKey(SkillData.getSkillHashCode(skillId, skillLevel)))
if (skillLevel <= 0)
{
return true;
return _gameMasterSkillTree.values().stream().filter(s -> s.getSkillId() == skillId).findAny().isPresent() //
|| _gameMasterAuraSkillTree.values().stream().filter(s -> s.getSkillId() == skillId).findAny().isPresent();
}
for (L2SkillLearn skill : gmSkills.values())
{
if ((skill.getSkillId() == skillId) && (skillLevel == -1))
{
return true;
}
}
return false;
final int hashCode = SkillData.getSkillHashCode(skillId, skillLevel);
return _gameMasterSkillTree.containsKey(hashCode) || _gameMasterAuraSkillTree.containsKey(hashCode);
}
/**