Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-07 11:10:05 +01:00
Code Issues Projects Releases Wiki Activity

Don't allow item use on blockinteract.speed violations.

Browse Source
This commit is contained in:
asofold 2015-12-15 21:12:33 +01:00
parent dab3229066
commit 2145a6a0d3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,7 @@ public class BlockInteractListener extends CheckListener {
final BlockInteractConfig cc = BlockInteractConfig.getConfig(player);
boolean cancelled = false;
boolean preventUseItem = false;
final BlockFace face = event.getBlockFace();
final Location loc = player.getLocation(useLoc);
@ -110,6 +111,7 @@ public class BlockInteractListener extends CheckListener {
// Interaction speed.
if (!cancelled && speed.isEnabled(player) && speed.check(player, data, cc)) {
cancelled = true;
preventUseItem = true;
}
// First the reach check.
@ -137,7 +139,7 @@ public class BlockInteractListener extends CheckListener {
event.setUseInteractedBlock(Result.DENY);
final ItemStack stack = player.getItemInHand();
final Material mat = stack == null ? Material.AIR : stack.getType();
if (mat.isEdible() || mat == Material.POTION) {
if (!preventUseItem && (mat.isEdible() || mat == Material.POTION)) {
// TODO: Ender pearl?
event.setUseItemInHand(Result.ALLOW);
} else {