Removal of questionable MoveBackwardToLocation block of comments.
This commit is contained in:
parent
635271c89a
commit
c3f7e48ab6
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
@ -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!
|
||||
|
Loading…
Reference in New Issue
Block a user