Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-28 22:47:32 +02:00
Code Issues Projects Releases Wiki Activity

New check "fight.godmode", new "secret" config options for movement

Browse Source 
speeds
This commit is contained in:
Evenprime 2012-02-11 23:31:43 +01:00
parent 72cefe94ed
commit 5c9d204ec9
13 changed files with 157 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.yml
View File

@ -82,6 +82,8 @@ permissions:
description: Allow a player to fight over bigger distances than usual
nocheat.checks.fight.speed:
description: Allow a player to attack faster than usual
nocheat.checks.fight.godmode:
description: Allow a player to not take damage by exploiting a design flaw in Minecraft
nocheat.checks.inventory:
description: Allow the player to bypass all inventory checks
children:

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cc.co.evenprime.bukkit</groupId>
<artifactId>NoCheat</artifactId>
<version>3.2.2</version>
<version>3.3.0</version>
<packaging>jar</packaging>
<name>NoCheat</name>
<properties>

1
src/cc/co/evenprime/bukkit/nocheat/checks/fight/DirectionCheck.java
View File

@ -80,6 +80,7 @@ public class DirectionCheck extends FightCheck {
return cc.directionCheck;
}
@Override
public String getParameter(ParameterName wildcard, NoCheatPlayer player) {
if(wildcard == ParameterName.VIOLATIONS)

36
src/cc/co/evenprime/bukkit/nocheat/checks/fight/FightCheckListener.java
View File

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@ -21,6 +22,8 @@ import cc.co.evenprime.bukkit.nocheat.config.Permissions;
public class FightCheckListener implements Listener, EventManager {
private final List<FightCheck> checks;
private final GodmodeCheck godmodeCheck;
private final NoCheat plugin;
public FightCheckListener(NoCheat plugin) {
@ -31,15 +34,18 @@ public class FightCheckListener implements Listener, EventManager {
this.checks.add(new DirectionCheck(plugin));
this.checks.add(new ReachCheck(plugin));
this.godmodeCheck = new GodmodeCheck(plugin);
this.plugin = plugin;
}
@EventHandler(priority = EventPriority.LOWEST)
public void entityDamage(final EntityDamageEvent event) {
if(event.isCancelled() || !(event instanceof EntityDamageByEntityEvent))
return;
EntityDamageByEntityEvent e = (EntityDamageByEntityEvent) event;
final EntityDamageByEntityEvent e = (EntityDamageByEntityEvent) event;
if(!(e.getDamager() instanceof Player)) {
return;
}
@ -51,6 +57,32 @@ public class FightCheckListener implements Listener, EventManager {
}
}
@EventHandler(priority = EventPriority.LOW)
public void entityDamageForGodmodeCheck(final EntityDamageEvent event) {
if(event.isCancelled())
return;
final Entity entity = event.getEntity();
if(!(entity instanceof Player) || entity.isDead()) {
return;
}
NoCheatPlayer player = plugin.getPlayer((Player) entity);
FightConfig cc = FightCheck.getConfig(player.getConfigurationStore());
if(!godmodeCheck.isEnabled(cc) || player.hasPermission(godmodeCheck.getPermission())) {
return;
}
FightData data = FightCheck.getData(player.getDataStore());
boolean cancelled = godmodeCheck.check(plugin.getPlayer((Player) entity), data, cc);
if(cancelled) {
// Remove the invulnerability from the player
player.getPlayer().setNoDamageTicks(0);
}
}
private void normalDamage(final EntityDamageByEntityEvent event) {
final Player damager = (Player) event.getDamager();
@ -120,6 +152,8 @@ public class FightCheckListener implements Listener, EventManager {
s.add("fight.reach");
if(f.speedCheck)
s.add("fight.speed");
if(f.godmodeCheck)
s.add("fight.godmode");
return s;
}
}

5
src/cc/co/evenprime/bukkit/nocheat/checks/fight/FightConfig.java
View File

@ -20,6 +20,8 @@ public class FightConfig implements ConfigItem {
public final int speedAttackLimit;
public final ActionList speedActions;
public final boolean speedCheck;
public final boolean godmodeCheck;
public final ActionList godmodeActions;
public final boolean damageChecks;
@ -39,6 +41,9 @@ public class FightConfig implements ConfigItem {
speedActions = data.getActionList(ConfPaths.FIGHT_SPEED_ACTIONS);
speedAttackLimit = data.getInt(ConfPaths.FIGHT_SPEED_ATTACKLIMIT);
godmodeCheck = data.getBoolean(ConfPaths.FIGHT_GODMODE_CHECK);
godmodeActions = data.getActionList(ConfPaths.FIGHT_GODMODE_ACTIONS);
damageChecks = directionCheck || noswingCheck || reachCheck || speedCheck;
}
}

9
src/cc/co/evenprime/bukkit/nocheat/checks/fight/FightData.java
View File

@ -9,14 +9,19 @@ public class FightData implements DataItem {
public double noswingVL;
public double reachVL;
public int speedVL;
public double godmodeVL;
public long directionLastViolationTime;
public long reachLastViolationTime;
public long godmodeLastDamageTime;
public int godmodeLastAge;
public int godmodeBuffer = 40;
public Entity damagee;
public boolean armswung = true;
public boolean skipNext = false;
public boolean armswung = true;
public boolean skipNext = false;
public long speedTime;
public int speedAttackCount;
}

76
src/cc/co/evenprime/bukkit/nocheat/checks/fight/GodmodeCheck.java Normal file
View File

@ -0,0 +1,76 @@
package cc.co.evenprime.bukkit.nocheat.checks.fight;
import java.util.Locale;
import cc.co.evenprime.bukkit.nocheat.NoCheat;
import cc.co.evenprime.bukkit.nocheat.NoCheatPlayer;
import cc.co.evenprime.bukkit.nocheat.actions.ParameterName;
import cc.co.evenprime.bukkit.nocheat.config.Permissions;
import cc.co.evenprime.bukkit.nocheat.data.Statistics;
public class GodmodeCheck extends FightCheck {
public GodmodeCheck(NoCheat plugin) {
super(plugin, "fight.godmode", Permissions.FIGHT_GODMODE);
}
@Override
public boolean check(NoCheatPlayer player, FightData data, FightConfig cc) {
boolean cancelled = false;
long time = System.currentTimeMillis();
// Check at most once a second
if(data.godmodeLastDamageTime + 1000 < time) {
data.godmodeLastDamageTime = time;
// How old is the player now?
int age = player.getTicksLived();
// How much older did he get?
int ageDiff = Math.max(0, age - data.godmodeLastAge);
// Is he invulnerable?
int nodamageTicks = player.getPlayer().getNoDamageTicks();
if(nodamageTicks > 0 && ageDiff < 15) {
// He is invulnerable and didn't age fast enough, that costs some points
data.godmodeBuffer -= (15 - ageDiff);
// Still points left?
if(data.godmodeBuffer <= 0) {
// No
data.godmodeVL -= data.godmodeBuffer;
incrementStatistics(player, Statistics.Id.FI_GODMODE, -data.godmodeBuffer);
cancelled = executeActions(player, cc.godmodeActions.getActions(data.godmodeVL));
}
} else {
// Give some new points, once a second
data.godmodeBuffer += 15;
data.godmodeVL *= 0.95;
}
if(data.godmodeBuffer < 0) {
data.godmodeBuffer = 0;
} else if(data.godmodeBuffer > 40) {
data.godmodeBuffer = 40;
}
// Start age counting from a new time
data.godmodeLastAge = age;
}
return cancelled;
}
@Override
public boolean isEnabled(FightConfig cc) {
return cc.godmodeCheck;
}
@Override
public String getParameter(ParameterName wildcard, NoCheatPlayer player) {
if(wildcard == ParameterName.VIOLATIONS)
return String.format(Locale.US, "%d", (int) getData(player.getDataStore()).godmodeVL);
else
return super.getParameter(wildcard, player);
}
}

1
src/cc/co/evenprime/bukkit/nocheat/checks/moving/MovingCheckListener.java
View File

@ -102,6 +102,7 @@ public class MovingCheckListener implements Listener, EventManager {
@EventHandler(priority = EventPriority.MONITOR)
public void worldChange(final PlayerChangedWorldEvent event) {
// Maybe this helps with people teleporting through multiverse portals having problems?
final MovingData data = MovingCheck.getData(plugin.getPlayer(event.getPlayer()).getDataStore());
data.teleportTo.reset();
data.clearRunFlyData();

17
src/cc/co/evenprime/bukkit/nocheat/checks/moving/MovingConfig.java
View File

@ -43,14 +43,19 @@ public class MovingConfig implements ConfigItem {
identifyCreativeMode = data.getBoolean(ConfPaths.MOVING_RUNFLY_FLYING_ALLOWINCREATIVE);
runflyCheck = data.getBoolean(ConfPaths.MOVING_RUNFLY_CHECK);
walkingSpeedLimit = ((double) 22) / 100D;
sprintingSpeedLimit = ((double) 35) / 100D;
jumpheight = ((double) 135) / 100D;
actions = data.getActionList(ConfPaths.MOVING_RUNFLY_ACTIONS);
swimmingSpeedLimit = ((double) 18) / 100D;
int walkspeed = data.getInt(ConfPaths.MOVING_RUNFLY_WALKSPEED, 100);
int sprintspeed = data.getInt(ConfPaths.MOVING_RUNFLY_SPRINTSPEED, 100);
int swimspeed = data.getInt(ConfPaths.MOVING_RUNFLY_SWIMSPEED, 100);
int sneakspeed = data.getInt(ConfPaths.MOVING_RUNFLY_SNEAKSPEED, 100);
walkingSpeedLimit = ((double) 0.22 * walkspeed) / 100D;
sprintingSpeedLimit = ((double) 0.35 * sprintspeed) / 100D;
swimmingSpeedLimit = ((double) 0.18 * swimspeed) / 100D;
sneakingSpeedLimit = ((double) 0.14 * sneakspeed) / 100D;
jumpheight = ((double) 135) / 100D;
sneakingCheck = !data.getBoolean(ConfPaths.MOVING_RUNFLY_ALLOWFASTSNEAKING);
sneakingSpeedLimit = ((double) 14) / 100D;
actions = data.getActionList(ConfPaths.MOVING_RUNFLY_ACTIONS);
allowFlying = data.getBoolean(ConfPaths.MOVING_RUNFLY_FLYING_ALLOWALWAYS);
flyingSpeedLimitVertical = ((double) data.getInt(ConfPaths.MOVING_RUNFLY_FLYING_SPEEDLIMITVERTICAL)) / 100D;

11
src/cc/co/evenprime/bukkit/nocheat/config/ConfPaths.java
View File

@ -38,6 +38,13 @@ public abstract class ConfPaths {
private final static String MOVING_RUNFLY = MOVING + "runfly.";
public final static String MOVING_RUNFLY_CHECK = MOVING_RUNFLY + "active";
// These four are not automatically shown in the config
public final static String MOVING_RUNFLY_WALKSPEED = MOVING_RUNFLY + "walkspeed";
public final static String MOVING_RUNFLY_SNEAKSPEED = MOVING_RUNFLY + "sneakspeed";
public final static String MOVING_RUNFLY_SWIMSPEED = MOVING_RUNFLY + "swimspeed";
public final static String MOVING_RUNFLY_SPRINTSPEED = MOVING_RUNFLY + "sprintspeed";
public final static String MOVING_RUNFLY_ALLOWFASTSNEAKING = MOVING_RUNFLY + "allowfastsneaking";
public final static String MOVING_RUNFLY_ACTIONS = MOVING_RUNFLY + "actions";
@ -122,6 +129,10 @@ public abstract class ConfPaths {
public final static String FIGHT_SPEED_ATTACKLIMIT = FIGHT_SPEED + "attacklimit";
public final static String FIGHT_SPEED_ACTIONS = FIGHT_SPEED + "actions";
private final static String FIGHT_GODMODE = FIGHT + "godmode.";
public static final String FIGHT_GODMODE_CHECK = FIGHT_GODMODE + "active";
public final static String FIGHT_GODMODE_ACTIONS = FIGHT_GODMODE + "actions";
public final static String STRINGS = "strings";
}

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

@ -107,6 +107,9 @@ public class DefaultConfiguration extends NoCheatConfiguration {
set(ConfPaths.FIGHT_SPEED_CHECK, true);
set(ConfPaths.FIGHT_SPEED_ATTACKLIMIT, 15);
set(ConfPaths.FIGHT_SPEED_ACTIONS, "log:fspeed:0:5:if cancel");
set(ConfPaths.FIGHT_GODMODE_CHECK, true);
set(ConfPaths.FIGHT_GODMODE_ACTIONS, "log:fgod:2:5:if cancel");
set(ConfPaths.STRINGS + ".drop", "[player] failed [check]: Tried to drop more items than allowed. VL [violations]");
set(ConfPaths.STRINGS + ".moveshort", "[player] failed [check]. VL [violations]");
@ -124,6 +127,7 @@ public class DefaultConfiguration extends NoCheatConfiguration {
set(ConfPaths.STRINGS + ".freach", "[player] failed [check]: tried to attack entity out of reach. VL [violations]");
set(ConfPaths.STRINGS + ".fspeed", "[player] failed [check]: tried to attack more than [limit] times per second. VL [violations]");
set(ConfPaths.STRINGS + ".fnoswing", "[player] failed [check]: Didn't swing arm. VL [violations]");
set(ConfPaths.STRINGS + ".fgod", "[player] failed [check]: Avoided taking damage or lagging. VL [violations]");
set(ConfPaths.STRINGS + ".ibow", "[player] failed [check]: Fires bow to fast. VL [violations]");
set(ConfPaths.STRINGS + ".ieat", "[player] failed [check]: Eats food [food] too fast. VL [violations]");
set(ConfPaths.STRINGS + ".kick", "kick [player]");

1
src/cc/co/evenprime/bukkit/nocheat/config/Permissions.java
View File

@ -36,6 +36,7 @@ public class Permissions {
public static final String FIGHT_NOSWING = FIGHT + ".noswing";
public static final String FIGHT_REACH = FIGHT + ".reach";
public static final String FIGHT_SPEED = FIGHT + ".speed";
public static final String FIGHT_GODMODE = FIGHT + ".godmode";
public final static String ADMIN_CHATLOG = ADMIN + ".chatlog";
public static final String ADMIN_COMMANDS = ADMIN + ".commands";

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

@ -18,7 +18,8 @@ public class Statistics {
INV_BOW("inventory.instantbow"), INV_EAT("inventory.instanteat"),
MOV_RUNNING("moving.running"), MOV_FLYING("moving.flying"),
MOV_MOREPACKETS("moving.morepackets"), MOV_NOFALL("moving.nofall"),
MOV_SNEAKING("moving.sneaking"), MOV_SWIMMING("moving.swimming");
MOV_SNEAKING("moving.sneaking"), MOV_SWIMMING("moving.swimming"),
FI_GODMODE("fight.godmode");
private final String name;