Fixed wrong door-wall collision calculation.

Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2020-06-14 21:32:42 +00:00
parent 38a1a7365d
commit fe2fe653fa
15 changed files with 15 additions and 15 deletions

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {

View File

@@ -740,7 +740,7 @@ public class GeoEngine
// 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 Location(ox, oy, oz);
} }
if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
{ {