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

Extend debug logging for blockinteract (rate limited).

Browse Source
This commit is contained in:
asofold 2016-06-13 13:44:21 +02:00
parent bddd898857
commit e543d905dd
4 changed files with 91 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/blockinteract/BlockInteractData.java
View File

@ -86,7 +86,7 @@ public class BlockInteractData extends ACheckData {
public int lastY, lastZ;
/** null for air */
public Material lastType = null;
public long lastTick;
public int lastTick;
public Action lastAction = null;
// Data of the reach check.
@ -97,6 +97,15 @@ public class BlockInteractData extends ACheckData {
/** Number of interactions since last reset-time. */
public int speedCount = 0;
/** Cancel is set, times in a row. */
public int subsequentCancel = 0;
/**
* Skipped actions due to rate limiting (debugging rather). May be reset
* with logging.
*/
public int rateLimitSkip = 0;
public BlockInteractData(final BlockInteractConfig config) {
super(config);
}

48
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/blockinteract/BlockInteractListener.java
View File

@ -30,6 +30,7 @@ import fr.neatmonster.nocheatplus.NCPAPIProvider;
import fr.neatmonster.nocheatplus.checks.CheckListener;
import fr.neatmonster.nocheatplus.checks.CheckType;
import fr.neatmonster.nocheatplus.checks.combined.CombinedConfig;
import fr.neatmonster.nocheatplus.checks.moving.location.LocUtil;
import fr.neatmonster.nocheatplus.compat.Bridge1_9;
import fr.neatmonster.nocheatplus.compat.BridgeHealth;
import fr.neatmonster.nocheatplus.stats.Counters;
@ -94,7 +95,9 @@ public class BlockInteractListener extends CheckListener {
}
final BlockInteractData data = BlockInteractData.getData(player);
final int previousLastTick = data.lastTick;
data.setLastBlock(block, action);
final BlockFace face = event.getBlockFace();
switch(action) {
case LEFT_CLICK_BLOCK:
break;
@ -105,6 +108,10 @@ public class BlockInteractListener extends CheckListener {
final CombinedConfig ccc = CombinedConfig.getConfig(player);
if (ccc.enderPearlCheck && ccc.enderPearlPreventClickBlock) {
event.setUseItemInHand(Result.DENY);
if (data.debug) {
final BlockInteractConfig cc = BlockInteractConfig.getConfig(player);
genericDebug(player, block, face, event, "click block: deny use ender pearl", previousLastTick, data, cc);
}
}
}
}
@ -114,6 +121,7 @@ public class BlockInteractListener extends CheckListener {
}
if (event.isCancelled() && event.useInteractedBlock() != Result.ALLOW) {
data.subsequentCancel ++;
return;
}
@ -121,7 +129,6 @@ public class BlockInteractListener extends CheckListener {
boolean cancelled = false;
boolean preventUseItem = false;
final BlockFace face = event.getBlockFace();
final Location loc = player.getLocation(useLoc);
// Interaction speed.
@ -150,6 +157,9 @@ public class BlockInteractListener extends CheckListener {
if (event.isCancelled()) {
// Just prevent using the block.
event.setUseInteractedBlock(Result.DENY);
if (data.debug) {
genericDebug(player, block, face, event, "already cancelled: deny use block", previousLastTick, data, cc);
}
} else {
final Result previousUseItem = event.useItemInHand();
event.setCancelled(true);
@ -160,14 +170,50 @@ public class BlockInteractListener extends CheckListener {
|| !CheckUtils.isConsumable(Bridge1_9.getUsedItem(player, event))
) {
event.setUseItemInHand(Result.DENY);
if (data.debug) {
genericDebug(player, block, face, event, "deny item use", previousLastTick, data, cc);
}
}
else {
// Consumable and not prevented otherwise.
// TODO: Ender pearl?
event.setUseItemInHand(Result.ALLOW);
if (data.debug) {
genericDebug(player, block, face, event, "allow edible item use", previousLastTick, data, cc);
}
}
}
data.subsequentCancel ++;
}
else {
data.subsequentCancel = 0;
}
useLoc.setWorld(null);
}
private void genericDebug(final Player player, final Block block, final BlockFace face,
final PlayerInteractEvent event, final String tag, final int previousLastTick,
final BlockInteractData data, final BlockInteractConfig cc) {
final StringBuilder builder = new StringBuilder(512);
// Rate limit.
if (data.lastTick == previousLastTick && data.subsequentCancel > 0) {
data.rateLimitSkip ++;
return;
}
// Debug log.
builder.append("Interact cancel: " + event.isCancelled());
builder.append(" (");
builder.append(tag);
builder.append(") block: ");
builder.append(block.getWorld().getName() + "/" + LocUtil.simpleFormat(block));
builder.append(" type: " + BlockProperties.getId(block.getType()));
builder.append(" data: " + BlockProperties.getData(block));
builder.append(" face: " + face);
if (data.rateLimitSkip > 0) {
builder.append(" skipped(rate-limit: " + data.rateLimitSkip);
data.rateLimitSkip = 0;
}
debug(player, builder.toString());
}
}

20
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/location/LocUtil.java
View File

@ -16,7 +16,9 @@ package fr.neatmonster.nocheatplus.checks.moving.location;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
import fr.neatmonster.nocheatplus.components.location.IGetBlockPosition;
import fr.neatmonster.nocheatplus.components.location.IGetLocationWithLook;
import fr.neatmonster.nocheatplus.components.location.IGetPositionWithLook;
import fr.neatmonster.nocheatplus.components.location.ISetPositionWithLook;
@ -372,4 +374,22 @@ public class LocUtil {
return "x=" + loc.getX() + ",y=" + loc.getY() + ",z=" + loc.getZ();
}
/**
* Just the coordinates.
* @param block
* @return
*/
public static String simpleFormat(Block block) {
return "x=" + block.getX() + ",y=" + block.getY() + ",z=" + block.getZ();
}
/**
* Just the coordinates.
* @param block
* @return
*/
public static String simpleFormatBlock(IGetBlockPosition block) {
return "x=" + block.getBlockX() + ",y=" + block.getBlockY() + ",z=" + block.getBlockZ();
}
}

15
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/BlockProperties.java
View File

@ -30,6 +30,7 @@ import java.util.Set;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.enchantments.Enchantment;
@ -1457,7 +1458,9 @@ public class BlockProperties {
}
/**
* Straw-man-method to hide warnings. Rather intended for display in debug/alert messages.
* Straw-man-method to hide warnings. Rather intended for display in
* debug/alert messages.
*
* @param blockType
* @return
*/
@ -1465,6 +1468,16 @@ public class BlockProperties {
return blockType.getId();
}
/**
* Get the (legacy) data value for the block.
*
* @param block
* @return
*/
public static int getData(final Block block) {
return block.getData();
}
/**
* Straw-man method to hide warnings.
* @param id