Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-27 14:13:11 +02:00
Code Issues Projects Releases Wiki Activity

Passable: Prepare fixes. Remove legacy code and options.

Browse Source 
New
* Define a couple of default lists for axis order.
* Allow setting axis order via a list.

Removed
* Configuration option to disable ray-tracing.
* Configuration option 'blockchangeonly' - there may be an equivalent
later on, where checking accounts for the entire bounding box(es).
* Legacy code option (things have stabilized and axis order switching
should fix false positives).

Random
* Accidentally commit FastConsume (whitespace).
This commit is contained in:
asofold 2017-05-04 11:42:23 +02:00
parent e5f6370705
commit b38cb4da99
11 changed files with 96 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/checks/inventory/FastConsume.java
View File

@ -45,8 +45,6 @@ import fr.neatmonster.nocheatplus.utilities.TickTask;
*/
public class FastConsume extends Check implements Listener, INotifyReload {
public static void testAvailability(){
if (!PlayerItemConsumeEvent.class.getSimpleName().equals("PlayerItemConsumeEvent")){
throw new RuntimeException("This exception should not even get thrown.");

4
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java
View File

@ -148,8 +148,6 @@ public class MovingConfig extends ACheckConfig {
public final ActionList noFallActions;
public final boolean passableCheck;
public final boolean passableRayTracingCheck;
public final boolean passableRayTracingBlockChangeOnly;
// TODO: passableAccuracy: also use if not using ray-tracing
public final ActionList passableActions;
public final boolean passableUntrackedTeleportCheck;
@ -282,8 +280,6 @@ public class MovingConfig extends ACheckConfig {
noFallActions = config.getOptimizedActionList(ConfPaths.MOVING_NOFALL_ACTIONS, Permissions.MOVING_NOFALL);
passableCheck = config.getBoolean(ConfPaths.MOVING_PASSABLE_CHECK);
passableRayTracingCheck = config.getBoolean(ConfPaths.MOVING_PASSABLE_RAYTRACING_CHECK);
passableRayTracingBlockChangeOnly = config.getBoolean(ConfPaths.MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY);
passableActions = config.getOptimizedActionList(ConfPaths.MOVING_PASSABLE_ACTIONS, Permissions.MOVING_PASSABLE);
passableUntrackedTeleportCheck = config.getBoolean(ConfPaths.MOVING_PASSABLE_UNTRACKED_TELEPORT_ACTIVE);
passableUntrackedCommandCheck = config.getBoolean(ConfPaths.MOVING_PASSABLE_UNTRACKED_CMD_ACTIVE);

239
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/player/Passable.java
View File

@ -14,6 +14,7 @@
*/
package fr.neatmonster.nocheatplus.checks.moving.player;
import java.util.Arrays;
import java.util.Locale;
import org.bukkit.Location;
@ -29,7 +30,6 @@ import fr.neatmonster.nocheatplus.checks.moving.MovingData;
import fr.neatmonster.nocheatplus.compat.blocks.changetracker.BlockChangeTracker;
import fr.neatmonster.nocheatplus.utilities.collision.ICollidePassable;
import fr.neatmonster.nocheatplus.utilities.collision.PassableAxisTracing;
import fr.neatmonster.nocheatplus.utilities.collision.PassableRayTracing;
import fr.neatmonster.nocheatplus.utilities.location.LocUtil;
import fr.neatmonster.nocheatplus.utilities.location.PlayerLocation;
import fr.neatmonster.nocheatplus.utilities.location.TrigUtil;
@ -41,7 +41,6 @@ public class Passable extends Check {
// TODO: Configuration.
// TODO: Test cases.
private static boolean rt_legacy = false;
// TODO: Should keep an eye on passable vs. on-ground, when checking with reduced margins.
// rt_xzFactor = 1.0; // Problems: Doors, fences.
private static double rt_xzFactor = 0.98;
@ -56,30 +55,22 @@ public class Passable extends Check {
* @return
*/
public static boolean isPassable(Location from, Location to) {
return rt_legacy ? BlockProperties.isPassable(from, to) : BlockProperties.isPassableAxisWise(from, to);
return BlockProperties.isPassableAxisWise(from, to);
}
// TODO: Store both and select on check (with config then).
private final ICollidePassable rayTracingLegacy = new PassableRayTracing();
private final ICollidePassable rayTracingActual = new PassableAxisTracing();
private final BlockChangeTracker blockTracker;
public Passable() {
super(CheckType.MOVING_PASSABLE);
// TODO: Configurable maxSteps?
rayTracingLegacy.setMaxSteps(60);
rayTracingActual.setMaxSteps(60);
blockTracker = NCPAPIProvider.getNoCheatPlusAPI().getBlockChangeTracker();
}
public Location check(final Player player, final PlayerLocation from, final PlayerLocation to,
final MovingData data, final MovingConfig cc, final int tick, final boolean useBlockChangeTracker) {
if (rt_legacy) {
return checkLegacy(player, from, to, data, cc);
}
else {
return checkActual(player, from, to, data, cc, tick, useBlockChangeTracker);
}
return checkActual(player, from, to, data, cc, tick, useBlockChangeTracker);
}
private Location checkActual(final Player player, final PlayerLocation from, final PlayerLocation to,
@ -89,21 +80,13 @@ public class Passable extends Check {
// Block distances (sum, max) for from-to (not for loc!).
final int manhattan = from.manhattan(to);
// General condition check for using ray-tracing.
if (cc.passableRayTracingCheck && (!cc.passableRayTracingBlockChangeOnly || manhattan > 0)) {
final String newTag = checkRayTracing(player, from, to, manhattan, data, cc, tick, useBlockChangeTracker);
if (newTag != null) {
// Direct return.
return potentialViolation(player, from, to, manhattan, newTag, data, cc);
}
// TODO: Return already here, if not colliding?
}
else if (!to.isPassable()) {
// TODO: Only do ray tracing and remove this anyway?
// TODO: Do make use of isPassableBox.
// TODO: Some cases seem not to be covered here (same block !?).
return potentialViolationLegacy(player, from, to, manhattan, "", data, cc);
// Check default order first.
String newTag = checkRayTracing(player, from, to, manhattan, data, cc, tick, useBlockChangeTracker);
if (newTag != null) {
// Direct return.
return potentialViolation(player, from, to, manhattan, newTag, data, cc);
}
// TODO: Return already here, if not colliding?
// No early return on violation happened.
// (Might consider if vl>=1: only decrease if from and loc are passable too, though micro...)
data.passableVL *= 0.99;
@ -113,6 +96,7 @@ public class Passable extends Check {
private String checkRayTracing(final Player player, final PlayerLocation from, final PlayerLocation to,
final int manhattan, final MovingData data, final MovingConfig cc, final int tick, final boolean useBlockChangeTracker) {
String tags = null;
// NOTE: axis order is set externally.
setNormalMargins(rayTracingActual, from);
rayTracingActual.set(from, to);
rayTracingActual.setIgnoreInitiallyColliding(true);
@ -222,7 +206,8 @@ public class Passable extends Check {
*/
private void debugExtraCollisionDetails(Player player, ICollidePassable rayTracing, String tag) {
if (rayTracing.collides()) {
debug(player, "Raytracing collision (" + tag + "): " + rayTracing.getCollidingAxis());
debug(player, "Raytracing collision with order " + Arrays.toString(rayTracing.getAxisOrder())
+ " (" + tag + "): " + rayTracing.getCollidingAxis());
}
else if (rayTracing.getStepsDone() >= rayTracing.getMaxSteps()) {
debug(player, "Raytracing max steps exceeded (" + tag + "): "+ rayTracing.getCollidingAxis());
@ -230,204 +215,4 @@ public class Passable extends Check {
// TODO: Detect having used past block changes and log or set a tag.
}
private Location checkLegacy(final Player player, final PlayerLocation from, final PlayerLocation to,
final MovingData data, final MovingConfig cc) {
// TODO: Distinguish feet vs. box.
String tags = "";
// Block distances (sum, max) for from-to (not for loc!).
final int manhattan = from.manhattan(to);
// Skip moves inside of ignored blocks right away [works as long as we only check between foot-locations].
if (manhattan <= 1 && BlockProperties.isPassable(from.getTypeId())) {
// TODO: Monitor: BlockProperties.isPassable checks slightly different than before.
if (manhattan == 0){
return null;
} else {
// manhattan == 1
if (BlockProperties.isPassable(to.getTypeId())) {
return null;
}
}
}
boolean toPassable = to.isPassable();
// General condition check for using ray-tracing.
if (toPassable && cc.passableRayTracingCheck
&& (!cc.passableRayTracingBlockChangeOnly || manhattan > 0)) {
final String newTag = checkRayTracingLegacy(player, from, to, manhattan, data, cc);
if (newTag != null) {
toPassable = false;
tags = newTag;
}
}
// TODO: Checking order: If loc is not the same as from, a quick return here might not be wanted.
if (toPassable) {
// Quick return.
// (Might consider if vl>=1: only decrease if from and loc are passable too, though micro...)
data.passableVL *= 0.99;
return null;
} else {
return potentialViolationLegacy(player, from, to, manhattan, tags, data, cc);
}
}
private String checkRayTracingLegacy(final Player player, final PlayerLocation from, final PlayerLocation to,
final int manhattan, final MovingData data, final MovingConfig cc) {
setNormalMargins(rayTracingLegacy, from);
rayTracingLegacy.set(from, to);
rayTracingLegacy.loop();
String tags = null;
if (rayTracingLegacy.collides() || rayTracingLegacy.getStepsDone() >= rayTracingLegacy.getMaxSteps()) {
if (data.debug) {
debugExtraCollisionDetails(player, rayTracingLegacy, "legacy");
}
final int maxBlockDist = manhattan <= 1 ? manhattan : from.maxBlockDist(to);
if (maxBlockDist <= 1 && rayTracingLegacy.getStepsDone() == 1 && !from.isPassable()) {
// Redo ray-tracing for moving out of blocks.
if (collidesIgnoreFirst(from, to)) {
tags = "raytracing_2x_";
if (data.debug) {
debugExtraCollisionDetails(player, rayTracingLegacy, "ingoreFirst");
}
}
else if (data.debug) {
debug(player, "Allow moving out of a block.");
}
}
else{
if (!allowsSplitMove(from, to, manhattan, data)) {
tags = "raytracing_";
}
}
}
// TODO: Future: If accuracy is demanded, also check the head position (or bounding box right away).
rayTracingLegacy.cleanup();
return tags;
}
/**
* Legacy skipping conditions, before triggering an actual violation.
*
* @param player
* @param from
* @param to
* @param manhattan
* @param tags
* @param data
* @param cc
* @return
*/
private Location potentialViolationLegacy(final Player player,
final PlayerLocation from, final PlayerLocation to, final int manhattan,
String tags, final MovingData data, final MovingConfig cc) {
// Moving into a block, possibly a violation.
// TODO: Do account for settings and ray-tracing here.
// First check if the player is moving from a passable location.
// If not, the move might still be allowed, if moving inside of the same block, or from and to have head position passable.
if (from.isPassable()) {
// Put one workaround for 1.5 high blocks here:
if (from.isBlockAbove(to) && (BlockProperties.getBlockFlags(to.getTypeId()) & BlockProperties.F_HEIGHT150) != 0) {
// Check if the move went from inside of the block.
if (BlockProperties.collidesBlock(to.getBlockCache(),
from.getX(), from.getY(), from.getZ(),
from.getX(), from.getY(), from.getZ(),
to.getBlockX(), to.getBlockY(), to.getBlockZ(), to.getOrCreateBlockCacheNode(), null,
BlockProperties.getBlockFlags(to.getTypeId()))) {
// Allow moving inside of 1.5 high blocks.
return null;
}
}
// From should be the set back.
tags += "into";
}
// } else if (BlockProperties.isPassableExact(from.getBlockCache(), loc.getX(), loc.getY(), loc.getZ(), from.getTypeId(lbX, lbY, lbZ))) {
// (Mind that this can be the case on the same block theoretically.)
// Keep loc as set back.
// }
else if (manhattan == 1 && to.isBlockAbove(from)
&& BlockProperties.isPassable(from.getBlockCache(), from.getX(), from.getY() + from.getBoxMarginVertical(), from.getZ(), from.getBlockCache().getOrCreateBlockCacheNode(from.getBlockX(), Location.locToBlock(from.getY() + from.getBoxMarginVertical()), from.getBlockZ(), false), null)) {
// else if (to.isBlockAbove(from) && BlockProperties.isPassableExact(from.getBlockCache(), from.getX(), from.getY() + from.getBoxMarginVertical(), from.getZ(), from.getTypeId(from.getBlockX(), Location.locToBlock(from.getY() + from.getBoxMarginVertical()), from.getBlockZ()))) {
// Allow the move up if the head is free.
return null;
}
else if (manhattan > 0) {
// Otherwise keep from as set back.
tags += "cross";
}
else {
// manhattan == 0
// TODO: Even legacy ray-tracing will now account for actual initial collision.
return null;
}
return actualViolation(player, from, to, tags, data, cc);
}
/**
* Test collision with ignoring the first block.
* @param from
* @param to
* @return
*/
private boolean collidesIgnoreFirst(PlayerLocation from, PlayerLocation to) {
rayTracingLegacy.set(from, to);
rayTracingLegacy.setIgnoreInitiallyColliding(true);
rayTracingLegacy.setCutOppositeDirectionMargin(true);
rayTracingLegacy.loop();
rayTracingLegacy.setIgnoreInitiallyColliding(false);
rayTracingLegacy.setCutOppositeDirectionMargin(false);
return rayTracingLegacy.collides() || rayTracingLegacy.getStepsDone() >= rayTracingLegacy.getMaxSteps();
}
/**
* Test the move split into y-move and horizontal move, provided some pre-conditions are met.
* @param from
* @param to
* @param manhattan
* @return
*/
private boolean allowsSplitMove(final PlayerLocation from, final PlayerLocation to, final int manhattan, final MovingData data) {
if (!rayTracingLegacy.mightNeedSplitAxisHandling()) {
return false;
}
// Always check y first.
rayTracingLegacy.set(from.getX(), from.getY(), from.getZ(), from.getX(), to.getY(), from.getZ());
rayTracingLegacy.loop();
if (!rayTracingLegacy.collides() && rayTracingLegacy.getStepsDone() < rayTracingLegacy.getMaxSteps()) {
// horizontal second.
rayTracingLegacy.set(from.getX(), to.getY(), from.getZ(), to.getX(), to.getY(), to.getZ());
rayTracingLegacy.loop();
if (!rayTracingLegacy.collides() && rayTracingLegacy.getStepsDone() < rayTracingLegacy.getMaxSteps()) {
return true;
}
}
// Horizontal first may be obsolete, due to splitting moves anyway and due to not having been called ever (!).
// final double yDiff = to.getY() - from.getY() ;
// if (manhattan <= 3 && Math.abs(yDiff) < 1.0 && yDiff < 0.0) {
// // Workaround for client-side calculations not being possible (y vs. horizontal move). Typically stairs.
// // horizontal first.
// if (data.debug) {
// DebugUtil.debug(from.getPlayer().getName() + " passable - Test horizontal move first.");
// }
// rayTracingLegacy.set(from.getX(), from.getY(), from.getZ(), to.getX(), from.getY(), to.getZ());
// rayTracingLegacy.loop();
// if (!rayTracingLegacy.collides() && rayTracingLegacy.getStepsDone() < rayTracingLegacy.getMaxSteps()) {
// // y second.
// rayTracingLegacy.set(to.getX(), from.getY(), to.getZ(), to.getX(), to.getY(), to.getZ());
// rayTracingLegacy.loop();
// if (!rayTracingLegacy.collides() && rayTracingLegacy.getStepsDone() < rayTracingLegacy.getMaxSteps()) {
// return true;
// }
// }
// }
if (data.debug) {
debug(from.getPlayer(), "Raytracing collision (split move): (no details)");
}
return false;
}
}

8
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
View File

@ -603,9 +603,7 @@ public abstract class ConfPaths {
public static final String MOVING_PASSABLE = MOVING + "passable.";
public static final String MOVING_PASSABLE_CHECK = MOVING_PASSABLE + "active";
private static final String MOVING_PASSABLE_RAYTRACING = MOVING_PASSABLE + "raytracing.";
public static final String MOVING_PASSABLE_RAYTRACING_CHECK = MOVING_PASSABLE_RAYTRACING + "active";
public static final String MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY = MOVING_PASSABLE_RAYTRACING + "blockchangeonly";
//private static final String MOVING_PASSABLE_RAYTRACING = MOVING_PASSABLE + "raytracing.";
public static final String MOVING_PASSABLE_ACTIONS = MOVING_PASSABLE + "actions";
private static final String MOVING_PASSABLE_UNTRACKED = MOVING_PASSABLE + "untracked.";
private static final String MOVING_PASSABLE_UNTRACKED_TELEPORT = MOVING_PASSABLE_UNTRACKED + "teleport.";
@ -860,6 +858,10 @@ public abstract class ConfPaths {
public static final String MOVING_TRACE_MERGEDIST = "checks.moving.trace.mergedist";
@Deprecated
public static final String COMPATIBILITY_BLOCKS_IGNOREPASSABLE = "compatibility.blocks.ignorepassable";
@Deprecated
public static final String MOVING_PASSABLE_RAYTRACING_CHECK = "checks.moving.passable.raytracing.active";
@Deprecated
public static final String MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY = "checks.moving.passable.raytracing.blockchangeonly";
/**
* Get moved paths for which an annotation doesn't work.

2
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java
View File

@ -424,8 +424,6 @@ public class DefaultConfig extends ConfigFile {
set(ConfPaths.MOVING_NOFALL_ACTIONS, "log:nofall:0:5:if cancel vl>30 log:nofall:0:5:icf cancel", 785);
set(ConfPaths.MOVING_PASSABLE_CHECK, true, 785);
set(ConfPaths.MOVING_PASSABLE_RAYTRACING_CHECK, true, 785);
set(ConfPaths.MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY, false, 785);
set(ConfPaths.MOVING_PASSABLE_ACTIONS, "cancel vl>10 log:passable:0:5:if cancel vl>50 log:passable:0:5:icf cancel", 785);
set(ConfPaths.MOVING_PASSABLE_UNTRACKED_TELEPORT_ACTIVE, true, 785);
set(ConfPaths.MOVING_PASSABLE_UNTRACKED_CMD_ACTIVE, true, 785);

19
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/collision/Axis.java
View File

@ -14,6 +14,10 @@
*/
package fr.neatmonster.nocheatplus.utilities.collision;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* Represent an orientation concerning Axes (not necessarily a single one).
*
@ -30,4 +34,19 @@ public enum Axis {
XYZ_AXES,
NONE;
//
public static final List<Axis> AXIS_ORDER_YXZ = Collections.unmodifiableList(
Arrays.asList(new Axis[]{Y_AXIS, X_AXIS, Z_AXIS}));
public static final List<Axis> AXIS_ORDER_YZX = Collections.unmodifiableList(
Arrays.asList(new Axis[]{Y_AXIS, Z_AXIS, X_AXIS}));
public static final List<Axis> AXIS_ORDER_XZY = Collections.unmodifiableList(
Arrays.asList(new Axis[]{X_AXIS, Z_AXIS, Y_AXIS}));
public static final List<Axis> AXIS_ORDER_ZXY = Collections.unmodifiableList(
Arrays.asList(new Axis[]{Z_AXIS, X_AXIS, Y_AXIS}));
//
public static final List<Axis> AXIS_ORDER_XYZ = Collections.unmodifiableList(
Arrays.asList(new Axis[]{X_AXIS, Y_AXIS, Z_AXIS}));
public static final List<Axis> AXIS_ORDER_ZYX = Collections.unmodifiableList(
Arrays.asList(new Axis[]{Z_AXIS, Y_AXIS, X_AXIS}));
}

31
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/collision/AxisTracing.java
View File

@ -14,6 +14,8 @@
*/
package fr.neatmonster.nocheatplus.utilities.collision;
import java.util.List;
import org.bukkit.Location;
/**
@ -39,7 +41,10 @@ public abstract class AxisTracing implements ICollideBlocks, ISetMargins {
private double x0, y0, z0;
/** End coordinates (center). */
private double x1, y1, z1;
/** Margins for the bounding box, seen from center / start coordinates. Positive values. */
/**
* Margins for the bounding box, seen from center / start coordinates.
* Positive values.
*/
private double marginXpos, marginXneg, marginYpos, marginYneg, marginZpos, marginZneg;
/**
@ -106,6 +111,13 @@ public abstract class AxisTracing implements ICollideBlocks, ISetMargins {
return ignoreInitiallyColliding;
}
@Override
public Axis[] getAxisOrder() {
final Axis[] out = new Axis[axisOrder.length];
System.arraycopy(axisOrder, 0, out, 0, axisOrder.length);
return out;
}
/**
* Indicate if a collision appeared during loop().
* @return
@ -119,8 +131,11 @@ public abstract class AxisTracing implements ICollideBlocks, ISetMargins {
return collidesAxis;
}
/**
* Default order is AXIS_ORDER_YXZ.
*/
public void setDefaultAxisOrder() {
setAxisOrder(Axis.Y_AXIS, Axis.X_AXIS, Axis.Z_AXIS);
setAxisOrder(Axis.AXIS_ORDER_YXZ);
}
public void setAxisOrder(Axis first, Axis second, Axis third) {
@ -129,6 +144,18 @@ public abstract class AxisTracing implements ICollideBlocks, ISetMargins {
axisOrder[2] = third;
}
/**
*
* @param axisOrder
* Size must be three. Use Axis.NONE for skipping.
*/
public void setAxisOrder(final List<Axis> axisOrder) {
if (axisOrder.size() != 3) {
throw new IllegalArgumentException("Size must be three.");
}
setAxisOrder(axisOrder.get(0), axisOrder.get(1), axisOrder.get(2));
}
@Override
public void setMargins(final double height, final double xzMargin) {
this.marginXneg = this.marginXpos = this.marginZneg = this.marginZpos = xzMargin;

8
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/collision/ICollideBlocks.java
View File

@ -89,4 +89,12 @@ public interface ICollideBlocks {
*/
public Axis getCollidingAxis();
/**
* Get an array with the axes in checking order. Length may vary, depending
* on the implementation.
*
* @return
*/
public Axis[] getAxisOrder();
}

12
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/collision/ICollidePassable.java
View File

@ -14,6 +14,7 @@
*/
package fr.neatmonster.nocheatplus.utilities.collision;
import java.util.List;
import java.util.UUID;
import fr.neatmonster.nocheatplus.compat.blocks.changetracker.BlockChangeReference;
@ -49,6 +50,16 @@ public interface ICollidePassable extends ICollideBlocks, ISetMargins {
public void setBlockChangeTracker(BlockChangeTracker blockChangeTracker,
BlockChangeReference blockChangeReference, int tick, UUID worldId);
/**
* Set the axis checking order, length must be 3, use Axis.NONE for
* skipping.
*
* @param axisOrder
* @throws UnsupportedOperationException
* If setting the order of axes is not supported.
*/
public void setAxisOrder(List<Axis> axisOrder);
/**
* Convenience: Call set and setBlockCache with the data from the
* PlayerLocation instances. Should use from.getBlockCache() as BlockCache
@ -73,6 +84,7 @@ public interface ICollidePassable extends ICollideBlocks, ISetMargins {
/**
* Remove reference to objects passed from outside (BlockCache,
* BlockChangeTracker and similar, but not calling their cleanup methods).
* Should not reset previously set collision information.
*/
public void cleanup();

6
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/collision/PassableRayTracing.java
View File

@ -14,6 +14,7 @@
*/
package fr.neatmonster.nocheatplus.utilities.collision;
import java.util.List;
import java.util.UUID;
import fr.neatmonster.nocheatplus.compat.blocks.changetracker.BlockChangeReference;
@ -96,4 +97,9 @@ public class PassableRayTracing extends RayTracing implements ICollidePassable {
// (No effect.)
}
@Override
public void setAxisOrder(List<Axis> axisOrder) {
throw new UnsupportedOperationException();
}
}

5
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/collision/RayTracing.java
View File

@ -369,6 +369,11 @@ public abstract class RayTracing implements ICollideBlocks {
return true;
}
@Override
public Axis[] getAxisOrder() {
return new Axis[] {Axis.XYZ_AXES};
}
@Override
public boolean collides() {
return collides;