Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-07-19 17:34:42 +02:00
Code Issues Projects Releases Wiki Activity

Performance measurement for moving check

Browse Source
This commit is contained in:
Evenprime 2011-04-14 17:06:22 +02:00
parent a3a8e64127
commit 05db6c58af
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cc/co/evenprime/bukkit/nocheat/NoCheat.java
View File

@ -125,7 +125,7 @@ public class NoCheat extends JavaPlugin {
}
if(args.length == 0) {
sender.sendMessage("NC: Using "+ ((permissions == null) ? "isOp()" : "Permissions") + ". Activated checks/bugfixes: " + getActiveChecksAsString());
sender.sendMessage("NC: Using "+ ((permissions == null) ? "isOp()" : "Permissions") + ". Activated checks/bugfixes: " + getActiveChecksAsString() + ". Total time used for moving check so far: " + (movingCheck.statisticElapsedTimeNano / 1000000L + " ms. Average time per move event: " + (movingCheck.statisticElapsedTimeNano/1000L)/movingCheck.statisticTotalEvents + " us"));
return true;
}
else if(args.length == 1 && args[0] != null && args[0].trim().equals("-p")) {
@ -305,7 +305,7 @@ public class NoCheat extends JavaPlugin {
public boolean hasPermission(Player player, String permission) {
if(player == null || permission == null) {
return false;
}

40
src/cc/co/evenprime/bukkit/nocheat/checks/MovingCheck.java
View File

@ -48,6 +48,8 @@ public class MovingCheck extends Check {
public final double heightLimits[] = { 0.0D, 0.5D, 2.0D };
public int ticksBeforeSummary = 100;
public long statisticElapsedTimeNano = 0;
public boolean allowFlying = false;
@ -60,6 +62,8 @@ public class MovingCheck extends Check {
public String logMessage = "Moving violation: %1$s from %2$s (%4$.5f, %5$.5f, %6$.5f) to %3$s (%7$.5f, %8$.5f, %9$.5f)";
public String summaryMessage = "Moving summary of last ~%2$d seconds: %1$s total Violations: (%3$d,%4$d,%5$d)";
public long statisticTotalEvents = 0;
private static final double magic = 0.30000001192092896D;
private static final double magic2 = 0.69999998807907103D;
@ -164,17 +168,11 @@ public class MovingCheck extends Check {
public void check(final PlayerMoveEvent event) {
// Should we check at all
if(plugin.hasPermission(event.getPlayer(), "nocheat.moving"))
return;
long startTime = System.nanoTime();
boolean canFly = false;
if(allowFlying || plugin.hasPermission(event.getPlayer(), "nocheat.flying"))
canFly = true;
boolean stopEarly = false;
// Get the player-specific data
final NoCheatData data = plugin.getPlayerData(event.getPlayer());
@ -184,11 +182,17 @@ public class MovingCheck extends Check {
// WORKAROUND for changed PLAYER_MOVE logic
final Location from = data.movingTeleportTo == null ? event.getFrom() : data.movingTeleportTo;
data.movingTeleportTo = null;
// Should we check at all
if(plugin.hasPermission(event.getPlayer(), "nocheat.moving"))
stopEarly = true;
else if(allowFlying || plugin.hasPermission(event.getPlayer(), "nocheat.flying"))
canFly = true;
// vehicles are a special case, I ignore them because the server controls them
if(event.getPlayer().isInsideVehicle()) {
if(!stopEarly && event.getPlayer().isInsideVehicle()) {
resetData(data, event.getTo());
return;
stopEarly = true;
}
// The actual movingCheck starts here
@ -199,14 +203,19 @@ public class MovingCheck extends Check {
double combined = Math.sqrt((xDistance*xDistance + zDistance*zDistance));
System.out.println(combined);
// If the target is a bed and distance not too big, allow it
// Bukkit prevents using blocks behind walls already, so I don't have to check for that
if(to.getWorld().getBlockTypeIdAt(to) == Material.BED_BLOCK.getId() && combined < 8.0D) {
return; // players are allowed to "teleport" into a bed over "short" distances
stopEarly = true; // players are allowed to "teleport" into a bed over "short" distances
}
updateVelocity(event.getPlayer());
if(stopEarly) {
statisticElapsedTimeNano += System.nanoTime() - startTime;
statisticTotalEvents++;
return;
}
/**** Horizontal movement check START ****/
int vl1 = -1;
@ -224,7 +233,7 @@ public class MovingCheck extends Check {
/**** Vertical movement check START ****/
// pre-calculate boundary values that are needed multiple times in the following checks
// the array each contains [lowerX, higherX, Y, lowerZ, higherZ]
int fromValues[] = {lowerBorder(from.getX()), upperBorder(from.getX()), (int)Math.floor(from.getY()+0.5D), lowerBorder(from.getZ()),upperBorder(from.getZ()) };
int fromValues[] = {lowerBorder(from.getX()), upperBorder(from.getX()), (int)Math.floor(from.getY()), lowerBorder(from.getZ()),upperBorder(from.getZ()) };
int toValues[] = {lowerBorder(to.getX()), upperBorder(to.getX()), (int)Math.floor(to.getY()+0.5D), lowerBorder(to.getZ()), upperBorder(to.getZ()) };
// compare locations to the world to guess if the player is standing on the ground, a half-block or next to a ladder
@ -345,6 +354,9 @@ public class MovingCheck extends Check {
action(event, event.getPlayer(), from, to, actions[vl], log, data);
}
statisticElapsedTimeNano += System.nanoTime() - startTime;
statisticTotalEvents++;
}
private void setupSummaryTask(final Player p, final NoCheatData data) {