Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-12-28 03:17:53 +01:00
Code Issues Projects Releases Wiki Activity

Alter small-range-tp margin. Add debug info for teleport and setback-y.

Browse Source
This commit is contained in:
asofold 2013-03-09 03:04:50 +01:00
parent 498f23e704
commit 7eab369a00
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
View File

@ -64,6 +64,7 @@ import fr.neatmonster.nocheatplus.utilities.BlockProperties;
import fr.neatmonster.nocheatplus.utilities.CheckUtils; import fr.neatmonster.nocheatplus.utilities.CheckUtils;
import fr.neatmonster.nocheatplus.utilities.PlayerLocation; import fr.neatmonster.nocheatplus.utilities.PlayerLocation;
import fr.neatmonster.nocheatplus.utilities.StringUtil; import fr.neatmonster.nocheatplus.utilities.StringUtil;
import fr.neatmonster.nocheatplus.utilities.build.BuildParameters;
/* /*
* M"""""`'"""`YM oo * M"""""`'"""`YM oo
@ -837,7 +838,6 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
*/ */
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final MovingData data = MovingData.getData(player); final MovingData data = MovingData.getData(player);
final Location teleported = data.getTeleported(); final Location teleported = data.getTeleported();
// If it was a teleport initialized by NoCheatPlus, do it anyway even if another plugin said "no". // If it was a teleport initialized by NoCheatPlus, do it anyway even if another plugin said "no".
@ -860,6 +860,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
// TODO: This could be done on MONITOR. // TODO: This could be done on MONITOR.
data.onSetBack(teleported); data.onSetBack(teleported);
} else { } else {
final MovingConfig cc = MovingConfig.getConfig(player);
// Only if it wasn't NoCheatPlus, drop data from more packets check. // Only if it wasn't NoCheatPlus, drop data from more packets check.
if (to != null && !event.isCancelled()){ if (to != null && !event.isCancelled()){
// Normal teleport. // Normal teleport.
@ -867,7 +868,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
// Detect small distance teleports. // Detect small distance teleports.
boolean smallRange = false; boolean smallRange = false;
final double margin = 0.1; final double margin = 0.67;
final Location from = event.getFrom(); final Location from = event.getFrom();
if (event.getCause() == TeleportCause.UNKNOWN){ if (event.getCause() == TeleportCause.UNKNOWN){
@ -900,7 +901,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
// TODO: How to account for plugins that reset the fall distance here? // TODO: How to account for plugins that reset the fall distance here?
if (fallDistance > 1.0 && fallDistance - player.getFallDistance() > 0.0){ if (fallDistance > 1.0 && fallDistance - player.getFallDistance() > 0.0){
// Reset fall distance if set so in the config. // Reset fall distance if set so in the config.
if (!MovingConfig.getConfig(player).noFallTpReset){ if (!cc.noFallTpReset){
// (Set fall distance if set to not reset.) // (Set fall distance if set to not reset.)
player.setFallDistance((float) fallDistance); player.setFallDistance((float) fallDistance);
} }
@ -911,11 +912,18 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
} }
data.sfHoverTicks = -1; // Important against concurrent modification exception. data.sfHoverTicks = -1; // Important against concurrent modification exception.
} }
if (cc.debug && BuildParameters.debugLevel > 0){
System.out.println(player.getName() + " TP" + (smallRange ? " (small-range)" : "") + ": " + to);
}
} }
else{ else{
// Cancelled, not a set back, ignore it, basically. // Cancelled, not a set back, ignore it, basically.
// Better reset teleported (compatibility). Might have drawbacks. // Better reset teleported (compatibility). Might have drawbacks.
data.resetTeleported(); data.resetTeleported();
if (cc.debug && BuildParameters.debugLevel > 0){
System.out.println(player.getName() + " TP (cancelled): " + to);
}
return; return;
} }

2
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
View File

@ -539,7 +539,7 @@ public class SurvivalFly extends Check {
final String hBuf = (data.sfHorizontalBuffer < 1.0 ? ((" hbuf=" + StringUtil.fdec3.format(data.sfHorizontalBuffer))) : ""); final String hBuf = (data.sfHorizontalBuffer < 1.0 ? ((" hbuf=" + StringUtil.fdec3.format(data.sfHorizontalBuffer))) : "");
final String hBufExtra = (data.sfHBufExtra > 0 ? (" hbufextra=" + data.sfHBufExtra) : ""); final String hBufExtra = (data.sfHBufExtra > 0 ? (" hbufextra=" + data.sfHBufExtra) : "");
builder.append(player.getName() + " SurvivalFly\nground: " + (data.noFallAssumeGround ? "(assumeonground) " : "") + (fromOnGround ? "onground -> " : (resetFrom ? "resetcond -> " : "--- -> ")) + (toOnGround ? "onground" : (resetTo ? "resetcond" : "---")) + ", jumpphase: " + data.sfJumpPhase); builder.append(player.getName() + " SurvivalFly\nground: " + (data.noFallAssumeGround ? "(assumeonground) " : "") + (fromOnGround ? "onground -> " : (resetFrom ? "resetcond -> " : "--- -> ")) + (toOnGround ? "onground" : (resetTo ? "resetcond" : "---")) + ", jumpphase: " + data.sfJumpPhase);
builder.append("\n" + " hDist: " + StringUtil.fdec3.format(hDistance) + " / " + StringUtil.fdec3.format(hAllowedDistance) + hBuf + hBufExtra + " , vDist: " + StringUtil.fdec3.format(yDistance) + " (" + StringUtil.fdec3.format(to.getY() - data.getSetBackY()) + " / " + StringUtil.fdec3.format(vAllowedDistance) + ")"); builder.append("\n" + " hDist: " + StringUtil.fdec3.format(hDistance) + " / " + StringUtil.fdec3.format(hAllowedDistance) + hBuf + hBufExtra + " , vDist: " + StringUtil.fdec3.format(yDistance) + " (" + StringUtil.fdec3.format(to.getY() - data.getSetBackY()) + " / " + StringUtil.fdec3.format(vAllowedDistance) + "), sby=" + (data.hasSetBack() ? data.getSetBackY() : "?"));
if (data.verticalVelocityCounter > 0 || data.verticalFreedom >= 0.001){ if (data.verticalVelocityCounter > 0 || data.verticalFreedom >= 0.001){
builder.append("\n" + " vertical freedom: " + StringUtil.fdec3.format(data.verticalFreedom) + " (vel=" + StringUtil.fdec3.format(data.verticalVelocity) + "/counter=" + data.verticalVelocityCounter +"/used="+data.verticalVelocityUsed); builder.append("\n" + " vertical freedom: " + StringUtil.fdec3.format(data.verticalFreedom) + " (vel=" + StringUtil.fdec3.format(data.verticalVelocity) + "/counter=" + data.verticalVelocityCounter +"/used="+data.verticalVelocityUsed);
} }