From e01542c509b2ae99d7c8dd9486802c6a16c31fe0 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 26 Jul 2017 20:42:28 +0000
Subject: [PATCH] SkillTreesData checks if skill exists.

---
 .../l2jmobius/gameserver/data/xml/impl/SkillTreesData.java    | 4 ++++
 .../dist/game/data/skillTrees/transferSkillTree.xml           | 2 ++
 .../l2jmobius/gameserver/data/xml/impl/SkillTreesData.java    | 4 ++++
 .../dist/game/data/skillTrees/transferSkillTree.xml           | 2 ++
 .../l2jmobius/gameserver/data/xml/impl/SkillTreesData.java    | 4 ++++
 5 files changed, 16 insertions(+)

diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 8210d6e65c..72e2bfebb7 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -234,6 +234,10 @@ public final class SkillTreesData implements IGameXmlReader
 								}
 								
 								final L2SkillLearn skillLearn = new L2SkillLearn(learnSkillSet);
+								
+								// test if skill exists
+								SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
+								
 								for (Node b = c.getFirstChild(); b != null; b = b.getNextSibling())
 								{
 									attrs = b.getAttributes();
diff --git a/L2J_Mobius_Helios/dist/game/data/skillTrees/transferSkillTree.xml b/L2J_Mobius_Helios/dist/game/data/skillTrees/transferSkillTree.xml
index 17f4d983cc..98a286e939 100644
--- a/L2J_Mobius_Helios/dist/game/data/skillTrees/transferSkillTree.xml
+++ b/L2J_Mobius_Helios/dist/game/data/skillTrees/transferSkillTree.xml
@@ -6,9 +6,11 @@
 		<skill skillName="Blessed Blood" skillId="1531" skillLvl="7" getLevel="76">
 			<item id="15307" count="1" />
 		</skill>
+		<!--
 		<skill skillName="Blessed Shield" skillId="1243" skillLvl="7" getLevel="76">
 			<item id="15307" count="1" />
 		</skill>
+		-->
 		<skill skillName="Return" skillId="1050" skillLvl="2" getLevel="76">
 			<item id="15307" count="1" />
 		</skill>
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 8210d6e65c..72e2bfebb7 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -234,6 +234,10 @@ public final class SkillTreesData implements IGameXmlReader
 								}
 								
 								final L2SkillLearn skillLearn = new L2SkillLearn(learnSkillSet);
+								
+								// test if skill exists
+								SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
+								
 								for (Node b = c.getFirstChild(); b != null; b = b.getNextSibling())
 								{
 									attrs = b.getAttributes();
diff --git a/L2J_Mobius_Underground/dist/game/data/skillTrees/transferSkillTree.xml b/L2J_Mobius_Underground/dist/game/data/skillTrees/transferSkillTree.xml
index 17f4d983cc..98a286e939 100644
--- a/L2J_Mobius_Underground/dist/game/data/skillTrees/transferSkillTree.xml
+++ b/L2J_Mobius_Underground/dist/game/data/skillTrees/transferSkillTree.xml
@@ -6,9 +6,11 @@
 		<skill skillName="Blessed Blood" skillId="1531" skillLvl="7" getLevel="76">
 			<item id="15307" count="1" />
 		</skill>
+		<!--
 		<skill skillName="Blessed Shield" skillId="1243" skillLvl="7" getLevel="76">
 			<item id="15307" count="1" />
 		</skill>
+		-->
 		<skill skillName="Return" skillId="1050" skillLvl="2" getLevel="76">
 			<item id="15307" count="1" />
 		</skill>
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 8210d6e65c..72e2bfebb7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -234,6 +234,10 @@ public final class SkillTreesData implements IGameXmlReader
 								}
 								
 								final L2SkillLearn skillLearn = new L2SkillLearn(learnSkillSet);
+								
+								// test if skill exists
+								SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
+								
 								for (Node b = c.getFirstChild(); b != null; b = b.getNextSibling())
 								{
 									attrs = b.getAttributes();