diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 487f5e1d99..9a5dc4c1dd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 487f5e1d99..9a5dc4c1dd 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 487f5e1d99..9a5dc4c1dd 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 487f5e1d99..9a5dc4c1dd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 202c831f51..08395b8b7c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 487f5e1d99..9a5dc4c1dd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 487f5e1d99..9a5dc4c1dd 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 584ff3ffcc..c9047c31f1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 584ff3ffcc..c9047c31f1 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 584ff3ffcc..c9047c31f1 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 487f5e1d99..9a5dc4c1dd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 487f5e1d99..9a5dc4c1dd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 487f5e1d99..9a5dc4c1dd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 584ff3ffcc..c9047c31f1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 584ff3ffcc..c9047c31f1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 584ff3ffcc..c9047c31f1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 487f5e1d99..9a5dc4c1dd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 76f488adaa..17c40bae88 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 76f488adaa..17c40bae88 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -817,7 +817,8 @@ public class Instance implements IIdentifiable, INamable */ public void ejectPlayer(PlayerInstance player) { - if (player.getInstanceWorld().equals(this)) + final Instance world = player.getInstanceWorld(); + if ((world != null) && world.equals(this)) { final Location loc = _template.getExitLocation(player); if (loc != null)