diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java index 54b85fecea..1459b156e7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java @@ -51,7 +51,10 @@ public class CastleZone extends ZoneRespawn final int castleId = Integer.parseInt(value); // Register self to the correct castle _castle = CastleManager.getInstance().getCastleById(castleId); - _castle.setZone(this); + if (_castle != null) + { + _castle.setZone(this); + } break; } default: diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java index 671c68724e..a4ff5915f8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java @@ -47,10 +47,10 @@ public class ClanHallZone extends ZoneRespawn { _clanHallId = Integer.parseInt(value); // Register self to the correct clan hall - final ClanHall ch = ClanHallManager.getInstance().getClanHallById(_clanHallId); - if (ch != null) + final ClanHall clanHall = ClanHallManager.getInstance().getClanHallById(_clanHallId); + if (clanHall != null) { - ClanHallManager.getInstance().getClanHallById(_clanHallId).setZone(this); + clanHall.setZone(this); } break; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java index 54b85fecea..1459b156e7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleZone.java @@ -51,7 +51,10 @@ public class CastleZone extends ZoneRespawn final int castleId = Integer.parseInt(value); // Register self to the correct castle _castle = CastleManager.getInstance().getCastleById(castleId); - _castle.setZone(this); + if (_castle != null) + { + _castle.setZone(this); + } break; } default: diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java index aae0054654..a4ff5915f8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java @@ -47,7 +47,11 @@ public class ClanHallZone extends ZoneRespawn { _clanHallId = Integer.parseInt(value); // Register self to the correct clan hall - ClanHallManager.getInstance().getClanHallById(_clanHallId).setZone(this); + final ClanHall clanHall = ClanHallManager.getInstance().getClanHallById(_clanHallId); + if (clanHall != null) + { + clanHall.setZone(this); + } break; } default: