Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-12-27 02:48:04 +01:00
Code Issues Projects Releases Wiki Activity

Fix and optimize hover checking.

Browse Source 
Fix: reset players hover ticks if moves are not checked (sleep, dead,
vehicle, disabled).

Optimize: Only check on-ground, if the players hover tick counts
reach the limit. Players are reset when moving anyway.
This commit is contained in:
asofold 2013-01-29 14:00:28 +01:00
parent 24421dc85d
commit eda657b6de
1 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -442,9 +442,12 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
final String playerName = player.getName(); final String playerName = player.getName();
processingEvents.put(playerName, event); processingEvents.put(playerName, event);
final MovingData data = MovingData.getData(player);
// Ignore players in vehicles. // Ignore players in vehicles.
if (player.isInsideVehicle()){ if (player.isInsideVehicle()){
// Workaround for pigs ! // Workaround for pigs !
data.sfHoverTicks = -1;
final Entity vehicle = player.getVehicle(); final Entity vehicle = player.getVehicle();
if (vehicle != null && (vehicle instanceof Pig)){ if (vehicle != null && (vehicle instanceof Pig)){
onVehicleMove(new VehicleMoveEvent((Vehicle) vehicle, event.getFrom(), event.getFrom())); onVehicleMove(new VehicleMoveEvent((Vehicle) vehicle, event.getFrom(), event.getFrom()));
@ -452,10 +455,14 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
return; return;
} }
// Ignore dead players. // Ignore dead players.
if (player.isDead()) return; if (player.isDead()){
data.sfHoverTicks = -1;
return;
}
// Ignore sleeping players. // Ignore sleeping players.
if (player.isSleeping()){ if (player.isSleeping()){
data.sfHoverTicks = -1;
// TODO: check (which cb!) System.out.println("-> " + player.isSleepingIgnored()); // TODO: check (which cb!) System.out.println("-> " + player.isSleepingIgnored());
return; return;
} }
@ -464,7 +471,10 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
final Location to = event.getTo(); final Location to = event.getTo();
// Ignore changing worlds. // Ignore changing worlds.
if (!from.getWorld().equals(to.getWorld())) return; if (!from.getWorld().equals(to.getWorld())){
// Keep hover ticks.
return;
}
// Use existent locations if possible. // Use existent locations if possible.
final MoveInfo moveInfo; final MoveInfo moveInfo;
@ -488,7 +498,6 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
System.out.print(builder.toString()); System.out.print(builder.toString());
} }
final MovingData data = MovingData.getData(player);
data.noFallAssumeGround = false; data.noFallAssumeGround = false;
data.resetTeleported(); data.resetTeleported();
@ -1091,6 +1100,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
@Override @Override
public final void onTick(final int tick, final long timeLast) { public final void onTick(final int tick, final long timeLast) {
// Hover checks ! // Hover checks !
// TODO: Change to ordering such that smallest hover time comes first ?
if (hoverTicks.isEmpty()) return; // Seldom or not ? if (hoverTicks.isEmpty()) return; // Seldom or not ?
final Server server = Bukkit.getServer(); final Server server = Bukkit.getServer();
final MoveInfo info; final MoveInfo info;
@ -1106,24 +1116,44 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
final MovingData data = MovingData.getData(player); final MovingData data = MovingData.getData(player);
if (player.isDead() || player.isSleeping() || player.isInsideVehicle()){ if (player.isDead() || player.isSleeping() || player.isInsideVehicle()){
data.sfHoverTicks = -1; data.sfHoverTicks = -1;
// (Removed below.)
} }
if (data.sfHoverTicks < 0){ if (data.sfHoverTicks < 0){
rem.add(playerName); rem.add(playerName);
continue; continue;
} }
if (checkHover(player, data, info)){ final MovingConfig cc = MovingConfig.getConfig(player);
// Check if enabled at all.
if (!cc.sfHoverCheck){
rem.add(playerName);
data.sfHoverTicks = -1;
continue;
}
// Increase ticks here.
data.sfHoverTicks ++;
if (data.sfHoverTicks < cc.sfHoverTicks){
// Don't do the heavier checking here, let moving checks reset these.
continue;
}
if (checkHover(player, data, cc, info)){
rem.add(playerName); rem.add(playerName);
} }
} }
info.cleanup(); // Just in case.
parkedInfo.add(info); parkedInfo.add(info);
hoverTicks.removeAll(rem); hoverTicks.removeAll(rem);
rem.clear(); rem.clear();
} }
private final boolean checkHover(final Player player, final MovingData data, final MoveInfo info) { /**
final MovingConfig cc = MovingConfig.getConfig(player); * The heavier checking including on.ground etc., check if enabled/valid to check before this.
// Check if enabled at all. * @param player
if (!cc.sfHoverCheck) return true; * @param data
* @param cc
* @param info
* @return
*/
private final boolean checkHover(final Player player, final MovingData data, final MovingConfig cc, final MoveInfo info) {
// Check if player is on ground. // Check if player is on ground.
final Location loc = player.getLocation(); final Location loc = player.getLocation();
info.set(player, loc, null, cc.yOnGround); info.set(player, loc, null, cc.yOnGround);
@ -1132,7 +1162,6 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
res = true; res = true;
} }
else{ else{
data.sfHoverTicks ++;
if (data.sfHoverTicks > cc.sfHoverTicks){ if (data.sfHoverTicks > cc.sfHoverTicks){
handleHoverViolation(player, loc, cc, data); handleHoverViolation(player, loc, cc, data);
// Assume the player might still be hovering. // Assume the player might still be hovering.