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 02cd388fb4..36c032dff8 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 @@ -13584,11 +13584,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 abc95bf50a..4924d8751c 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 @@ -13587,11 +13587,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 1f6eaf9b6b..4178c995e8 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 @@ -13590,11 +13590,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 fbb851d0ef..0a84a93ed4 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 @@ -13562,11 +13562,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 bec75987b7..41a7e16928 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 @@ -13588,11 +13588,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 7e705a7e91..de14124ee4 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 @@ -13591,11 +13591,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 79fb6b8a92..0c9160d0f6 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 @@ -13597,11 +13597,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 72d3764e54..2370ec0be8 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 @@ -13633,11 +13633,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 b9aaba9c13..ec38c7307e 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 @@ -13749,11 +13749,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 749d60bcf6..ed81c0390f 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 @@ -13787,11 +13787,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 233b126363..38e209d7ea 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 @@ -13849,11 +13849,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 468592c9aa..ccdd93a9f2 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 @@ -13849,11 +13849,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 82e07fe1fe..d765afd641 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 @@ -13401,11 +13401,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 88f06abb13..5da6788e4e 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 @@ -13401,11 +13401,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 0243b3b8f9..1fcfcff0b9 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 @@ -13387,11 +13387,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 3620942f2a..a0f8b9ba9a 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 @@ -13435,11 +13435,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 abb590427e..63ab809645 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 @@ -13435,11 +13435,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 3df769b531..f323e538e1 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 @@ -13445,11 +13445,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 78984bd709..8941f08827 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 @@ -13397,11 +13397,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 3e6835737b..ab5a83b5d0 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 @@ -13716,11 +13716,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 a3fc01f863..e79d01e973 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 @@ -13794,11 +13794,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 3189bc8915..2f78c1e331 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 @@ -13916,11 +13916,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /** 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 575bd4bdea..8b312895e5 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 @@ -13916,11 +13916,24 @@ public class Player extends Playable */ public CastleSide getPlayerSide() { - if ((_clan == null) || (_clan.getCastleId() == 0)) + if (_clan == null) { return CastleSide.NEUTRAL; } - return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide(); + + final int castleId = _clan.getCastleId(); + if (castleId == 0) + { + return CastleSide.NEUTRAL; + } + + final Castle castle = CastleManager.getInstance().getCastleById(castleId); + if (castle == null) + { + return CastleSide.NEUTRAL; + } + + return castle.getSide(); } /**