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

Implemented "fakesneak" check - detecting players that "sneak too

Browse Source 
fast" + again some code moving for better readability
This commit is contained in:
Evenprime 2011-04-29 18:12:18 +02:00
parent 5d0585d546
commit bc45bac045
6 changed files with 241 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.yml
View File

@ -3,7 +3,7 @@ name: NoCheat
author: Evenprime
main: cc.co.evenprime.bukkit.nocheat.NoCheat
version: 0.9.1
version: 0.9.2
commands:
nocheat:

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

@ -70,13 +70,6 @@ public class NoCheat extends JavaPlugin {
@Override
public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args)
{
/*if(sender instanceof Player) {
if(!hasPermission((Player)sender, PermissionData.PERMISSION_P)) {
sender.sendMessage("NC: You are not allowed to use this command.");
return false;
}
}*/
if(args.length == 0) {
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;
@ -221,7 +214,7 @@ public class NoCheat extends JavaPlugin {
if(p == null) {
PluginDescriptionFile pdfFile = this.getDescription();
Logger.getLogger("Minecraft").warning("[NoCheat] version [" + pdfFile.getVersion() + "] couldn't find CrafTIRC plugin. Disabling logging to IRC.");
Logger.getLogger("Minecraft").info("[NoCheat] version [" + pdfFile.getVersion() + "] couldn't find CrafTIRC plugin. Disabling logging to IRC.");
}
irc = p;
@ -287,7 +280,7 @@ public class NoCheat extends JavaPlugin {
// Prevent spam and recursion by definitely doing this only once
this.exceptionWithPermissions = true;
String logtext = "Asking Permissions-Plugin if "+player.getName()+" has permission "+permission+" caused an Exception "+ e.getMessage() + ". Please review your permissions config file. This message is only displayed once, the player is considered to not have that permission from now on. The full stack trace is written into the nocheat logfile.";
String logtext = "Asking Permissions-Plugin if "+player.getName()+" has permission "+PermissionData.permissionNames[permission]+" caused an Exception "+ e.getMessage() + ". Please review your permissions config file. This message is only displayed once, the player is considered to not have that permission from now on. The full stack trace is written into the nocheat logfile.";
log(Level.SEVERE, logtext);
for(StackTraceElement s : e.getStackTrace()) {
config.logger.log(Level.SEVERE, s.toString());
@ -317,7 +310,8 @@ public class NoCheat extends JavaPlugin {
}
s = s + (movingCheck.isActive() && !movingCheck.allowFlying ? "flying " : "");
s = s + (movingCheck.isActive() && !movingCheck.allowFakeSneak ? "fakesneak " : "");
return s;
}
@ -331,8 +325,9 @@ public class NoCheat extends JavaPlugin {
}
s = s + (!movingCheck.isActive() || movingCheck.allowFlying ? "flying* " : (hasPermission(p, PermissionData.PERMISSION_FLYING) ? "flying " : ""));
s = s + (!movingCheck.isActive() || movingCheck.allowFakeSneak ? "fakesneak* " : (hasPermission(p, PermissionData.PERMISSION_FAKESNEAK) ? "fakesneak " : ""));
s = s + (hasPermission(p, PermissionData.PERMISSION_NOTIFY) ? "notify " : "");
return s;
}

3
src/cc/co/evenprime/bukkit/nocheat/NoCheatConfiguration.java
View File

@ -105,6 +105,7 @@ public class NoCheatConfiguration {
plugin.movingCheck.summaryMessage = c.getString("moving.summarymessage", plugin.movingCheck.summaryMessage);
plugin.movingCheck.allowFlying = c.getBoolean("moving.allowflying", plugin.movingCheck.allowFlying);
plugin.movingCheck.allowFakeSneak = c.getBoolean("moving.allowfakesneak", plugin.movingCheck.allowFakeSneak);
plugin.speedhackCheck.actions[0] = stringToActions(c.getString("speedhack.action.low"), plugin.speedhackCheck.actions[0]);
plugin.speedhackCheck.actions[1] = stringToActions(c.getString("speedhack.action.med"), plugin.speedhackCheck.actions[1]);
@ -266,6 +267,8 @@ public class NoCheatConfiguration {
w.write(" summarymessage: \"" + plugin.movingCheck.summaryMessage+"\""); w.newLine();
w.write("# Should (normal speed) flying be generally allowed?"); w.newLine();
w.write(" allowflying: " + plugin.movingCheck.allowFlying); w.newLine();
w.write("# Should sneaking with normal walking speed be generally allowed?"); w.newLine();
w.write(" allowfakesneak: " + plugin.movingCheck.allowFakeSneak); w.newLine();
w.write("# Moving Action, one or more of 'loglow logmed loghigh cancel'"); w.newLine();
w.write(" action:"); w.newLine();
w.write(" low: "+actionsToString(plugin.movingCheck.actions[0])); w.newLine();

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

@ -61,6 +61,7 @@ public class MovingCheck extends Check {
public long statisticElapsedTimeNano = 0;
public boolean allowFlying = false;
public boolean allowFakeSneak = true;
// How should moving violations be treated?
public final Action actions[][] = {
@ -71,29 +72,27 @@ public class MovingCheck extends Check {
public String logMessage = "Moving violation: %1$s from %2$s (%4$.1f, %5$.1f, %6$.1f) to %3$s (%7$.1f, %8$.1f, %9$.1f)";
public String summaryMessage = "Moving summary of last ~%2$d seconds: %1$s total Violations: (%3$d,%4$d,%5$d)";
public long statisticTotalEvents = 1; // Prevent accidental division by 0
public long statisticTotalEvents = 1; // Prevent accidental division by 0 at some point
private static final double magic = 0.30000001192092896D;
private static final double magic2 = 0.69999998807907103D;
/**
* The actual check.
* First find out if the event needs to be handled at all
* Second check if the player moved too far horizontally
* Third check if the player moved too high vertically
* Fourth treat any occured violations as configured
* @param event
*/
public void check(final PlayerMoveEvent event) {
long startTime = System.nanoTime();
final Player player = event.getPlayer();
// Should we check at all
if(skipCheck(player)) {
statisticElapsedTimeNano += System.nanoTime() - startTime;
statisticTotalEvents++;
return;
}
if(skipCheck(player)) { return; }
final boolean canFly;
if(allowFlying || plugin.hasPermission(player, PermissionData.PERMISSION_FLYING))
canFly = true;
else
canFly = false;
long startTime = System.nanoTime();
// Get the player-specific data
final MovingData data = MovingData.get(player);
@ -102,21 +101,18 @@ public class MovingCheck extends Check {
final Location to = event.getTo();
Location from = event.getFrom();
// WORKAROUND for changed PLAYER_MOVE logic
if(data.teleportTo != null) {
from = data.teleportTo;
data.teleportTo = null;
}
// The use of event.getFrom() is intentional
if(shouldBeIgnored(player, data, event.getFrom(), to)) {
if(shouldBeIgnored(player, data, from, to)) {
statisticElapsedTimeNano += System.nanoTime() - startTime;
statisticTotalEvents++;
return;
}
// The actual movingCheck starts here
updateVelocity(player.getVelocity(), data);
// WORKAROUND for changed PLAYER_MOVE logic
if(data.teleportTo != null) {
from = data.teleportTo;
data.teleportTo = null;
}
// First check the distance the player has moved horizontally
final double xDistance = Math.abs(from.getX()-to.getX());
@ -132,15 +128,60 @@ public class MovingCheck extends Check {
return;
}
// pre-calculate boundary values that are needed multiple times in the following checks
// the array each contains [lowerX, higherX, Y, lowerZ, higherZ]
final int fromValues[] = {lowerBorder(from.getX()), upperBorder(from.getX()), (int)Math.floor(from.getY()), lowerBorder(from.getZ()),upperBorder(from.getZ()) };
final 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
final boolean onGroundFrom = playerIsOnGround(from.getWorld(), fromValues, from);
final boolean onGroundTo = playerIsOnGround(to.getWorld(), toValues, to);
final boolean canFly;
if(allowFlying || plugin.hasPermission(player, PermissionData.PERMISSION_FLYING)) {
canFly = true;
data.jumpPhase = 0;
}
else
canFly = false;
final boolean canFakeSneak;
if(allowFakeSneak || plugin.hasPermission(player, PermissionData.PERMISSION_FAKESNEAK)) {
canFakeSneak = true;
}
else
canFakeSneak = false;
/**** Horizontal movement check START ****/
int vl1 = -1;
int violationLevelSneaking = -1;
//if(player.isSneaking())
if(false) // Currently disabled, still needs some additional work
vl1 = limitCheck(combined - (data.horizFreedom + sneakStepWidth), moveLimits);
else
vl1 = limitCheck(combined - (data.horizFreedom + stepWidth), moveLimits);
if(!canFakeSneak && player.isSneaking()) {
violationLevelSneaking = limitCheck(combined - (data.horizFreedom + sneakStepWidth), moveLimits);
if(violationLevelSneaking >= 0) {
if(combined >= data.sneakingLastDistance)
data.sneakingFreedomCounter -= 2;
else
{
violationLevelSneaking = -1;
}
}
data.sneakingLastDistance = combined;
}
if(violationLevelSneaking >= 0 && data.sneakingFreedomCounter > 0) {
violationLevelSneaking = -1;
}
else if(violationLevelSneaking < 0 && data.sneakingFreedomCounter < 10){
data.sneakingFreedomCounter += 1;
}
int violationLevelHorizontal = -1;
limitCheck(combined - (data.horizFreedom + stepWidth), moveLimits);
violationLevelHorizontal = violationLevelHorizontal > violationLevelSneaking ? violationLevelHorizontal : violationLevelSneaking;
// Reduce horiz moving freedom with each event
data.horizFreedom *= 0.9;
@ -148,16 +189,101 @@ public class MovingCheck extends Check {
/**** Horizontal movement check END ****/
/**** 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()), 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
final boolean onGroundFrom = playerIsOnGround(from.getWorld(), fromValues, from);
final boolean onGroundTo = playerIsOnGround(to.getWorld(), toValues, to);
int violationLevelVertical = -1;
int vl2 = -1;
// The location we'd use as a new setback if there are no violations
Location newSetBack = null;
double limit = calculateVerticalLimit(data, onGroundFrom, onGroundTo);
// Handle 4 distinct cases: Walk, Jump, Land, Fly
// Walk or start Jump
if(onGroundFrom)
{
limit += jumpHeight;
double distance = to.getY() - from.getY();
violationLevelVertical = limitCheck(distance - limit, heightLimits);
if(violationLevelVertical < 0)
{
// reset jumping
if(onGroundTo)
data.jumpPhase = 0; // Walk
else
data.jumpPhase = 1; // Jump
newSetBack = from.clone();
}
}
// Land or Fly/Fall
else
{
Location l = null;
if(data.setBackPoint == null || canFly)
l = from;
else
l = data.setBackPoint;
if(!canFly && data.jumpPhase > jumpingLimit)
limit += jumpHeight - (data.jumpPhase-jumpingLimit) * 0.2D;
else limit += jumpHeight;
if(onGroundTo) limit += stepHeight;
double distance = to.getY() - l.getY();
// Check if player isn't jumping too high
violationLevelVertical = limitCheck(distance - limit, heightLimits);
if(violationLevelVertical < 0) {
if(onGroundTo) { // Land
data.jumpPhase = 0; // He is on ground now, so reset the jump
newSetBack = to.clone();
}
else { // Fly
data.jumpPhase++; // Enter next phase of the flight
// If we have no setback point, create one now
if(data.setBackPoint == null) {
newSetBack = from.clone();
}
}
}
}
/**** Vertical movement check END ****/
/****** Violation Handling START *****/
int violationLevel = violationLevelHorizontal > violationLevelVertical ? violationLevelHorizontal : violationLevelVertical;
if(violationLevel < 0 && newSetBack != null) {
data.setBackPoint = newSetBack;
}
// If we haven't already got a setback point by now, make this location the new setback point
if(data.setBackPoint == null) {
data.setBackPoint = from.clone();
}
if(violationLevel >= 0) {
setupSummaryTask(event.getPlayer(), data);
boolean log = !(data.violationsInARow[violationLevel] > 0);
data.violationsInARow[violationLevel]++;
action(event, event.getPlayer(), from, to, actions[violationLevel], log, data);
}
/****** Violation Handling END *****/
statisticElapsedTimeNano += System.nanoTime() - startTime;
statisticTotalEvents++;
}
private double calculateVerticalLimit(MovingData data, boolean onGroundFrom, boolean onGroundTo) {
// A halfway lag-resistant method of allowing vertical acceleration without allowing blatant cheating
@ -189,109 +315,37 @@ public class MovingCheck extends Check {
data.vertFreedom = 0.0D;
}
// The location we'd use as a new setback if there are no violations
Location newSetBack = null;
// there's no use for counting this
if(canFly) data.jumpPhase = 0;
// Handle 4 distinct cases: Walk, Jump, Land, Fly
// Walk or start Jump
if(onGroundFrom)
{
limit += jumpHeight;
double distance = to.getY() - from.getY();
vl2 = limitCheck(distance - limit, heightLimits);
if(vl2 < 0)
{
// reset jumping
if(onGroundTo)
data.jumpPhase = 0; // Walk
else
data.jumpPhase = 1; // Jump
newSetBack = from.clone();
}
}
// Land or Fly/Fall
else
{
Location l = null;
if(data.setBackPoint == null || canFly)
l = from;
else
l = data.setBackPoint;
if(!canFly && data.jumpPhase > jumpingLimit)
limit += jumpHeight - (data.jumpPhase-jumpingLimit) * 0.2D;
else limit += jumpHeight;
if(onGroundTo) limit += stepHeight;
double distance = to.getY() - l.getY();
// Check if player isn't jumping too high
vl2 = limitCheck(distance - limit, heightLimits);
if(vl2 < 0) {
if(onGroundTo) { // Land
data.jumpPhase = 0; // He is on ground now, so reset the jump
newSetBack = to.clone();
}
else { // Fly
data.jumpPhase++; // Enter next phase of the flight
// If we have no setback point, create one now
if(data.setBackPoint == null) {
newSetBack = from.clone();
}
}
}
}
int vl = vl1 > vl2 ? vl1 : vl2;
if(vl < 0 && newSetBack != null) {
data.setBackPoint = newSetBack;
}
// If we haven't already got a setback point by now, make this location the new setback point
if(data.setBackPoint == null) {
data.setBackPoint = from.clone();
}
if(vl >= 0) {
setupSummaryTask(event.getPlayer(), data);
boolean log = !(data.violationsInARow[vl] > 0);
data.violationsInARow[vl]++;
action(event, event.getPlayer(), from, to, actions[vl], log, data);
}
statisticElapsedTimeNano += System.nanoTime() - startTime;
statisticTotalEvents++;
return limit;
}
/**
* Various corner cases that would cause this check to fail or require special treatment
* @param player
* @param data
* @param from
* @param to
* @return
*/
private boolean shouldBeIgnored(Player player, MovingData data, Location from, Location to) {
if(from.equals(to)) // Both locations are perfectly identical
// Identical locations - just ignore the event
if(from.equals(to))
return true;
else if(!from.equals(data.lastLocation)) { // The player was moved somehow without causing a move event
// Something or someone moved the player without causing a move event - Can't do much with that
else if(!from.equals(data.lastLocation)) {
resetData(data, to);
return true;
}
// Player was respawned just before, this causes all kinds of weirdness - better ignore it
else if(data.respawned) {
data.respawned = false;
return true;
}
// Player changed the world before, which makes any location information basically useless
else if(data.worldChanged) {
data.worldChanged = false;
return true;
}
// vehicles are a special case, I ignore them because the server controls them
// Player is inside a vehicle, this causes all kinds of weirdness - better ignore it
else if(player.isInsideVehicle()) {
return true;
}
@ -299,6 +353,12 @@ public class MovingCheck extends Check {
}
/**
* Register a task with bukkit that will be run a short time from now, displaying how many
* violations happened in that timeframe
* @param p
* @param data
*/
private void setupSummaryTask(final Player p, final MovingData data) {
// Setup task to display summary later
if(data.summaryTask == null) {
@ -358,6 +418,10 @@ public class MovingCheck extends Check {
}
}
/**
* Set a flag to declare that the player recently respawned
* @param event
*/
public void respawned(PlayerRespawnEvent event) {
MovingData data = MovingData.get(event.getPlayer());
@ -365,10 +429,16 @@ public class MovingCheck extends Check {
}
/**
* Update the cached values for players velocity to be prepared to
* give them additional movement freedom in their next move events
* @param v
* @param data
*/
public void updateVelocity(Vector v, MovingData data) {
// Compare the velocity vector to the existing movement freedom that we've from previous events
double tmp = (Math.abs(v.getX()) + Math.abs(v.getZ())) * 2D;
double tmp = (Math.abs(v.getX()) + Math.abs(v.getZ())) * 3D;
if(tmp > data.horizFreedom)
data.horizFreedom = tmp;
@ -376,6 +446,7 @@ public class MovingCheck extends Check {
data.maxYVelocity = v.getY();
}
}
/**
* Perform actions that were specified in the config file
* @param event
@ -408,6 +479,13 @@ public class MovingCheck extends Check {
}
}
/**
* Check a value against an array of sorted values to find out
* where it fits in
* @param value
* @param limits
* @return
*/
private int limitCheck(double value, double limits[]) {
for(int i = limits.length - 1; i >= 0; i--) {
@ -453,22 +531,23 @@ public class MovingCheck extends Check {
event.setTo(t);
event.setCancelled(true);
}
}
/**
* Check if certain coordinates are considered "on ground" or in air
* Check if certain coordinates are considered "on ground"
*
* @param w The world the coordinates belong to
* @param values The coordinates [lowerX, higherX, Y, lowerZ, higherZ]
* @param l The location that was used for calculation of "values"
* @param values The coordinates [lowerX, higherX, Y, lowerZ, higherZ] to be checked
* @param l The precise location that was used for calculation of "values"
* @return
*/
private static boolean playerIsOnGround(World w, int values[], Location l) {
BlockType types[] = MovingData.types;
// Check the four borders of the players hitbox for something he could be standing on
if(types[w.getBlockTypeIdAt(values[0], values[2]-1, values[3])] != BlockType.NONSOLID ||
types[w.getBlockTypeIdAt(values[1], values[2]-1, values[3])] != BlockType.NONSOLID ||
@ -514,6 +593,11 @@ public class MovingCheck extends Check {
return false;
}
/**
* Personal Rounding function to determine if a player is still touching a block or not
* @param d1
* @return
*/
private static int lowerBorder(double d1) {
double floor = Math.floor(d1);
double d4 = floor + magic;
@ -526,6 +610,11 @@ public class MovingCheck extends Check {
return (int) (floor - d4);
}
/**
* Personal Rounding function to determine if a player is still touching a block or not
* @param d1
* @return
*/
private static int upperBorder(double d1) {
double floor = Math.floor(d1);
double d4 = floor + magic2;
@ -538,8 +627,13 @@ public class MovingCheck extends Check {
return (int) (floor - d4);
}
/**
* Reset all temporary information of this check
* @param data
* @param l
*/
private void resetData(MovingData data, Location l) {
// If it wasn't our plugin that ordered the teleport, forget (almost) all our information and start from scratch
data.setBackPoint = l;
data.jumpPhase = 0;
data.teleportTo = null;

2
src/cc/co/evenprime/bukkit/nocheat/data/MovingData.java
View File

@ -19,6 +19,8 @@ public class MovingData {
public Runnable summaryTask = null;
public Level highestLogLevel = null;
public double maxYVelocity = 0.0D;
public int sneakingFreedomCounter = 10;
public double sneakingLastDistance = 0.0D;
public boolean worldChanged = false;
public boolean respawned = false;

8
src/cc/co/evenprime/bukkit/nocheat/data/PermissionData.java
View File

@ -6,10 +6,10 @@ import cc.co.evenprime.bukkit.nocheat.NoCheatData;
public class PermissionData {
public long lastUpdate[] = new long[8];
public boolean cache[] = new boolean[8];
public long lastUpdate[] = new long[9];
public boolean cache[] = new boolean[9];
public static final String[] permissionNames = new String[8];
public static final String[] permissionNames = new String[9];
public static final int PERMISSION_MOVING = 0;
public static final int PERMISSION_FLYING = 1;
@ -19,6 +19,7 @@ public class PermissionData {
public static final int PERMISSION_BOGUSITEMS = 5;
public static final int PERMISSION_NOTIFY = 6;
public static final int PERMISSION_ITEMDUPE = 7;
public static final int PERMISSION_FAKESNEAK = 8;
static {
permissionNames[PERMISSION_AIRBUILD] = "nocheat.airbuild";
@ -29,6 +30,7 @@ public class PermissionData {
permissionNames[PERMISSION_SPEEDHACK] = "nocheat.speedhack";
permissionNames[PERMISSION_NOTIFY] = "nocheat.notify";
permissionNames[PERMISSION_ITEMDUPE] = "nocheat.itemdupe";
permissionNames[PERMISSION_FAKESNEAK] = "nocheat.fakesneak";
}
public static PermissionData get(Player p) {