Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-02-05 06:11:22 +01:00
Code Issues Projects Releases Wiki Activity

Rename simplified fluid level flag.

Browse Source
This commit is contained in:
asofold 2013-03-13 19:34:35 +01:00
parent b8cda625f8
commit e35f0585ae
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,7 +294,7 @@ public class BlockProperties {
* (repeating till 0x15)). 0x8 means falling/full block. This is meant to model flowing water/lava. <br> * (repeating till 0x15)). 0x8 means falling/full block. This is meant to model flowing water/lava. <br>
* However the hit-box for collision checks will be set to 0.5 height or 1.0 height only. * However the hit-box for collision checks will be set to 0.5 height or 1.0 height only.
*/ */
public static final long F_HEIGHT_8_INV = 0x2000; public static final long F_HEIGHT_8SIM_DEC = 0x2000;
/** /**
* Map flag to names. * Map flag to names.
@ -430,14 +430,14 @@ public class BlockProperties {
for (final Material mat : new Material[]{ for (final Material mat : new Material[]{
Material.STATIONARY_WATER, Material.WATER, Material.STATIONARY_WATER, Material.WATER,
}) { }) {
blockFlags[mat.getId()] |= F_LIQUID | F_HEIGHT_8_INV | F_WATER; blockFlags[mat.getId()] |= F_LIQUID | F_HEIGHT_8SIM_DEC | F_WATER;
} }
// LAVA. // LAVA.
for (final Material mat : new Material[]{ for (final Material mat : new Material[]{
Material.LAVA, Material.STATIONARY_LAVA, Material.LAVA, Material.STATIONARY_LAVA,
}) { }) {
blockFlags[mat.getId()] |= F_LIQUID | F_HEIGHT_8_INV | F_LAVA; blockFlags[mat.getId()] |= F_LIQUID | F_HEIGHT_8SIM_DEC | F_LAVA;
} }
// 1.5 block high. // 1.5 block high.
@ -1772,7 +1772,7 @@ public class BlockProperties {
bminY = 0; bminY = 0;
bmaxY = 1.0; bmaxY = 1.0;
} }
else if ((flags & F_HEIGHT_8_INV) != 0){ else if ((flags & F_HEIGHT_8SIM_DEC) != 0){
bminY = 0; bminY = 0;
final int data = access.getData(x, y, z); final int data = access.getData(x, y, z);
if ((data & 0x8) == 0){ if ((data & 0x8) == 0){

6
NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/BlockCacheBukkit.java
View File

@ -47,9 +47,11 @@ public class BlockCacheBukkit extends BlockCache{
// TODO: Probably check other ids too before doing this ? // TODO: Probably check other ids too before doing this ?
for (final Entity other : entity.getNearbyEntities(2.0, 2.0, 2.0)){ for (final Entity other : entity.getNearbyEntities(2.0, 2.0, 2.0)){
final EntityType type = other.getType(); final EntityType type = other.getType();
if (type != EntityType.BOAT && !(other instanceof Minecart)) continue; if (type != EntityType.BOAT){ // && !(other instanceof Minecart))
continue;
}
final Location loc = entity.getLocation(); final Location loc = entity.getLocation();
if (Math.abs(loc.getY() - minY) < 0.6){ if (Math.abs(loc.getY() - minY) < 0.7){
// TODO: A "better" estimate is possible, though some more tolerance would be good. // TODO: A "better" estimate is possible, though some more tolerance would be good.
return true; return true;
} }