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

Rearrange some things with MovingListener/PlayerMove(lowest).

Browse Source 
1. Don't check sf if passable sets back already, since passable favours
the
sf-set-back-location anyway.
2. First check which checks to check, to somewhat clean up the
MovingListener
3. Reset some properties on set-back in MovingListener.
This commit is contained in:
asofold 2013-03-02 03:15:49 +01:00
parent 036c99653f
commit ff409fddea
2 changed files with 85 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,23 +478,21 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
return;
}
// Use existent locations if possible.
// Set up data / caching.
final MoveInfo moveInfo;
final PlayerLocation pFrom, pTo;
if (parkedInfo.isEmpty()) moveInfo = new MoveInfo(mcAccess);
else moveInfo = parkedInfo.remove(parkedInfo.size() - 1);
pFrom = moveInfo.from;
pTo = moveInfo.to;
final MovingConfig cc = MovingConfig.getConfig(player);
moveInfo.set(player, from, to, cc.yOnGround);
data.noFallAssumeGround = false;
data.resetTeleported();
// Debug.
if (cc.debug) {
DebugUtil.outputMoveDebug(player, pFrom, pTo, mcAccess);
}
data.noFallAssumeGround = false;
data.resetTeleported();
// Check for illegal move and bounding box etc.
if (pFrom.isIllegal() || pTo.isIllegal()) {
@ -513,6 +511,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
// Just try to estimate velocities over time. Not very precise, but works good enough most of the time. Do
// general data modifications one for each event.
// TODO: Rework to queued velocity entries: activation + invalidation
// Horizontal velocity.
if (data.horizontalVelocityCounter > 0D){
data.horizontalVelocityUsed ++;
@ -529,7 +528,6 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
data.horizontalFreedom *= 0.90D;
}
}
// Vertical velocity.
if (data.verticalVelocity <= 0.09D){
data.verticalVelocityUsed ++;
@ -552,78 +550,104 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
data.verticalFreedom *= 0.93D;
}
}
Location newTo = null;
final Location passableTo;
// Check passable in any case (!)
if (cc.passableCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_PASSABLE) && !player.hasPermission(Permissions.MOVING_PASSABLE)) {
// Check passable first to prevent set-back override.
// TODO: Redesign to set set-backs later (queue + invalidate).
if (newTo == null && cc.passableCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_PASSABLE) && !player.hasPermission(Permissions.MOVING_PASSABLE)) {
// Passable is checked first to get the original set-back locations from the other checks, if needed.
passableTo = passable.check(player, pFrom, pTo, data, cc);
newTo = passable.check(player, pFrom, pTo, data, cc);
}
else passableTo = null;
// Optimized checking, giving creativefly permission precedence over survivalfly.
if (!player.hasPermission(Permissions.MOVING_CREATIVEFLY)){
// Either survivalfly or speed check.
if ((cc.ignoreCreative || player.getGameMode() != GameMode.CREATIVE) && (cc.ignoreAllowFlight || !player.getAllowFlight())
&& cc.survivalFlyCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_SURVIVALFLY) && !player.hasPermission(Permissions.MOVING_SURVIVALFLY)){
// If he is handled by the survival fly check, execute it.
newTo = survivalFly.check(player, pFrom, pTo, data, cc);
if (newTo == null){
if (cc.sfHoverCheck && !data.toWasReset && !pTo.isOnGround()){
// Start counting ticks.
hoverTicks.add(playerName);
data.sfHoverTicks = 0;
}
else{
data.sfHoverTicks = -1;
}
}
// Check NoFall if no reset is done.
if (cc.noFallCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_NOFALL) && !player.hasPermission(Permissions.MOVING_NOFALL)) {
if (newTo == null && passableTo == null){
// NOTE: noFall might set yOnGround for the positions.
noFall.check(player, pFrom, pTo, data, cc);
}
else{
// Deal damage if necessary.
// Leaving out: player.getLocation().getY()
if (cc.sfFallDamage) noFall.checkDamage(player, data, Math.min(from.getY(), to.getY()));
}
}
}
else if (cc.creativeFlyCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_CREATIVEFLY)){
// If the player is handled by the creative fly check, execute it.
newTo = creativeFly.check(player, pFrom, pTo, data, cc);
data.sfHoverTicks = -1;
}
else{
data.clearFlyData();
}
// Check which fly check to check.
final boolean checkCf;
final boolean checkSf;
if (player.hasPermission(Permissions.MOVING_CREATIVEFLY)){
checkCf = checkSf = false;
}
else{
data.clearFlyData();
}
if ((cc.ignoreCreative || player.getGameMode() != GameMode.CREATIVE) && (cc.ignoreAllowFlight || !player.getAllowFlight())
&& cc.survivalFlyCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_SURVIVALFLY) && !player.hasPermission(Permissions.MOVING_SURVIVALFLY)){
checkCf = false;
checkSf = true;
}
else if (cc.creativeFlyCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_CREATIVEFLY)){
checkCf = true;
checkSf = false;
}
else{
checkCf = checkSf = false;
}
}
// Flying checks.
if (checkSf){
// SurvivalFly
if (newTo == null){
// Only check if passable has not already set back.
newTo = survivalFly.check(player, pFrom, pTo, data, cc);
}
final boolean checkNf = cc.noFallCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_NOFALL) && !player.hasPermission(Permissions.MOVING_NOFALL);
if (newTo == null){
// Hover.
// TODO: Could reset for from-on-ground as well, for not too big moves.
if (cc.sfHoverCheck && !data.toWasReset && !pTo.isOnGround()){
// Start counting ticks.
hoverTicks.add(playerName);
data.sfHoverTicks = 0;
}
else{
data.sfHoverTicks = -1;
}
// NoFall.
if (checkNf){
noFall.check(player, pFrom, pTo, data, cc);
}
}
else{
if (checkNf && cc.sfFallDamage){
noFall.checkDamage(player, data, Math.min(from.getY(), to.getY()));
}
}
}
else if (checkCf){
// CreativeFly
newTo = creativeFly.check(player, pFrom, pTo, data, cc);
data.sfHoverTicks = -1;
}
else{
// No fly :).
data.clearFlyData();
}
// Morepackets.
if (newTo == null && cc.morePacketsCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_MOREPACKETS) && !player.hasPermission(Permissions.MOVING_MOREPACKETS)) {
// If he hasn't been stopped by any other check and is handled by the more packets check, execute it.
// TODO: Still feed morepackets even if cancelled.
newTo = morePackets.check(player, pFrom, pTo, data, cc);
} else {
// Otherwise we need to clear his data.
data.clearMorePacketsData();
}
// Prefer the location returned by passable.
if (passableTo != null) newTo = passableTo;
// Did one of the checks decide we need a new "to"-location?
if (newTo != null) {
// Yes, so set it.
// Reset some data.
data.clearAccounting();
data.sfJumpPhase = 0;
data.sfLastYDist = Double.MAX_VALUE;
data.toWasReset = false;
data.fromWasReset = false;
// TODO: data.sfHoverTicks ?
// Set new to-location.
event.setTo(newTo);
// Remember where we send the player to.
data.setTeleported(newTo);
// Debug.
if (cc.debug){
System.out.println(player.getName() + " set back to: " + newTo.getWorld() + StringUtil.fdec3.format(newTo.getX()) + ", " + StringUtil.fdec3.format(newTo.getY()) + ", " + StringUtil.fdec3.format(newTo.getZ()));
}

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

@ -691,8 +691,6 @@ public class SurvivalFly extends Check {
// Increment violation level.
data.survivalFlyVL += result;
data.sfVLTime = now;
data.clearAccounting();
data.sfJumpPhase = 0;
final ViolationData vd = new ViolationData(this, player, data.survivalFlyVL, result, cc.survivalFlyActions);
if (vd.needsParameters()) {
vd.setParameter(ParameterName.LOCATION_FROM, String.format(Locale.US, "%.2f, %.2f, %.2f", from.getX(), from.getY(), from.getZ()));
@ -700,14 +698,14 @@ public class SurvivalFly extends Check {
vd.setParameter(ParameterName.DISTANCE, String.format(Locale.US, "%.2f", to.getLocation().distance(from.getLocation())));
vd.setParameter(ParameterName.TAGS, StringUtil.join(tags, "+"));
}
// Some resetting is done in MovingListener.
if (executeActions(vd)) {
data.sfLastYDist = Double.MAX_VALUE;
data.toWasReset = false;
data.fromWasReset = false;
// Set-back + view direction of to (more smooth).
return data.getSetBack(to);
}
else{
data.clearAccounting();
data.sfJumpPhase = 0;
// Cancelled by other plugin, or no cancel set by configuration.
return null;
}