Fixed restoration of dualclass skills.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java

@@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
 					}
 				}
 			}
+			player.restoreDualSkills();
 			player.store(false);
 			player.broadcastUserInfo();
 			player.sendSkillList();

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getCloakId(player), 1);
@@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getPowerItemId(player), 1);

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -7393,18 +7393,19 @@ public class PlayerInstance extends Playable
 			storeSkill(newSkill, oldSkill, -1);
 			if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
 			{
-				final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
+				// Old system compatibility.
-				for (Skill dualSkill : dualClassSkills)
+				if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 				{
-					if (dualSkill.getId() == newSkill.getId())
+					getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+					for (int skillId : DUAL_CLASS_SKILLS)
 					{
-						dualClassSkills.remove(dualSkill);
+						removeSkill(skillId);
-						break;
 					}
 				}
-				dualClassSkills.add(newSkill);
-				getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
 				
+				final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+				knownSkills.put(newSkill.getId(), newSkill.getLevel());
+				getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
 			}
 		}
 		return oldSkill;
@@ -7599,11 +7600,35 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Learn known dualclass skills.
+		restoreDualSkills();
+	}
+	
+	/**
+	* Learn known dualclass skills.
+	*/
+	public void restoreDualSkills()
+	{
 		if (isDualClassActive() || !isSubClassActive())
 		{
-			final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
+			// Old system compatibility.
-			for (Skill skill : dualClassSkills)
+			if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 			{
+				getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+				for (int skillId : DUAL_CLASS_SKILLS)
+				{
+					removeSkill(skillId);
+				}
+			}
+			
+			final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+			if (knownSkills.isEmpty())
+			{
+				return;
+			}
+			
+			for (Entry<Integer, Integer> entry : knownSkills.entrySet())
+			{
+				final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
 				removeSkill(skill);
 				addSkill(skill, true);
 			}

L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java

@@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
 					}
 				}
 			}
+			player.restoreDualSkills();
 			player.store(false);
 			player.broadcastUserInfo();
 			player.sendSkillList();

L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getCloakId(player), 1);
@@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getPowerItemId(player), 1);

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -7396,18 +7396,19 @@ public class PlayerInstance extends Playable
 			storeSkill(newSkill, oldSkill, -1);
 			if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
 			{
-				final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
+				// Old system compatibility.
-				for (Skill dualSkill : dualClassSkills)
+				if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 				{
-					if (dualSkill.getId() == newSkill.getId())
+					getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+					for (int skillId : DUAL_CLASS_SKILLS)
 					{
-						dualClassSkills.remove(dualSkill);
+						removeSkill(skillId);
-						break;
 					}
 				}
-				dualClassSkills.add(newSkill);
-				getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
 				
+				final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+				knownSkills.put(newSkill.getId(), newSkill.getLevel());
+				getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
 			}
 		}
 		return oldSkill;
@@ -7602,11 +7603,35 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Learn known dualclass skills.
+		restoreDualSkills();
+	}
+	
+	/**
+	* Learn known dualclass skills.
+	*/
+	public void restoreDualSkills()
+	{
 		if (isDualClassActive() || !isSubClassActive())
 		{
-			final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
+			// Old system compatibility.
-			for (Skill skill : dualClassSkills)
+			if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 			{
+				getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+				for (int skillId : DUAL_CLASS_SKILLS)
+				{
+					removeSkill(skillId);
+				}
+			}
+			
+			final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+			if (knownSkills.isEmpty())
+			{
+				return;
+			}
+			
+			for (Entry<Integer, Integer> entry : knownSkills.entrySet())
+			{
+				final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
 				removeSkill(skill);
 				addSkill(skill, true);
 			}

L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java

@@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
 					}
 				}
 			}
+			player.restoreDualSkills();
 			player.store(false);
 			player.broadcastUserInfo();
 			player.sendSkillList();

