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

isOnGround: Fix for flags.

Browse Source
This commit is contained in:
asofold 2013-03-05 17:31:37 +01:00
parent f7d9441174
commit 354511b88f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1603,8 +1603,7 @@ public class BlockProperties {
if ((flags & F_GROUND) == 0 || (flags & ignoreFlags) != 0){ if ((flags & F_GROUND) == 0 || (flags & ignoreFlags) != 0){
continue; continue;
} }
// Might collide. // Might collide.
final double[] bounds = access.getBounds(x, y, z); final double[] bounds = access.getBounds(x, y, z);
@ -1627,13 +1626,13 @@ public class BlockProperties {
} }
final int aboveId = access.getTypeId(x, y + 1, z); final int aboveId = access.getTypeId(x, y + 1, z);
final long aboveFlags = blockFlags[aboveId]; final long aboveFlags = blockFlags[aboveId];
if ((flags & F_IGN_PASSABLE) != 0){ if ((flags & aboveFlags & F_IGN_PASSABLE) != 0){
// Ignore these. // Ignore these (Note for above block check before ground property).
// TODO: Should this always apply ? // TODO: Should this always apply ?
return true; return true;
} }
if ((aboveFlags & F_GROUND) == 0 || (aboveFlags & ignoreFlags) != 0){ if ((aboveFlags & F_GROUND) == 0 || (aboveFlags & F_LIQUID) != 0 || (aboveFlags & ignoreFlags) != 0){
return true; return true;
} }