From b287491b31829261e90ac925c333e7839793c745 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 26 Sep 2021 20:21:27 +0000
Subject: [PATCH] Addition for skills obtained from castle. Contributed by
 nasseka.

---
 .../java/org/l2jmobius/gameserver/model/siege/Castle.java      | 3 ++-
 .../java/org/l2jmobius/gameserver/model/siege/Castle.java      | 3 ++-
 .../java/org/l2jmobius/gameserver/model/siege/Castle.java      | 3 ++-
 .../java/org/l2jmobius/gameserver/model/siege/Castle.java      | 3 ++-
 .../java/org/l2jmobius/gameserver/model/siege/Castle.java      | 3 ++-
 .../java/org/l2jmobius/gameserver/model/siege/Castle.java      | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41cd50499c..62a5994ee6 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1161,9 +1161,10 @@ public class Castle extends AbstractResidence
 	public void giveResidentialSkills(PlayerInstance player)
 	{
 		super.giveResidentialSkills(player);
-		if ((player.getPledgeClass() == -1) || (player.getPledgeClass() == 100)) // Leader or Elite
+		if ((player.isClanLeader()) || (player.getPledgeType() == 100)) // Leader or Elite
 		{
 			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.KNIGHT_OF_DARKNESS.getSkill() : CommonSkill.KNIGHT_OF_SPLENDOR.getSkill());
+			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.PROTECTION_OF_DARKNESS.getSkill() : CommonSkill.PROTECTION_OF_LIGHT.getSkill());
 		}
 		else // Non Elite members
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41cd50499c..62a5994ee6 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1161,9 +1161,10 @@ public class Castle extends AbstractResidence
 	public void giveResidentialSkills(PlayerInstance player)
 	{
 		super.giveResidentialSkills(player);
-		if ((player.getPledgeClass() == -1) || (player.getPledgeClass() == 100)) // Leader or Elite
+		if ((player.isClanLeader()) || (player.getPledgeType() == 100)) // Leader or Elite
 		{
 			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.KNIGHT_OF_DARKNESS.getSkill() : CommonSkill.KNIGHT_OF_SPLENDOR.getSkill());
+			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.PROTECTION_OF_DARKNESS.getSkill() : CommonSkill.PROTECTION_OF_LIGHT.getSkill());
 		}
 		else // Non Elite members
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41cd50499c..62a5994ee6 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1161,9 +1161,10 @@ public class Castle extends AbstractResidence
 	public void giveResidentialSkills(PlayerInstance player)
 	{
 		super.giveResidentialSkills(player);
-		if ((player.getPledgeClass() == -1) || (player.getPledgeClass() == 100)) // Leader or Elite
+		if ((player.isClanLeader()) || (player.getPledgeType() == 100)) // Leader or Elite
 		{
 			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.KNIGHT_OF_DARKNESS.getSkill() : CommonSkill.KNIGHT_OF_SPLENDOR.getSkill());
+			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.PROTECTION_OF_DARKNESS.getSkill() : CommonSkill.PROTECTION_OF_LIGHT.getSkill());
 		}
 		else // Non Elite members
 		{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41cd50499c..62a5994ee6 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1161,9 +1161,10 @@ public class Castle extends AbstractResidence
 	public void giveResidentialSkills(PlayerInstance player)
 	{
 		super.giveResidentialSkills(player);
-		if ((player.getPledgeClass() == -1) || (player.getPledgeClass() == 100)) // Leader or Elite
+		if ((player.isClanLeader()) || (player.getPledgeType() == 100)) // Leader or Elite
 		{
 			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.KNIGHT_OF_DARKNESS.getSkill() : CommonSkill.KNIGHT_OF_SPLENDOR.getSkill());
+			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.PROTECTION_OF_DARKNESS.getSkill() : CommonSkill.PROTECTION_OF_LIGHT.getSkill());
 		}
 		else // Non Elite members
 		{
diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41cd50499c..62a5994ee6 100644
--- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1161,9 +1161,10 @@ public class Castle extends AbstractResidence
 	public void giveResidentialSkills(PlayerInstance player)
 	{
 		super.giveResidentialSkills(player);
-		if ((player.getPledgeClass() == -1) || (player.getPledgeClass() == 100)) // Leader or Elite
+		if ((player.isClanLeader()) || (player.getPledgeType() == 100)) // Leader or Elite
 		{
 			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.KNIGHT_OF_DARKNESS.getSkill() : CommonSkill.KNIGHT_OF_SPLENDOR.getSkill());
+			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.PROTECTION_OF_DARKNESS.getSkill() : CommonSkill.PROTECTION_OF_LIGHT.getSkill());
 		}
 		else // Non Elite members
 		{
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java
index 41cd50499c..62a5994ee6 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java
@@ -1161,9 +1161,10 @@ public class Castle extends AbstractResidence
 	public void giveResidentialSkills(PlayerInstance player)
 	{
 		super.giveResidentialSkills(player);
-		if ((player.getPledgeClass() == -1) || (player.getPledgeClass() == 100)) // Leader or Elite
+		if ((player.isClanLeader()) || (player.getPledgeType() == 100)) // Leader or Elite
 		{
 			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.KNIGHT_OF_DARKNESS.getSkill() : CommonSkill.KNIGHT_OF_SPLENDOR.getSkill());
+			player.addSkill(_castleSide == CastleSide.DARK ? CommonSkill.PROTECTION_OF_DARKNESS.getSkill() : CommonSkill.PROTECTION_OF_LIGHT.getSkill());
 		}
 		else // Non Elite members
 		{