L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getCloakId(player), 1);
@@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getPowerItemId(player), 1);

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -7398,18 +7398,19 @@ public class PlayerInstance extends Playable
 			storeSkill(newSkill, oldSkill, -1);
 			if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
 			{
-				final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
+				// Old system compatibility.
-				for (Skill dualSkill : dualClassSkills)
+				if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 				{
-					if (dualSkill.getId() == newSkill.getId())
+					getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+					for (int skillId : DUAL_CLASS_SKILLS)
 					{
-						dualClassSkills.remove(dualSkill);
+						removeSkill(skillId);
-						break;
 					}
 				}
-				dualClassSkills.add(newSkill);
-				getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
 				
+				final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+				knownSkills.put(newSkill.getId(), newSkill.getLevel());
+				getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
 			}
 		}
 		return oldSkill;
@@ -7604,11 +7605,35 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Learn known dualclass skills.
+		restoreDualSkills();
+	}
+	
+	/**
+	* Learn known dualclass skills.
+	*/
+	public void restoreDualSkills()
+	{
 		if (isDualClassActive() || !isSubClassActive())
 		{
-			final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
+			// Old system compatibility.
-			for (Skill skill : dualClassSkills)
+			if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 			{
+				getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+				for (int skillId : DUAL_CLASS_SKILLS)
+				{
+					removeSkill(skillId);
+				}
+			}
+			
+			final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+			if (knownSkills.isEmpty())
+			{
+				return;
+			}
+			
+			for (Entry<Integer, Integer> entry : knownSkills.entrySet())
+			{
+				final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
 				removeSkill(skill);
 				addSkill(skill, true);
 			}

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java

@@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
 					}
 				}
 			}
+			player.restoreDualSkills();
 			player.store(false);
 			player.broadcastUserInfo();
 			player.sendSkillList();

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getCloakId(player), 1);
@@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getPowerItemId(player), 1);

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -7393,18 +7393,19 @@ public class PlayerInstance extends Playable
 			storeSkill(newSkill, oldSkill, -1);
 			if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
 			{
-				final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
+				// Old system compatibility.
-				for (Skill dualSkill : dualClassSkills)
+				if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 				{
-					if (dualSkill.getId() == newSkill.getId())
+					getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+					for (int skillId : DUAL_CLASS_SKILLS)
 					{
-						dualClassSkills.remove(dualSkill);
+						removeSkill(skillId);
-						break;
 					}
 				}
-				dualClassSkills.add(newSkill);
-				getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
 				
+				final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+				knownSkills.put(newSkill.getId(), newSkill.getLevel());
+				getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
 			}
 		}
 		return oldSkill;
@@ -7599,11 +7600,35 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Learn known dualclass skills.
+		restoreDualSkills();
+	}
+	
+	/**
+	* Learn known dualclass skills.
+	*/
+	public void restoreDualSkills()
+	{
 		if (isDualClassActive() || !isSubClassActive())
 		{
-			final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
+			// Old system compatibility.
-			for (Skill skill : dualClassSkills)
+			if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 			{
+				getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+				for (int skillId : DUAL_CLASS_SKILLS)
+				{
+					removeSkill(skillId);
+				}
+			}
+			
+			final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+			if (knownSkills.isEmpty())
+			{
+				return;
+			}
+			
+			for (Entry<Integer, Integer> entry : knownSkills.entrySet())
+			{
+				final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
 				removeSkill(skill);
 				addSkill(skill, true);
 			}

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java

@@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
 					}
 				}
 			}
+			player.restoreDualSkills();
 			player.store(false);
 			player.broadcastUserInfo();
 			player.sendSkillList();

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getCloakId(player), 1);
@@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getPowerItemId(player), 1);

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -7375,18 +7375,19 @@ public class PlayerInstance extends Playable
 			storeSkill(newSkill, oldSkill, -1);
 			if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
 			{
-				final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
+				// Old system compatibility.
-				for (Skill dualSkill : dualClassSkills)
+				if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 				{
-					if (dualSkill.getId() == newSkill.getId())
+					getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+					for (int skillId : DUAL_CLASS_SKILLS)
 					{
-						dualClassSkills.remove(dualSkill);
+						removeSkill(skillId);
-						break;
 					}
 				}
-				dualClassSkills.add(newSkill);
-				getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
 				
+				final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+				knownSkills.put(newSkill.getId(), newSkill.getLevel());
+				getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
 			}
 		}
 		return oldSkill;
