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

Adjust block height for liquid.

Browse Source
This commit is contained in:
asofold 2015-11-16 15:37:40 +01:00
parent c1cd680108
commit 76ef40f6fb
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2324,11 +2324,13 @@ public class BlockProperties {
bmaxY = 0.5;
}
else {
bmaxY = 1.0; // - (double) data8 / 9.0;
//bmaxY = 1.0; // - (double) data8 / 9.0;
bmaxY = shouldLiquidBelowBeFullHeight(access, x, y + 1, z) ? 1.0 : 0.8;
}
}
else {
bmaxY = 1.0;
//bmaxY = 1.0;
bmaxY = shouldLiquidBelowBeFullHeight(access, x, y + 1, z) ? 1.0 : 0.8;
}
}
else if (id == Material.ENDER_PORTAL_FRAME.getId()) {
@ -2363,6 +2365,31 @@ public class BlockProperties {
return true;
}
/**
* Determine if the liquid block below has full height or not (provided it
* is max. level).
*
* @param blockCache
* @param x
* Coordinates of the block above the liquid block in question.
* @param y
* @param z
* @return
*/
public static boolean shouldLiquidBelowBeFullHeight(final BlockCache access, final int x, final int y, final int z) {
final int id = access.getTypeId(x, y, z);
if (isLiquid(id)) {
return true;
}
if (!isSolid(id)) {
return false;
}
final double[] bounds = getCorrectedBounds(x, y, z, id, access.getBounds(x, y, z));
// TODO: Implement corrected bounds.
// TODO: Fences ~ test.
return bounds == null ? true : (bounds[1] == 0.0);
}
/**
* Attempt to return the exact outside bounds, corrected by flags and other.
* @deprecated Not yet for real (only used in certain checks/contexts).