Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-03 19:00:30 +02:00
Code Issues Projects Releases Wiki Activity

Also prevent using item-in-hand or using interacted-block fpor

Browse Source 
cancelled interact events.
This commit is contained in:
asofold 2013-02-17 16:25:28 +01:00
parent 1d44fe66be
commit 5f5d571264
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/blockinteract/BlockInteractListener.java
View File

@ -1,7 +1,10 @@
package fr.neatmonster.nocheatplus.checks.blockinteract; package fr.neatmonster.nocheatplus.checks.blockinteract;
import org.bukkit.Location;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event.Result;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
@ -9,6 +12,8 @@ import org.bukkit.event.player.PlayerInteractEvent;
import fr.neatmonster.nocheatplus.checks.CheckListener; import fr.neatmonster.nocheatplus.checks.CheckListener;
import fr.neatmonster.nocheatplus.checks.CheckType; import fr.neatmonster.nocheatplus.checks.CheckType;
import fr.neatmonster.nocheatplus.permissions.Permissions;
import fr.neatmonster.nocheatplus.utilities.InteractRayTracing;
/* /*
* M#"""""""'M dP dP M""M dP dP * M#"""""""'M dP dP M""M dP dP
@ -63,7 +68,9 @@ public class BlockInteractListener extends CheckListener {
*/ */
final Player player = event.getPlayer(); final Player player = event.getPlayer();
if (event.getAction() != Action.LEFT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_BLOCK){ final Action action = event.getAction();
if (action != Action.LEFT_CLICK_BLOCK && action != Action.RIGHT_CLICK_BLOCK){
return; return;
} }
@ -82,9 +89,12 @@ public class BlockInteractListener extends CheckListener {
// Second the direction check // Second the direction check
if (!cancelled && direction.isEnabled(player) && direction.check(player, block.getLocation())) if (!cancelled && direction.isEnabled(player) && direction.check(player, block.getLocation()))
cancelled = true; cancelled = true;
// If one of the checks requested to cancel the event, do so. // If one of the checks requested to cancel the event, do so.
if (cancelled) if (cancelled) {
event.setCancelled(cancelled); event.setUseInteractedBlock(Result.DENY);
event.setUseItemInHand(Result.DENY);
event.setCancelled(true);
}
} }
} }