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

Make boatsanywhere configurable.

Browse Source
This commit is contained in:
asofold 2016-06-03 08:59:10 +02:00
parent 4e91a9d5fc
commit 6e688cc3ff
5 changed files with 96 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/blockplace/BlockPlaceConfig.java
View File

@ -102,42 +102,46 @@ public class BlockPlaceConfig extends ACheckConfig {
public final long speedInterval;
public final ActionList speedActions;
public final boolean preventBoatsAnywhere;
/**
* Instantiates a new block place configuration.
*
* @param data
* the data
* @param config
*
*/
public BlockPlaceConfig(final ConfigFile data) {
super(data, ConfPaths.BLOCKPLACE);
public BlockPlaceConfig(final ConfigFile config) {
super(config, ConfPaths.BLOCKPLACE);
againstCheck = data.getBoolean(ConfPaths.BLOCKPLACE_AGAINST_CHECK);
againstActions = data.getOptimizedActionList(ConfPaths.BLOCKPLACE_AGAINST_ACTIONS, Permissions.BLOCKPLACE_AGAINST);
againstCheck = config.getBoolean(ConfPaths.BLOCKPLACE_AGAINST_CHECK);
againstActions = config.getOptimizedActionList(ConfPaths.BLOCKPLACE_AGAINST_ACTIONS, Permissions.BLOCKPLACE_AGAINST);
autoSignCheck = data.getBoolean(ConfPaths.BLOCKPLACE_AUTOSIGN_CHECK);
autoSignSkipEmpty = data.getBoolean(ConfPaths.BLOCKPLACE_AUTOSIGN_SKIPEMPTY);
autoSignActions = data.getOptimizedActionList(ConfPaths.BLOCKPLACE_AUTOSIGN_ACTIONS, Permissions.BLOCKPLACE_AUTOSIGN);
autoSignCheck = config.getBoolean(ConfPaths.BLOCKPLACE_AUTOSIGN_CHECK);
autoSignSkipEmpty = config.getBoolean(ConfPaths.BLOCKPLACE_AUTOSIGN_SKIPEMPTY);
autoSignActions = config.getOptimizedActionList(ConfPaths.BLOCKPLACE_AUTOSIGN_ACTIONS, Permissions.BLOCKPLACE_AUTOSIGN);
directionCheck = data.getBoolean(ConfPaths.BLOCKPLACE_DIRECTION_CHECK);
directionActions = data.getOptimizedActionList(ConfPaths.BLOCKPLACE_DIRECTION_ACTIONS, Permissions.BLOCKPLACE_DIRECTION);
directionCheck = config.getBoolean(ConfPaths.BLOCKPLACE_DIRECTION_CHECK);
directionActions = config.getOptimizedActionList(ConfPaths.BLOCKPLACE_DIRECTION_ACTIONS, Permissions.BLOCKPLACE_DIRECTION);
fastPlaceCheck = data.getBoolean(ConfPaths.BLOCKPLACE_FASTPLACE_CHECK);
fastPlaceLimit = data.getInt(ConfPaths.BLOCKPLACE_FASTPLACE_LIMIT);
fastPlaceShortTermTicks = data.getInt(ConfPaths.BLOCKPLACE_FASTPLACE_SHORTTERM_TICKS);
fastPlaceShortTermLimit = data.getInt(ConfPaths.BLOCKPLACE_FASTPLACE_SHORTTERM_LIMIT);
fastPlaceActions = data.getOptimizedActionList(ConfPaths.BLOCKPLACE_FASTPLACE_ACTIONS, Permissions.BLOCKPLACE_FASTPLACE);
fastPlaceCheck = config.getBoolean(ConfPaths.BLOCKPLACE_FASTPLACE_CHECK);
fastPlaceLimit = config.getInt(ConfPaths.BLOCKPLACE_FASTPLACE_LIMIT);
fastPlaceShortTermTicks = config.getInt(ConfPaths.BLOCKPLACE_FASTPLACE_SHORTTERM_TICKS);
fastPlaceShortTermLimit = config.getInt(ConfPaths.BLOCKPLACE_FASTPLACE_SHORTTERM_LIMIT);
fastPlaceActions = config.getOptimizedActionList(ConfPaths.BLOCKPLACE_FASTPLACE_ACTIONS, Permissions.BLOCKPLACE_FASTPLACE);
noSwingCheck = data.getBoolean(ConfPaths.BLOCKPLACE_NOSWING_CHECK);
data.readMaterialFromList(ConfPaths.BLOCKPLACE_NOSWING_EXCEPTIONS, noSwingExceptions);
noSwingActions = data.getOptimizedActionList(ConfPaths.BLOCKPLACE_NOSWING_ACTIONS, Permissions.BLOCKPLACE_NOSWING);
noSwingCheck = config.getBoolean(ConfPaths.BLOCKPLACE_NOSWING_CHECK);
config.readMaterialFromList(ConfPaths.BLOCKPLACE_NOSWING_EXCEPTIONS, noSwingExceptions);
noSwingActions = config.getOptimizedActionList(ConfPaths.BLOCKPLACE_NOSWING_ACTIONS, Permissions.BLOCKPLACE_NOSWING);
reachCheck = data.getBoolean(ConfPaths.BLOCKPLACE_REACH_CHECK);
reachActions = data.getOptimizedActionList(ConfPaths.BLOCKPLACE_REACH_ACTIONS, Permissions.BLOCKPLACE_REACH);
reachCheck = config.getBoolean(ConfPaths.BLOCKPLACE_REACH_CHECK);
reachActions = config.getOptimizedActionList(ConfPaths.BLOCKPLACE_REACH_ACTIONS, Permissions.BLOCKPLACE_REACH);
speedCheck = data.getBoolean(ConfPaths.BLOCKPLACE_SPEED_CHECK);
speedInterval = data.getLong(ConfPaths.BLOCKPLACE_SPEED_INTERVAL);
speedActions = data.getOptimizedActionList(ConfPaths.BLOCKPLACE_SPEED_ACTIONS, Permissions.BLOCKPLACE_SPEED);
speedCheck = config.getBoolean(ConfPaths.BLOCKPLACE_SPEED_CHECK);
speedInterval = config.getLong(ConfPaths.BLOCKPLACE_SPEED_INTERVAL);
speedActions = config.getOptimizedActionList(ConfPaths.BLOCKPLACE_SPEED_ACTIONS, Permissions.BLOCKPLACE_SPEED);
preventBoatsAnywhere = config.getBoolean(ConfPaths.BLOCKPLACE_PREVENTMISC_BOATSANYWHERE);
}
/* (non-Javadoc)

113
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/blockplace/BlockPlaceListener.java
View File

@ -61,13 +61,13 @@ public class BlockPlaceListener extends CheckListener {
return p1 * x ^ p2 * y ^ p3 * z;
}
public static int getCoordHash(final Block block){
public static int getCoordHash(final Block block) {
return getHash(block.getX(), block.getY(), block.getZ());
}
public static int getBlockPlaceHash(final Block block, final Material mat){
public static int getBlockPlaceHash(final Block block, final Material mat) {
int hash = getCoordHash(block);
if (mat != null){
if (mat != null) {
hash |= mat.name().hashCode();
}
hash |= block.getWorld().getName().hashCode();
@ -105,7 +105,7 @@ public class BlockPlaceListener extends CheckListener {
private final Class<?> blockMultiPlaceEvent = ReflectionUtil.getClass("org.bukkit.event.block.BlockMultiPlaceEvent");
private final boolean hasReplacedState = ReflectionUtil.getMethodNoArgs(BlockPlaceEvent.class, "getReplacedState", BlockState.class) != null;
public BlockPlaceListener(){
public BlockPlaceListener() {
super(CheckType.BLOCKPLACE);
}
@ -152,7 +152,7 @@ public class BlockPlaceListener extends CheckListener {
shouldSkipSome = false;
}
if (placedMat == Material.SIGN){
if (placedMat == Material.SIGN) {
// Might move to MONITOR priority.
data.autoSignPlacedTime = System.currentTimeMillis();
// Always hash as sign post for improved compatibility with Lockette etc.
@ -160,10 +160,11 @@ public class BlockPlaceListener extends CheckListener {
}
// Fast place check.
if (fastPlace.isEnabled(player)){
if (fastPlace.isEnabled(player)) {
if (fastPlace.check(player, block, data, cc)) {
cancelled = true;
} else {
}
else {
// Feed the improbable.
Improbable.feed(player, 0.5f, System.currentTimeMillis());
}
@ -193,7 +194,8 @@ public class BlockPlaceListener extends CheckListener {
// If one of the checks requested to cancel the event, do so.
if (cancelled) {
event.setCancelled(cancelled);
} else {
}
else {
// Debug log (only if not cancelled, to avoid spam).
if (data.debug) {
debug(player, "Block place(" + placedMat + "): " + block.getX() + ", " + block.getY() + ", " + block.getZ());
@ -204,8 +206,8 @@ public class BlockPlaceListener extends CheckListener {
}
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onSignChange(final SignChangeEvent event){
if (event.getClass() != SignChangeEvent.class){
public void onSignChange(final SignChangeEvent event) {
if (event.getClass() != SignChangeEvent.class) {
// Built in plugin compatibility.
// TODO: Don't understand why two consecutive events editing the same block are a problem.
return;
@ -213,11 +215,11 @@ public class BlockPlaceListener extends CheckListener {
final Player player = event.getPlayer();
final Block block = event.getBlock();
final String[] lines = event.getLines();
if (block == null || lines == null || player == null){
if (block == null || lines == null || player == null) {
// Somewhat defensive.
return;
}
if (autoSign.isEnabled(player) && autoSign.check(player, block, lines)){
if (autoSign.isEnabled(player) && autoSign.check(player, block, lines)) {
event.setCancelled(true);
}
}
@ -258,42 +260,48 @@ public class BlockPlaceListener extends CheckListener {
return;
}
final BlockPlaceConfig cc = BlockPlaceConfig.getConfig(player);
final Material type = stack.getType();
if (type == Material.BOAT) {
// Check boats-anywhere.
final org.bukkit.block.Block block = event.getClickedBlock();
final Material mat = block.getType();
// TODO: allow lava ?
if (mat == Material.WATER || mat == Material.STATIONARY_WATER) {
return;
if (cc.preventBoatsAnywhere) {
checkBoatsAnywhere(player, event);
}
final org.bukkit.block.Block relBlock = block.getRelative(event.getBlockFace());
final Material relMat = relBlock.getType();
// TODO: Placing inside of water, but not "against" ?
if (relMat == Material.WATER || relMat == Material.STATIONARY_WATER) {
return;
}
// TODO: Add a check type for exemption?
if (!player.hasPermission(Permissions.BLOCKPLACE_BOATSANYWHERE)) {
final Result previousUseBlock = event.useInteractedBlock();
event.setCancelled(true);
event.setUseItemInHand(Result.DENY);
event.setUseInteractedBlock(previousUseBlock == Result.DEFAULT ? Result.ALLOW : previousUseBlock);
counters.addPrimaryThread(idBoatsAnywhere, 1);
}
}
else if (type == Material.MONSTER_EGG) {
// Check blockplace.speed.
if (speed.isEnabled(player) && speed.check(player)) {
if (speed.isEnabled(player, cc) && speed.check(player, cc)) {
// If the check was positive, cancel the event.
event.setCancelled(true);
}
}
}
}
private void checkBoatsAnywhere(final Player player, final PlayerInteractEvent event) {
// Check boats-anywhere.
final org.bukkit.block.Block block = event.getClickedBlock();
final Material mat = block.getType();
// TODO: allow lava ?
if (mat == Material.WATER || mat == Material.STATIONARY_WATER) {
return;
}
final org.bukkit.block.Block relBlock = block.getRelative(event.getBlockFace());
final Material relMat = relBlock.getType();
// TODO: Placing inside of water, but not "against" ?
if (relMat == Material.WATER || relMat == Material.STATIONARY_WATER) {
return;
}
// TODO: Add a check type for exemption?
if (!player.hasPermission(Permissions.BLOCKPLACE_BOATSANYWHERE)) {
final Result previousUseBlock = event.useInteractedBlock();
event.setCancelled(true);
event.setUseItemInHand(Result.DENY);
event.setUseInteractedBlock(previousUseBlock == Result.DEFAULT ? Result.ALLOW : previousUseBlock);
counters.addPrimaryThread(idBoatsAnywhere, 1);
}
}
/**
@ -332,48 +340,49 @@ public class BlockPlaceListener extends CheckListener {
}
// Do the actual check...
final BlockPlaceConfig cc = BlockPlaceConfig.getConfig(player);
boolean cancel = false;
if (speed.isEnabled(player)){
if (speed.isEnabled(player)) {
final long now = System.currentTimeMillis();
final Location loc = player.getLocation(useLoc);
if (Combined.checkYawRate(player, loc.getYaw(), now, loc.getWorld().getName())){
if (Combined.checkYawRate(player, loc.getYaw(), now, loc.getWorld().getName())) {
// Yawrate (checked extra).
cancel = true;
}
if (speed.check(player)){
if (speed.check(player, cc)) {
// If the check was positive, cancel the event.
cancel = true;
}
else if (Improbable.check(player, 0.6f, now, "blockplace.speed")){
else if (Improbable.check(player, 0.6f, now, "blockplace.speed")) {
// Combined fighting speed.
cancel = true;
}
}
// Ender pearl glitch (ab-) use.
if (!cancel && type == EntityType.ENDER_PEARL){
if (!CombinedConfig.getConfig(player).enderPearlCheck){
if (!cancel && type == EntityType.ENDER_PEARL) {
if (!CombinedConfig.getConfig(player).enderPearlCheck) {
// Do nothing !
// TODO: Might have further flags?
}
else if (!BlockProperties.isPassable(projectile.getLocation(useLoc))){
else if (!BlockProperties.isPassable(projectile.getLocation(useLoc))) {
// Launch into a block.
// TODO: This might be a general check later.
cancel = true;
}
else{
if (!BlockProperties.isPassable(player.getEyeLocation(), projectile.getLocation(useLoc))){
else {
if (!BlockProperties.isPassable(player.getEyeLocation(), projectile.getLocation(useLoc))) {
// (Spare a useLoc2, for this is seldom rather.)
// Something between player
// TODO: This might be a general check later.
cancel = true;
}
else{
else {
final Material mat = player.getLocation(useLoc).getBlock().getType();
final long flags = BlockProperties.F_CLIMBABLE | BlockProperties.F_LIQUID | BlockProperties.F_IGN_PASSABLE;
if (!BlockProperties.isAir(mat) && (BlockProperties.getBlockFlags(mat) & flags) == 0 && !mcAccess.hasGravity(mat)){
if (!BlockProperties.isAir(mat) && (BlockProperties.getBlockFlags(mat) & flags) == 0 && !mcAccess.hasGravity(mat)) {
// Still fails on piston traps etc.
if (!BlockProperties.isPassable(player.getLocation(), projectile.getLocation()) && !BlockProperties.isOnGroundOrResetCond(player, player.getLocation(), MovingConfig.getConfig(player).yOnGround)){
if (!BlockProperties.isPassable(player.getLocation(), projectile.getLocation()) && !BlockProperties.isOnGroundOrResetCond(player, player.getLocation(), MovingConfig.getConfig(player).yOnGround)) {
cancel = true;
}
}
@ -385,7 +394,7 @@ public class BlockPlaceListener extends CheckListener {
}
// Cancelled ?
if (cancel){
if (cancel) {
event.setCancelled(true);
}
// Cleanup.

4
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/blockplace/Speed.java
View File

@ -36,10 +36,10 @@ public class Speed extends Check {
*
* @param player
* the player
* @param cc
* @return true, if successful
*/
public boolean check(final Player player) {
final BlockPlaceConfig cc = BlockPlaceConfig.getConfig(player);
public boolean check(final Player player, final BlockPlaceConfig cc) {
final BlockPlaceData data = BlockPlaceData.getData(player);
boolean cancel = false;

3
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
View File

@ -266,6 +266,9 @@ public abstract class ConfPaths {
public static final String BLOCKPLACE_SPEED_INTERVAL = BLOCKPLACE_SPEED + "interval";
public static final String BLOCKPLACE_SPEED_ACTIONS = BLOCKPLACE_SPEED + "actions";
private static final String BLOCKPLACE_PREVENTMISC = BLOCKPLACE + "preventmisc.";
public static final String BLOCKPLACE_PREVENTMISC_BOATSANYWHERE = BLOCKPLACE_PREVENTMISC + "boatsanywhere";
public static final String CHAT = CHECKS + "chat.";
private static final String CHAT_CAPTCHA = CHAT + "captcha.";

2
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java
View File

@ -164,6 +164,8 @@ public class DefaultConfig extends ConfigFile {
set(ConfPaths.BLOCKPLACE_SPEED_ACTIONS,
"cancel vl>150 log:bpspeed:3:5:if cancel vl>1000 log:bpspeed:3:5:cif cancel");
set(ConfPaths.BLOCKPLACE_PREVENTMISC_BOATSANYWHERE, true);
// Captcha.
set(ConfPaths.CHAT_CAPTCHA_CHECK, false);
set(ConfPaths.CHAT_CAPTCHA_SKIP_COMMANDS, false);