@@ -7581,11 +7582,35 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Learn known dualclass skills.
+		restoreDualSkills();
+	}
+	
+	/**
+	* Learn known dualclass skills.
+	*/
+	public void restoreDualSkills()
+	{
 		if (isDualClassActive() || !isSubClassActive())
 		{
-			final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
+			// Old system compatibility.
-			for (Skill skill : dualClassSkills)
+			if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 			{
+				getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+				for (int skillId : DUAL_CLASS_SKILLS)
+				{
+					removeSkill(skillId);
+				}
+			}
+			
+			final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+			if (knownSkills.isEmpty())
+			{
+				return;
+			}
+			
+			for (Entry<Integer, Integer> entry : knownSkills.entrySet())
+			{
+				final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
 				removeSkill(skill);
 				addSkill(skill, true);
 			}

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java

@@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
 					}
 				}
 			}
+			player.restoreDualSkills();
 			player.store(false);
 			player.broadcastUserInfo();
 			player.sendSkillList();

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getCloakId(player), 1);
@@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getPowerItemId(player), 1);

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -7375,18 +7375,19 @@ public class PlayerInstance extends Playable
 			storeSkill(newSkill, oldSkill, -1);
 			if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
 			{
-				final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
+				// Old system compatibility.
-				for (Skill dualSkill : dualClassSkills)
+				if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 				{
-					if (dualSkill.getId() == newSkill.getId())
+					getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+					for (int skillId : DUAL_CLASS_SKILLS)
 					{
-						dualClassSkills.remove(dualSkill);
+						removeSkill(skillId);
-						break;
 					}
 				}
-				dualClassSkills.add(newSkill);
-				getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
 				
+				final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+				knownSkills.put(newSkill.getId(), newSkill.getLevel());
+				getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
 			}
 		}
 		return oldSkill;
@@ -7581,11 +7582,35 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Learn known dualclass skills.
+		restoreDualSkills();
+	}
+	
+	/**
+	* Learn known dualclass skills.
+	*/
+	public void restoreDualSkills()
+	{
 		if (isDualClassActive() || !isSubClassActive())
 		{
-			final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
+			// Old system compatibility.
-			for (Skill skill : dualClassSkills)
+			if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 			{
+				getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+				for (int skillId : DUAL_CLASS_SKILLS)
+				{
+					removeSkill(skillId);
+				}
+			}
+			
+			final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+			if (knownSkills.isEmpty())
+			{
+				return;
+			}
+			
+			for (Entry<Integer, Integer> entry : knownSkills.entrySet())
+			{
+				final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
 				removeSkill(skill);
 				addSkill(skill, true);
 			}

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java

@@ -171,6 +171,7 @@ public class Hardin extends AbstractNpcAI
 					}
 				}
 			}
+			player.restoreDualSkills();
 			player.store(false);
 			player.broadcastUserInfo();
 			player.sendSkillList();

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -609,6 +609,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getCloakId(player), 1);
@@ -644,6 +645,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_HAS_BEEN_ADDED);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponAwakening(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getPowerItemId(player), 1);

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -7376,18 +7376,19 @@ public class PlayerInstance extends Playable
 			storeSkill(newSkill, oldSkill, -1);
 			if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
 			{
-				final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
+				// Old system compatibility.
-				for (Skill dualSkill : dualClassSkills)
+				if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 				{
-					if (dualSkill.getId() == newSkill.getId())
+					getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+					for (int skillId : DUAL_CLASS_SKILLS)
 					{
-						dualClassSkills.remove(dualSkill);
+						removeSkill(skillId);
-						break;
 					}
 				}
-				dualClassSkills.add(newSkill);
-				getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
 				
+				final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+				knownSkills.put(newSkill.getId(), newSkill.getLevel());
+				getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
 			}
 		}
 		return oldSkill;
