Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-18 09:51:17 +02:00
Code Issues Projects Releases Wiki Activity

Ensure fluids are not regarded as ground.

Browse Source
This commit is contained in:
asofold 2012-11-07 09:00:17 +01:00
parent a26eacef29
commit f529d2f1c3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,7 +253,7 @@ public class BlockProperties {
public static final int F_STAIRS = 0x1;
public static final int F_LIQUID = 0x2;
// TODO: maybe remove F_SOLID use (unless for setting F_GROUND on init).
/** Subject to change / rename.*/
/** Minecraft isSolid result. Used for setting ground flag - Subject to change / rename.*/
public static final int F_SOLID = 0x4;
/** Compatibility flag: regard this block as passable always. */
public static final int F_IGN_PASSABLE = 0x8;
@ -325,12 +325,13 @@ public class BlockProperties {
if (block != null){
if (block.material != null){
final net.minecraft.server.Material material = block.material;
if (material.isSolid()){
blockFlags[i] |= F_SOLID | F_GROUND;
}
if (material.isLiquid()){
// TODO: do not set F_GROUND for fluids ?
blockFlags[i] |= F_LIQUID;
if (material.isSolid()) blockFlags[i] |= F_SOLID;
}
else if (material.isSolid()){
blockFlags[i] |= F_SOLID | F_GROUND;
}
}
}