Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-27 14:13:11 +02:00
Code Issues Projects Releases Wiki Activity

Adjust interact.visible to use bounds (read details below!).

Browse Source 
* Uses unmodified block bounds as returned by the server, this is not
the final version but does fix the door problem.
* Users that use the CompatBukkit (bukkitapionly) module should beware
of the current dev-line, because the block shapes can not be retrieved
with using the Bukkit-API only, thus some blocks squeezed between other
blocks can not be interacted with in a reliable way. This concerns
interacting with the sides that are directed towards solid blocks
mostly, so in most cases there still is a side possible to interact
with, but it might be the short side of a door, not convenient.
This commit is contained in:
asofold 2013-06-01 14:48:23 +02:00
parent 90f110146f
commit b8141f5f32
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/blockinteract/Visible.java
View File

@ -16,10 +16,8 @@ import fr.neatmonster.nocheatplus.utilities.InteractRayTracing;
public class Visible extends Check {
/**
* Factor for the block-face mod.
*/
private static final double fModFull = 0.6;
/** Offset from bounds to estimate some reference end position for ray-tracing. */
private static final double offset = 0.0001;
private BlockCache blockCache;
@ -43,7 +41,7 @@ public class Visible extends Check {
private static final double getEnd(final double[] bounds, final int index, final int mod){
if (bounds == null){
return 0.5 + fModFull * mod;
return 0.5 + 0.5 * mod + offset;
}
if (mod == 0){
// TODO: Middle or middle of block ?
@ -51,11 +49,11 @@ public class Visible extends Check {
}
else if (mod == 1){
// TODO: Slightly outside or dependent on exact position (inside, exact edge, outside)?
return bounds[index + 3];
return Math.min(1.0, bounds[index + 3]) + offset;
}
else if (mod == -1){
// TODO: Slightly outside or dependent on exact position (inside, exact edge, outside)?
return bounds[index];
return Math.max(0.0, bounds[index]) - offset;
}
else{
throw new IllegalArgumentException("BlockFace.getModX|Y|Z must be 0, 1 or -1.");
@ -67,6 +65,8 @@ public class Visible extends Check {
// TODO: Might confine what to check for (left/right, target blocks depending on item in hand, container blocks).
final boolean collides;
final double eyeHeight = player.getEyeHeight();
// TODO: Consider checking which faces can possibly be touched at all (!).
// TODO: This check might make parts of interact/blockbreak/... + direction (+?) obsolete.
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;
@ -75,6 +75,7 @@ public class Visible extends Check {
blockCache.setAccess(loc.getWorld());
// Guess some end-coordinates.
// TODO: More "smart" corrections towards edges based on isPassable result, optimized. Might also use looking direction (test how accurate).
@SuppressWarnings("deprecation")
final double[] bounds = BlockProperties.getCorrectedBounds(blockCache, block.getX(), block.getY(), block.getZ());
final int modX = face.getModX();
@ -84,6 +85,7 @@ public class Visible extends Check {
final double eY = (double) block.getY() + getEnd(bounds, 1, modY);
final double eZ = (double) block.getZ() + getEnd(bounds, 2, modZ);
// TODO: Check if it is the same block first (also)
if (BlockProperties.isPassable(blockCache, eX, eY, eZ, blockCache.getTypeId(eX, eY, eZ))){
// Perform ray-tracing.
rayTracing.setBlockCache(blockCache);

4
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/BlockCache.java
View File

@ -179,11 +179,11 @@ public abstract class BlockCache {
}
/**
* Get block bounds
* Get block bounds - <b>Do not change these in-place, because the returned array is cached internally.</b>
* @param x
* @param y
* @param z
* @return Array of floats (minX, minY, minZ, maxX, maxY, maxZ), may be null theoretically.
* @return Array of floats (minX, minY, minZ, maxX, maxY, maxZ), may be null theoretically. Do not change these in place, because they might get cached.
*/
public double[] getBounds(final int x, final int y, final int z){
final double[] pBounds = boundsMap.get(x, y, z);

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

@ -1997,8 +1997,9 @@ public class BlockProperties {
public static double[] getCorrectedBounds(final int x, final int y, final int z, final int id, final double[] bounds) {
if (bounds == null) return null;
//final long flags = blockFlags[id];
// TODO: IMPLEMENT !
return null;
// TODO: Consider to change to adaptBounds and to store the adapted bounds already.
// TODO: IMPLEMENT special bounds.
return bounds;
}
/**