From c3f7e48ab634bd4b0f00ea61a84fbbd173bdb445 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 26 Aug 2022 00:25:26 +0000 Subject: [PATCH] Removal of questionable MoveBackwardToLocation block of comments. --- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- .../clientpackets/MoveBackwardToLocation.java | 71 ------------------- 26 files changed, 1846 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 34617f958f..677a583efd 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -99,77 +99,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final int teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == 0)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceId())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 34617f958f..677a583efd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -99,77 +99,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final int teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == 0)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceId())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 34617f958f..677a583efd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -99,77 +99,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final int teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == 0)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceId())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level! diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index c607592c22..e003159829 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -97,77 +97,6 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - // Prevent player force moving in or out siege area. - // final AdminTeleportType teleMode = player.getTeleMode(); - // if (!player.isFlying() && (teleMode == AdminTeleportType.NORMAL)) - // { - // final boolean siegable = player.isInsideZone(ZoneId.CASTLE) || player.isInsideZone(ZoneId.FORT); - // boolean waterContact = player.isInsideZone(ZoneId.WATER); - // if (siegable && !waterContact) // Need to know if player is over water only when siegable. - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_originX, _originY)) - // { - // if ((zone instanceof WaterZone) && ((zone.getZone().getHighZ() + player.getCollisionHeight()) > _originZ)) - // { - // waterContact = true; - // break; - // } - // } - // } - // if (player.isInsideZone(ZoneId.HQ) || (siegable && waterContact)) - // { - // boolean limited = false; - // boolean water = false; - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 1000) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // limited = true; - // } - // if (zone instanceof WaterZone) - // { - // water = true; - // } - // } - // if (limited && !water && !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if (siegable) - // { - // for (ZoneType zone : ZoneManager.getInstance().getZones(_targetX, _targetY, _targetZ)) - // { - // if ((zone instanceof WaterZone) || (zone instanceof HqZone)) - // { - // if ((Math.abs(_targetZ - _originZ) > 250) || !GeoEngine.getInstance().canSeeTarget(player, new Location(_targetX, _targetY, _targetZ))) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // else if ((zone instanceof CastleZone) || (zone instanceof FortZone)) - // { - // if (((Math.abs(_targetZ - _originZ) < 100) || (Util.calculateDistance(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, false, false) > 2000)) && !GeoEngine.getInstance().canMoveToTarget(_originX, _originY, _originZ, _targetX, _targetY, _targetZ, player.getInstanceWorld())) - // { - // player.stopMove(player.getLastServerPosition()); - // player.sendPacket(ActionFailed.STATIC_PACKET); - // return; - // } - // } - // } - // } - // } - // Correcting targetZ from floor level to head level (?) // Client is giving floor level as targetZ but that floor level doesn't // match our current geodata and teleport coords as good as head level!