From ea17fe727cdb334131590c7c76575836af1ae2de Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 29 Mar 2021 09:55:56 +0000 Subject: [PATCH] Better way to check if player is over water while dismounting. --- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- .../model/actor/instance/PlayerInstance.java | 10 +--------- 21 files changed, 21 insertions(+), 189 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index dc80a2f708..204e874132 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6083,15 +6083,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index b5c030e80a..ca5cee90e9 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6089,15 +6089,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1d154188d1..0d6d67f149 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6091,15 +6091,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index bd6a0736ac..3ed923d5d5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6086,15 +6086,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index abb8e70180..444b58049a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6066,15 +6066,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 142253b774..9758dba693 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6066,15 +6066,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index a607769ef7..fab883d185 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6067,15 +6067,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 5675dc61e1..2e00c312cf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6025,15 +6025,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4f5acd7e73..42fb728ac4 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6051,15 +6051,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4f5acd7e73..42fb728ac4 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6051,15 +6051,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index c5b0ac9f46..780b57a5e3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6484,15 +6484,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d5ad05733f..684110995f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6381,15 +6381,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index af80f8f177..f35315b5fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6039,15 +6039,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 47f14712f4..d6a7ce1cbf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6039,15 +6039,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 793de5189e..d5e60c60e1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6025,15 +6025,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 83b9340410..25c0634d2d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6036,15 +6036,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 74d26d6683..dff3b1533e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6036,15 +6036,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index b30883f1e4..d4ee87db8d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5983,15 +5983,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index cbdff2d077..9e13413da6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6041,15 +6041,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 07e98246de..f6f49de705 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6051,15 +6051,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) { diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 62536d78a1..b4da04c902 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6055,15 +6055,7 @@ public class PlayerInstance extends Playable public boolean dismount() { - WaterZone water = null; - for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300)) - { - if (zone instanceof WaterZone) - { - water = (WaterZone) zone; - } - } - if (water == null) + if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null) { if (!isInWater() && (getZ() > 10000)) {