Better way to check if player is over water while dismounting.

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{

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;
+		if (ZoneManager.getInstance().getZone(getX(), getY(), getZ() - 300, WaterZone.class) == null)
-		for (ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
-		{
-			if (zone instanceof WaterZone)
-			{
-				water = (WaterZone) zone;
-			}
-		}
-		if (water == null)
 		{
 			if (!isInWater() && (getZ() > 10000))
 			{