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

This commit is contained in:
MobiusDevelopment 2021-03-29 09:55:56 +00:00
parent 8b870c80cb
commit ea17fe727c
21 changed files with 21 additions and 189 deletions

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{

View File

@ -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))
{