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

Fix standing on cactus.

Browse Source
This commit is contained in:
asofold 2013-03-08 23:08:53 +01:00
parent 926556a358
commit c23482fcf5
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
NCPCompat/src/main/java/fr/neatmonster/nocheatplus/utilities/BlockProperties.java
View File

@ -1310,7 +1310,16 @@ public class BlockProperties {
*/ */
public static double getGroundMinHeight(final BlockCache access, final int x, final int y, final int z, final int id, final double[] bounds, final long flags) { public static double getGroundMinHeight(final BlockCache access, final int x, final int y, final int z, final int id, final double[] bounds, final long flags) {
// TODO: Check which ones are really needed ! // TODO: Check which ones are really needed !
if ((flags & F_STAIRS) != 0){ if (id == Material.SNOW.getId()){
final int data = (access.getData(x, y, z) & 0xF) % 8;
if (data < 3) return 0;
else return 0.5;
}
// Height 100 is ignored (!).
else if ((flags & F_HEIGHT150) != 0){
return 1.5;
}
else if ((flags & F_STAIRS) != 0){
if ((access.getData(x, y, z) & 0x4) != 0){ if ((access.getData(x, y, z) & 0x4) != 0){
return 1.0; return 1.0;
} }
@ -1329,18 +1338,12 @@ public class BlockProperties {
// TODO: slightly over 0. // TODO: slightly over 0.
return 0; return 0;
} }
else if (id == Material.CACTUS.getId()){
return 0.9375;
}
else if (id == Material.PISTON_EXTENSION.getId()){ else if (id == Material.PISTON_EXTENSION.getId()){
return 0.625; return 0.625;
} }
else if (id == Material.SNOW.getId()){
final int data = (access.getData(x, y, z) & 0xF) % 8;
if (data < 3) return 0;
else return 0.5;
}
// Height 100 is ignored (!).
else if ((flags & F_HEIGHT150) != 0){
return 1.5;
}
else if ((flags & F_GROUND_HEIGHT) != 0){ else if ((flags & F_GROUND_HEIGHT) != 0){
// All blocks that are not treated individually are ground all through. // All blocks that are not treated individually are ground all through.
// TODO: Experimental workaround. // TODO: Experimental workaround.