diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java index fd3b7a50f9..18f9f5b7dc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 3f8986dd30..aefc38f568 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java index cbe5ecaca9..d8a4fbdc4a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 5c012427e4..bb38fad825 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java index f36a33500b..8885cba86d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 5c012427e4..bb38fad825 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 0e06c6382b..4ac3a80bc1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java index 3d075dd43d..fec09f4e0a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 82ea91070b..d5cd3dcb89 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 0e06c6382b..4ac3a80bc1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java index d9901377ed..40fef413aa 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 82ea91070b..d5cd3dcb89 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index af1254c814..3a70be91c9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 65be36cf38..063447c290 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java index 1ef427df42..e712ee0237 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 82ea91070b..d5cd3dcb89 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index af1254c814..3a70be91c9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 65be36cf38..063447c290 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java index 598f9103e1..7f672e92a1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 82ea91070b..d5cd3dcb89 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index af1254c814..3a70be91c9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 65be36cf38..063447c290 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index 871003c4d5..27a6d77de8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index bb2dfd095d..b03b432add 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index af1254c814..3a70be91c9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 65be36cf38..063447c290 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java index 16187cc5d8..7c4d0b46c5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 4e41e2db10..20b222a2a2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index af1254c814..3a70be91c9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 65be36cf38..063447c290 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java index 7886880412..3399651819 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 4e41e2db10..20b222a2a2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index af1254c814..3a70be91c9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 65be36cf38..063447c290 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 8406f5e9c9..cc82b5956f 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 8324b0e86c..6a3523aceb 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index af1254c814..3a70be91c9 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 23b7100315..cf2cfd0254 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index b3b2d46033..c8423c8979 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 8324b0e86c..6a3523aceb 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index af1254c814..3a70be91c9 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 23b7100315..cf2cfd0254 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java index 7ca8835875..776d5d1811 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index ebbfbb841e..feacadfe4b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/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); + 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 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); + } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 0259175041..48589ce65c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java index 1646d96298..a48c354a46 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 083ba23b6f..dd2c153eae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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); + 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 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(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 0259175041..48589ce65c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java index d7881acc13..342fcd987b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 4e41e2db10..20b222a2a2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 0e06c6382b..4ac3a80bc1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java index f30a43275e..d770265083 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 4e41e2db10..20b222a2a2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 0e06c6382b..4ac3a80bc1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java index 23332666b5..71523eb05d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 4e41e2db10..20b222a2a2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 0e06c6382b..4ac3a80bc1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java index 540aaea536..f9371b5c9d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 4e41e2db10..20b222a2a2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 0e06c6382b..4ac3a80bc1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java index fc2081df3b..5e5cfd35cb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 4e41e2db10..20b222a2a2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 0e06c6382b..4ac3a80bc1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java index a38f472e72..66502e26b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 4e41e2db10..20b222a2a2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 0e06c6382b..4ac3a80bc1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 8481d9eab1..28b756a7fd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 4e41e2db10..20b222a2a2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/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(); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/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(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 0e06c6382b..4ac3a80bc1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/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(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/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(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java index db1cdce58c..c7b269057f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/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); + } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 3ca4e3a5f6..992b4412d5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/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(); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/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(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 1e4672c499..a22d935cfd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/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(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 3665347613..c82ddcf03b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/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(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java index a141380dd1..951e4a5630 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2656,11 +2656,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); + } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 3ca4e3a5f6..992b4412d5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/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(); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/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(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 5561b7c51c..d8d4b53eb5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/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; @@ -99,11 +101,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(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 06b4572fdc..1999f01379 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java @@ -24,6 +24,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; @@ -80,11 +82,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(); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java index 262a64a2fd..3e25ddd6ec 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2662,11 +2662,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); + } } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 8324b0e86c..6a3523aceb 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/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(); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/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(); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 5561b7c51c..d8d4b53eb5 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/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; @@ -99,11 +101,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(); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 06b4572fdc..1999f01379 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java @@ -24,6 +24,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; @@ -80,11 +82,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(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java index 8f1b03a7c1..82e405ed7e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2662,11 +2662,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); + } } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 8324b0e86c..6a3523aceb 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/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(); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 3be7303b4a..084ad4ade9 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/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(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 5561b7c51c..d8d4b53eb5 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/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; @@ -99,11 +101,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(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 06b4572fdc..1999f01379 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java @@ -24,6 +24,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; @@ -80,11 +82,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();