@@ -7582,11 +7583,35 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Learn known dualclass skills.
+		restoreDualSkills();
+	}
+	
+	/**
+	* Learn known dualclass skills.
+	*/
+	public void restoreDualSkills()
+	{
 		if (isDualClassActive() || !isSubClassActive())
 		{
-			final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
+			// Old system compatibility.
-			for (Skill skill : dualClassSkills)
+			if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 			{
+				getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+				for (int skillId : DUAL_CLASS_SKILLS)
+				{
+					removeSkill(skillId);
+				}
+			}
+			
+			final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+			if (knownSkills.isEmpty())
+			{
+				return;
+			}
+			
+			for (Entry<Integer, Integer> entry : knownSkills.entrySet())
+			{
+				final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
 				removeSkill(skill);
 				addSkill(skill, true);
 			}

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java

@@ -217,6 +217,7 @@ public class Joachim extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "34513-07.html"));
 					SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					player.broadcastUserInfo();

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java

@@ -169,6 +169,7 @@ public class Hardin extends AbstractNpcAI
 					}
 				}
 			}
+			player.restoreDualSkills();
 			player.store(false);
 			player.broadcastUserInfo();
 			player.sendSkillList();

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -594,6 +594,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getCloakId(player), 1);
@@ -633,6 +634,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getPowerItemId(player), 1);

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -7390,18 +7390,19 @@ public class PlayerInstance extends Playable
 			storeSkill(newSkill, oldSkill, -1);
 			if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
 			{
-				final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
+				// Old system compatibility.
-				for (Skill dualSkill : dualClassSkills)
+				if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 				{
-					if (dualSkill.getId() == newSkill.getId())
+					getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+					for (int skillId : DUAL_CLASS_SKILLS)
 					{
-						dualClassSkills.remove(dualSkill);
+						removeSkill(skillId);
-						break;
 					}
 				}
-				dualClassSkills.add(newSkill);
-				getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
 				
+				final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+				knownSkills.put(newSkill.getId(), newSkill.getLevel());
+				getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
 			}
 		}
 		return oldSkill;
@@ -7596,11 +7597,35 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Learn known dualclass skills.
+		restoreDualSkills();
+	}
+	
+	/**
+	* Learn known dualclass skills.
+	*/
+	public void restoreDualSkills()
+	{
 		if (isDualClassActive() || !isSubClassActive())
 		{
-			final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
+			// Old system compatibility.
-			for (Skill skill : dualClassSkills)
+			if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 			{
+				getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+				for (int skillId : DUAL_CLASS_SKILLS)
+				{
+					removeSkill(skillId);
+				}
+			}
+			
+			final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+			if (knownSkills.isEmpty())
+			{
+				return;
+			}
+			
+			for (Entry<Integer, Integer> entry : knownSkills.entrySet())
+			{
+				final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
 				removeSkill(skill);
 				addSkill(skill, true);
 			}

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java

@@ -217,6 +217,7 @@ public class Joachim extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "34513-07.html"));
 					SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					player.broadcastUserInfo();

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java

@@ -169,6 +169,7 @@ public class Hardin extends AbstractNpcAI
 					}
 				}
 			}
+			player.restoreDualSkills();
 			player.store(false);
 			player.broadcastUserInfo();
 			player.sendSkillList();

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -594,6 +594,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getCloakId(player), 1);
@@ -633,6 +634,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getPowerItemId(player), 1);

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -7492,18 +7492,19 @@ public class PlayerInstance extends Playable
 			storeSkill(newSkill, oldSkill, -1);
 			if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
 			{
-				final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
+				// Old system compatibility.
-				for (Skill dualSkill : dualClassSkills)
+				if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 				{
-					if (dualSkill.getId() == newSkill.getId())
+					getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+					for (int skillId : DUAL_CLASS_SKILLS)
 					{
-						dualClassSkills.remove(dualSkill);
+						removeSkill(skillId);
-						break;
 					}
 				}
-				dualClassSkills.add(newSkill);
-				getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
 				
+				final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+				knownSkills.put(newSkill.getId(), newSkill.getLevel());
+				getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
 			}
 		}
 		return oldSkill;
