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

Allow interacting with the block at head height if stuck.

Browse Source
This commit is contained in:
asofold 2013-02-26 02:32:48 +01:00
parent a5cc3f819f
commit ac048474b7
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/blockinteract/Visible.java
View File

@ -37,14 +37,21 @@ public class Visible extends Check {
public boolean check(final Player player, final Location loc, final Block block, final BlockFace face, final Action action, final BlockInteractData data, final BlockInteractConfig cc) {
// TODO: Might confine what to check for (left/right, target blocks depending on item in hand, container blocks).
blockCache.setAccess(loc.getWorld());
rayTracing.setBlockCache(blockCache);
rayTracing.set(loc.getX(), loc.getY() + player.getEyeHeight(), loc.getZ(), 0.5 + block.getX() + 0.6 * face.getModX(), 0.5 + block.getY() + 0.6 * face.getModY(), 0.5 + block.getZ() + 0.6 * face.getModZ());
rayTracing.loop();
final boolean collides = rayTracing.collides();
blockCache.cleanup();
rayTracing.cleanup();
final boolean collides;
final double eyeHeight = player.getEyeHeight();
if (block.getX() == loc.getBlockX() && block.getZ() == loc.getBlockZ() && block.getY() == Location.locToBlock(loc.getY() + eyeHeight)){
// Player is interacting with the block his head is in.
collides = false;
}
else{
blockCache.setAccess(loc.getWorld());
rayTracing.setBlockCache(blockCache);
rayTracing.set(loc.getX(), loc.getY() + eyeHeight, loc.getZ(), 0.5 + block.getX() + 0.6 * face.getModX(), 0.5 + block.getY() + 0.6 * face.getModY(), 0.5 + block.getZ() + 0.6 * face.getModZ());
rayTracing.loop();
collides = rayTracing.collides();
blockCache.cleanup();
rayTracing.cleanup();
}
if (cc.debug && player.hasPermission(Permissions.ADMINISTRATION_DEBUG)){
player.sendMessage("Interact visible: " + (action == Action.RIGHT_CLICK_BLOCK ? "right" : "left") + " collide=" + rayTracing.collides());