Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-06-26 06:14:42 +02:00
Code Issues Projects Releases Wiki Activity

[BLIND] Keep track of the position a player teleports to the end from.

Browse Source 
Cross-world teleport to the end issue: set back hard, if the player
moves to the position they set off from the last world, which seems to
be a bug with some server types/versions at present (!?).
This commit is contained in:
asofold 2016-11-06 20:04:41 +01:00
parent f3eb4f22ff
commit ba15cfc267
2 changed files with 53 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingData.java
View File

@ -47,6 +47,7 @@ import fr.neatmonster.nocheatplus.compat.blocks.BlockChangeTracker.BlockChangeEn
import fr.neatmonster.nocheatplus.compat.blocks.BlockChangeTracker.BlockChangeReference;
import fr.neatmonster.nocheatplus.components.data.ICanHandleTimeRunningBackwards;
import fr.neatmonster.nocheatplus.components.entity.IEntityAccessDimensions;
import fr.neatmonster.nocheatplus.components.location.IPositionWithLook;
import fr.neatmonster.nocheatplus.utilities.CheckUtils;
import fr.neatmonster.nocheatplus.utilities.TickTask;
import fr.neatmonster.nocheatplus.utilities.ds.count.ActionAccumulator;
@ -193,6 +194,12 @@ public class MovingData extends ACheckData {
*/
private int morePacketsSetBackResetTime = 0;
/**
* Position teleported from into another world. Only used for certain
* contexts for workarounds.
*/
public IPositionWithLook crossWorldFrom = null;
/** Keep track of currently processed (if) and past moves for player moving. */
public final MoveTrace <PlayerMoveData> playerMoves = new MoveTrace<PlayerMoveData>(new Callable<PlayerMoveData>() {
@Override

61
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
View File

@ -83,6 +83,7 @@ import fr.neatmonster.nocheatplus.compat.BridgeHealth;
import fr.neatmonster.nocheatplus.compat.BridgeMisc;
import fr.neatmonster.nocheatplus.compat.MCAccess;
import fr.neatmonster.nocheatplus.components.data.IData;
import fr.neatmonster.nocheatplus.components.location.SimplePositionWithLook;
import fr.neatmonster.nocheatplus.components.modifier.IAttributeAccess;
import fr.neatmonster.nocheatplus.components.registry.event.IGenericInstanceHandle;
import fr.neatmonster.nocheatplus.components.registry.feature.IHaveCheckType;
@ -624,29 +625,46 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
// Ensure we have a set-back set.
MovingUtil.checkSetBack(player, pFrom, data, this);
// Check for special cross world teleportation issues with the end.
if (data.crossWorldFrom != null) {
if (!TrigUtil.isSamePosAndLook(pFrom, pTo) // Safety check.
&& TrigUtil.isSamePosAndLook(pTo, data.crossWorldFrom)) {
// Assume to (and possibly the player location) to be set to the location the player teleported from within the other world.
newTo = data.getSetBack(from);
checkNf = false;
NCPAPIProvider.getNoCheatPlusAPI().getLogManager().warning(Streams.STATUS, CheckUtils.getLogMessagePrefix(player, CheckType.MOVING) + " Player move end point seems to be set wrongly.");
}
// Always reset.
data.crossWorldFrom = null;
}
// Extreme move check (sf or cf is precondition, should have their own config/actions later).
if ((Math.abs(thisMove.yDistance) > Magic.EXTREME_MOVE_DIST_VERTICAL) || thisMove.hDistance > Magic.EXTREME_MOVE_DIST_HORIZONTAL) {
if (newTo == null &&
((Math.abs(thisMove.yDistance) > Magic.EXTREME_MOVE_DIST_VERTICAL)
|| thisMove.hDistance > Magic.EXTREME_MOVE_DIST_HORIZONTAL)) {
// Test for friction and velocity.
newTo = checkExtremeMove(player, pFrom, pTo, data, cc);
}
// Check jumping on things like slime blocks.
// Detect potential bounce.
if (to.getY() < from.getY()) {
if ((BlockProperties.getBlockFlags(pTo.getTypeIdBelow()) & BlockProperties.F_BOUNCE25) != 0L
&& !survivalFly.isReallySneaking(player) && checkBounceEnvelope(player, pFrom, pTo, data, cc)
) {
// Prepare bounce: The center of the player must be above the block.
// TODO: Check other side conditions (fluids, web, max. distance to the block top (!))
verticalBounce = true;
// Skip NoFall.
checkNf = false;
if (newTo == null) {
if (to.getY() < from.getY()) {
if ((BlockProperties.getBlockFlags(pTo.getTypeIdBelow()) & BlockProperties.F_BOUNCE25) != 0L
&& !survivalFly.isReallySneaking(player) && checkBounceEnvelope(player, pFrom, pTo, data, cc)
) {
// Prepare bounce: The center of the player must be above the block.
// TODO: Check other side conditions (fluids, web, max. distance to the block top (!))
verticalBounce = true;
// Skip NoFall.
checkNf = false;
}
}
}
else if (data.verticalBounce != null) {
// Prepared bounce support.
if (onPreparedBounceSupport(player, from, to, lastMove, tick, data)) {
checkNf = false;
else if (data.verticalBounce != null) {
// Prepared bounce support.
if (onPreparedBounceSupport(player, from, to, lastMove, tick, data)) {
checkNf = false;
}
}
}
}
@ -1429,6 +1447,19 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
}
}
// Cross world teleportation issues with the end.
final Location from = event.getFrom();
if (from != null
&& event.getCause() == TeleportCause.END_PORTAL // Currently only related to this.
&&!from.getWorld().getName().equals(to.getWorld().getName())) { // Less java, though.
// Remember the position teleported from.
data.crossWorldFrom = new SimplePositionWithLook(from.getX(), from.getY(), from.getZ(), from.getYaw(), from.getPitch());
}
else {
// Reset last cross world position.
data.crossWorldFrom = null;
}
// Log.
if (data.debug) {
debug(player, "TP " + event.getCause() + " (normal): " + to);