@@ -7698,11 +7699,35 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Learn known dualclass skills.
+		restoreDualSkills();
+	}
+	
+	/**
+	* Learn known dualclass skills.
+	*/
+	public void restoreDualSkills()
+	{
 		if (isDualClassActive() || !isSubClassActive())
 		{
-			final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
+			// Old system compatibility.
-			for (Skill skill : dualClassSkills)
+			if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 			{
+				getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+				for (int skillId : DUAL_CLASS_SKILLS)
+				{
+					removeSkill(skillId);
+				}
+			}
+			
+			final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+			if (knownSkills.isEmpty())
+			{
+				return;
+			}
+			
+			for (Entry<Integer, Integer> entry : knownSkills.entrySet())
+			{
+				final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
 				removeSkill(skill);
 				addSkill(skill, true);
 			}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Aden/Joachim/Joachim.java

@@ -217,6 +217,7 @@ public class Joachim extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "34513-07.html"));
 					SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					player.broadcastUserInfo();

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java

@@ -169,6 +169,7 @@ public class Hardin extends AbstractNpcAI
 					}
 				}
 			}
+			player.restoreDualSkills();
 			player.store(false);
 			player.broadcastUserInfo();
 			player.sendSkillList();

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java

@@ -594,6 +594,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 					player.sendPacket(getNpcHtmlMessage(player, npc, "reawakenSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getCloakId(player), 1);
@@ -633,6 +634,7 @@ public class Raina extends AbstractNpcAI
 					player.sendPacket(SystemMessageId.THE_NEW_SUBCLASS_S1_HAS_BEEN_ADDED_CONGRATS);
 					player.sendPacket(getNpcHtmlMessage(player, npc, "addSuccess.html"));
 					SkillTreeData.getInstance().cleanSkillUponChangeClass(player);
+					player.restoreDualSkills();
 					player.sendPacket(new AcquireSkillList(player));
 					player.sendSkillList();
 					giveItems(player, getPowerItemId(player), 1);

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -7518,18 +7518,19 @@ public class PlayerInstance extends Playable
 			storeSkill(newSkill, oldSkill, -1);
 			if (CommonUtil.contains(DUAL_CLASS_SKILLS, newSkill.getId()))
 			{
-				final List<Skill> dualClassSkills = getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, new ArrayList<>());
+				// Old system compatibility.
-				for (Skill dualSkill : dualClassSkills)
+				if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 				{
-					if (dualSkill.getId() == newSkill.getId())
+					getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+					for (int skillId : DUAL_CLASS_SKILLS)
 					{
-						dualClassSkills.remove(dualSkill);
+						removeSkill(skillId);
-						break;
 					}
 				}
-				dualClassSkills.add(newSkill);
-				getVariables().set(KNOWN_DUAL_SKILLS_VAR, dualClassSkills);
 				
+				final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+				knownSkills.put(newSkill.getId(), newSkill.getLevel());
+				getVariables().setIntegerMap(KNOWN_DUAL_SKILLS_VAR, knownSkills);
 			}
 		}
 		return oldSkill;
@@ -7724,11 +7725,35 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Learn known dualclass skills.
+		restoreDualSkills();
+	}
+	
+	/**
+	* Learn known dualclass skills.
+	*/
+	public void restoreDualSkills()
+	{
 		if (isDualClassActive() || !isSubClassActive())
 		{
-			final List<Skill> dualClassSkills = new ArrayList<>(getVariables().getList(KNOWN_DUAL_SKILLS_VAR, Skill.class, Collections.emptyList()));
+			// Old system compatibility.
-			for (Skill skill : dualClassSkills)
+			if (getVariables().getString(KNOWN_DUAL_SKILLS_VAR, "").contains("("))
 			{
+				getVariables().set(KNOWN_DUAL_SKILLS_VAR, "");
+				for (int skillId : DUAL_CLASS_SKILLS)
+				{
+					removeSkill(skillId);
+				}
+			}
+			
+			final Map<Integer, Integer> knownSkills = getVariables().getIntegerMap(KNOWN_DUAL_SKILLS_VAR);
+			if (knownSkills.isEmpty())
+			{
+				return;
+			}
+			
+			for (Entry<Integer, Integer> entry : knownSkills.entrySet())
+			{
+				final Skill skill = SkillData.getInstance().getSkill(entry.getKey(), entry.getValue());
 				removeSkill(skill);
 				addSkill(skill, true);
 			}