Try to reduce door checks.
This commit is contained in:
@@ -1132,11 +1132,12 @@ public class GeoEngine
|
|||||||
*/
|
*/
|
||||||
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
||||||
{
|
{
|
||||||
|
// Commented: Should be managed by MoveBackwardToLocation.
|
||||||
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
||||||
if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
// if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
||||||
{
|
// {
|
||||||
return new GeoLocation(ox, oy, oz);
|
// return new GeoLocation(ox, oy, oz);
|
||||||
}
|
// }
|
||||||
|
|
||||||
// get origin and check existing geo coordinates
|
// get origin and check existing geo coordinates
|
||||||
final int gox = getGeoX(ox);
|
final int gox = getGeoX(ox);
|
||||||
|
@@ -1132,11 +1132,12 @@ public class GeoEngine
|
|||||||
*/
|
*/
|
||||||
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
||||||
{
|
{
|
||||||
|
// Commented: Should be managed by MoveBackwardToLocation.
|
||||||
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
||||||
if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
// if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
||||||
{
|
// {
|
||||||
return new GeoLocation(ox, oy, oz);
|
// return new GeoLocation(ox, oy, oz);
|
||||||
}
|
// }
|
||||||
|
|
||||||
// get origin and check existing geo coordinates
|
// get origin and check existing geo coordinates
|
||||||
final int gox = getGeoX(ox);
|
final int gox = getGeoX(ox);
|
||||||
|
@@ -1132,11 +1132,12 @@ public class GeoEngine
|
|||||||
*/
|
*/
|
||||||
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
||||||
{
|
{
|
||||||
|
// Commented: Should be managed by MoveBackwardToLocation.
|
||||||
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
||||||
if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
// if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
||||||
{
|
// {
|
||||||
return new GeoLocation(ox, oy, oz);
|
// return new GeoLocation(ox, oy, oz);
|
||||||
}
|
// }
|
||||||
|
|
||||||
// get origin and check existing geo coordinates
|
// get origin and check existing geo coordinates
|
||||||
final int gox = getGeoX(ox);
|
final int gox = getGeoX(ox);
|
||||||
|
@@ -1132,11 +1132,12 @@ public class GeoEngine
|
|||||||
*/
|
*/
|
||||||
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
||||||
{
|
{
|
||||||
|
// Commented: Should be managed by MoveBackwardToLocation.
|
||||||
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
||||||
if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
// if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
||||||
{
|
// {
|
||||||
return new GeoLocation(ox, oy, oz);
|
// return new GeoLocation(ox, oy, oz);
|
||||||
}
|
// }
|
||||||
|
|
||||||
// get origin and check existing geo coordinates
|
// get origin and check existing geo coordinates
|
||||||
final int gox = getGeoX(ox);
|
final int gox = getGeoX(ox);
|
||||||
|
@@ -1120,11 +1120,12 @@ public class GeoEngine
|
|||||||
*/
|
*/
|
||||||
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, int instanceId)
|
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, int instanceId)
|
||||||
{
|
{
|
||||||
|
// Commented: Should be managed by MoveBackwardToLocation.
|
||||||
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
||||||
if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instanceId, false))
|
// if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instanceId, false))
|
||||||
{
|
// {
|
||||||
return new GeoLocation(ox, oy, oz);
|
// return new GeoLocation(ox, oy, oz);
|
||||||
}
|
// }
|
||||||
|
|
||||||
// get origin and check existing geo coordinates
|
// get origin and check existing geo coordinates
|
||||||
final int gox = getGeoX(ox);
|
final int gox = getGeoX(ox);
|
||||||
|
@@ -1132,11 +1132,12 @@ public class GeoEngine
|
|||||||
*/
|
*/
|
||||||
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
||||||
{
|
{
|
||||||
|
// Commented: Should be managed by MoveBackwardToLocation.
|
||||||
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
||||||
if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
// if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
||||||
{
|
// {
|
||||||
return new GeoLocation(ox, oy, oz);
|
// return new GeoLocation(ox, oy, oz);
|
||||||
}
|
// }
|
||||||
|
|
||||||
// get origin and check existing geo coordinates
|
// get origin and check existing geo coordinates
|
||||||
final int gox = getGeoX(ox);
|
final int gox = getGeoX(ox);
|
||||||
|
@@ -1132,11 +1132,12 @@ public class GeoEngine
|
|||||||
*/
|
*/
|
||||||
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
public final Location canMoveToTargetLoc(int ox, int oy, int oz, int tx, int ty, int tz, Instance instance)
|
||||||
{
|
{
|
||||||
|
// Commented: Should be managed by MoveBackwardToLocation.
|
||||||
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
// Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
|
||||||
if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
// if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
|
||||||
{
|
// {
|
||||||
return new GeoLocation(ox, oy, oz);
|
// return new GeoLocation(ox, oy, oz);
|
||||||
}
|
// }
|
||||||
|
|
||||||
// get origin and check existing geo coordinates
|
// get origin and check existing geo coordinates
|
||||||
final int gox = getGeoX(ox);
|
final int gox = getGeoX(ox);
|
||||||
|
Reference in New Issue
Block a user