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

Sync with L2JServer Jan 12th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-13 09:50:20 +00:00
parent a868d961a3
commit 0a44ad683c
1158 changed files with 59729 additions and 58627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
trunk/java/com/l2jserver/gameserver/datatables/SkillTreesData.java
View File

@@ -657,12 +657,12 @@ public final class SkillTreesData implements DocumentParser
for (L2SkillLearn skill : skills.values())
{
if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && (!Config.AUTO_LEARN_DIVINE_INSPIRATION && includeAutoGet) && !player.isGM()))
if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && (!Config.AUTO_LEARN_DIVINE_INSPIRATION && includeAutoGet) && !player.isGM()) || (!includeAutoGet && skill.isAutoGet()) || (!includeByFs && skill.isLearnedByFS()))
{
continue;
}
if (((includeAutoGet && skill.isAutoGet()) || skill.isLearnedByNpc() || (includeByFs && skill.isLearnedByFS())) && (player.getLevel() >= skill.getGetLevel()))
if (player.getLevel() >= skill.getGetLevel())
{
final Skill oldSkill = holder.getKnownSkill(skill.getSkillId());
if (oldSkill != null)
@@ -1300,7 +1300,7 @@ public final class SkillTreesData implements DocumentParser
{
for (L2SkillLearn s : skillTree.values())
{
if (s.isLearnedByNpc() && (player.getLevel() < s.getGetLevel()))
if (player.getLevel() < s.getGetLevel())
{
if ((minLevel == 0) || (minLevel > s.getGetLevel()))
{
@@ -1326,7 +1326,11 @@ public final class SkillTreesData implements DocumentParser
{
for (L2SkillLearn skill : completeClassSkillTree.values())
{
if (((includeAutoGet && skill.isAutoGet()) || skill.isLearnedByNpc() || (includeByFs && skill.isLearnedByFS())) && (minLevelForNewSkill == skill.getGetLevel()))
if ((!includeAutoGet && skill.isAutoGet()) || (!includeByFs && skill.isLearnedByFS()))
{
continue;
}
if (minLevelForNewSkill == skill.getGetLevel())
{
final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
if (oldSkill != null)