Fixed probable giveResidentialSkills NPE.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2641,11 +2641,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2643,11 +2643,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -33,11 +33,14 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.events.AbstractScript;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -210,16 +213,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -366,16 +378,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2645,11 +2645,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -33,11 +33,14 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.events.AbstractScript;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -210,16 +213,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -366,16 +378,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -24,6 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -97,11 +99,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2653,11 +2653,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -33,11 +33,14 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.events.AbstractScript;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -210,16 +213,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -366,16 +378,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -24,6 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -97,11 +99,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2682,11 +2682,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -33,11 +33,14 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.events.AbstractScript;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -210,16 +213,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -366,16 +378,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -98,11 +100,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2682,11 +2682,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -33,11 +33,14 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.events.AbstractScript;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -210,16 +213,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -366,16 +378,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -98,11 +100,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2682,11 +2682,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -33,11 +33,14 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.events.AbstractScript;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -210,16 +213,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -366,16 +378,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -98,11 +100,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2618,11 +2618,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -33,11 +33,14 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.events.AbstractScript;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -210,16 +213,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -366,16 +378,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -98,11 +100,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2649,11 +2649,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -98,11 +100,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2666,11 +2666,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -98,11 +100,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2668,11 +2668,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -98,11 +100,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2668,11 +2668,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -98,11 +100,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2689,11 +2689,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java

@@ -42,9 +42,12 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.olympiad.OnOlympiadMatchResult;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -220,21 +223,31 @@ class OlympiadGame
 				player.stopAllEffectsExceptThoseThatLastThroughDeath();
 				
 				// Remove Clan Skills
-				if (player.getClan() != null)
+				final Clan clan = player.getClan();
+				if (clan != null)
 				{
-					for (Skill skill : player.getClan().getAllSkills())
+					for (Skill skill : clan.getAllSkills())
 					{
 						player.removeSkill(skill, false, true);
 					}
-					if (player.getClan().getCastleId() > 0)
+					if (clan.getCastleId() > 0)
 					{
-						CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
-					}
-					if (player.getClan().getFortId() > 0)
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
 						{
-						FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+							castle.removeResidentialSkills(player);
 						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.removeResidentialSkills(player);
+						}
+					}
+				}
+				
 				// Abort casting if player casting
 				if (player.isCastingNow())
 				{
@@ -471,22 +484,31 @@ class OlympiadGame
 				player.sendPacket(new ExOlympiadMode(0));
 				
 				// Add Clan Skills
-				if (player.getClan() != null)
+				final Clan clan = player.getClan();
+				if (clan != null)
 				{
-					for (Skill skill : player.getClan().getAllSkills())
+					for (Skill skill : clan.getAllSkills())
 					{
 						if (skill.getMinPledgeClass() <= player.getPledgeClass())
 						{
 							player.addSkill(skill, false);
 						}
 					}
-					if (player.getClan().getCastleId() > 0)
+					if (clan.getCastleId() > 0)
 					{
-						CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(player);
 						}
-					if (player.getClan().getFortId() > 0)
+					}
+					if (clan.getFortId() > 0)
 					{
-						FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(player);
+						}
 					}
 				}
 				

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.JoinPledge;
@@ -99,13 +101,21 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				sm.addString(player.getName());
 				clan.broadcastToOnlineMembers(sm);
 				
-				if (player.getClan().getCastleId() > 0)
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2600,11 +2600,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,7 +32,10 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.zone.type.OlympiadStadiumZone;
 import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -209,18 +212,28 @@ public abstract class AbstractOlympiadGame
 			player.stopAllEffectsExceptThoseThatLastThroughDeath();
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
-				}
-				if (player.getClan().getFortId() > 0)
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
 					{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+						castle.removeResidentialSkills(player);
 					}
 				}
+				if (clan.getFortId() > 0)
+				{
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
+				}
+			}
+			
 			// Abort casting if player casting
 			player.abortAttack();
 			player.abortCast();
@@ -360,16 +373,25 @@ public abstract class AbstractOlympiadGame
 			player.setOlympiadGameId(-1);
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.JoinPledge;
@@ -99,13 +101,21 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				sm.addString(player.getName());
 				clan.broadcastToOnlineMembers(sm);
 				
-				if (player.getClan().getCastleId() > 0)
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2610,11 +2610,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -24,6 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -97,11 +99,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2610,11 +2610,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -24,6 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -97,11 +99,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2608,11 +2608,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -24,6 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -97,11 +99,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2622,11 +2622,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -24,6 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -97,11 +99,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2622,11 +2622,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -24,6 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -97,11 +99,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2548,11 +2548,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -24,6 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -97,11 +99,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2607,11 +2607,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}
 		

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -32,9 +32,12 @@ import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 import org.l2jmobius.gameserver.model.instancezone.Instance;
 import org.l2jmobius.gameserver.model.item.instance.Item;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
@@ -207,16 +210,25 @@ public abstract class AbstractOlympiadGame
 			player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
 			
 			// Remove Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().removeSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.removeSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.removeResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.removeResidentialSkills(player);
+					}
 				}
 			}
 			// Abort casting if player casting
@@ -363,16 +375,25 @@ public abstract class AbstractOlympiadGame
 			player.sendPacket(new ExOlympiadMode(0));
 			
 			// Add Clan Skills
-			if (player.getClan() != null)
+			final Clan clan = player.getClan();
+			if (clan != null)
 			{
-				player.getClan().addSkillEffects(player);
-				if (player.getClan().getCastleId() > 0)
+				clan.addSkillEffects(player);
+				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
 					}
-				if (player.getClan().getFortId() > 0)
+				}
+				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 			}

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java

@@ -21,6 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -116,11 +118,19 @@ public class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java

@@ -24,6 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -97,11 +99,19 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(player);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(player);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(player);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(player);
+					}
 				}
 				player.sendSkillList();
 				

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.FortManager;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.siege.Castle;
+import org.l2jmobius.gameserver.model.siege.Fort;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
@@ -79,11 +81,19 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 				
 				if (clan.getCastleId() > 0)
 				{
-					CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(target);
+					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					if (castle != null)
+					{
+						castle.giveResidentialSkills(target);
+					}
 				}
 				if (clan.getFortId() > 0)
 				{
-					FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(target);
+					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					if (fort != null)
+					{
+						fort.giveResidentialSkills(target);
+					}
 				}
 				target.sendSkillList();
 				

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2625,11 +2625,19 @@ public class Player extends Playable
 			}
 			if (_clan.getCastleId() > 0)
 			{
-				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+				final Castle castle = CastleManager.getInstance().getCastleByOwner(_clan);
+				if (castle != null)
+				{
+					castle.giveResidentialSkills(this);
+				}
 			}
 			if (_clan.getFortId() > 0)
 			{
-				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+				final Fort fort = FortManager.getInstance().getFortByOwner(_clan);
+				if (fort != null)
+				{
+					fort.giveResidentialSkills(this);
+				}
 			}
 		}