Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-09 12:10:37 +01:00
Code Issues Projects Releases Wiki Activity

Account for 1.5 block high blocks in collidesId and collidesBlock.

Browse Source
This commit is contained in:
asofold 2012-11-11 13:26:13 +01:00
parent 6ee59c858a
commit 655c620cb6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1127,7 +1127,7 @@ public class BlockProperties {
public static final boolean collidesId(final IBlockAccess access, final double minX, double minY, final double minZ, final double maxX, final double maxY, final double maxZ, final int id){ public static final boolean collidesId(final IBlockAccess access, final double minX, double minY, final double minZ, final double maxX, final double maxY, final double maxZ, final int id){
final int iMinX = Location.locToBlock(minX); final int iMinX = Location.locToBlock(minX);
final int iMaxX = Location.locToBlock(maxX); final int iMaxX = Location.locToBlock(maxX);
final int iMinY = Location.locToBlock(minY); final int iMinY = Location.locToBlock(minY - (blockFlags[id] & F_HEIGHT150) != 0 ? 0.5625 : 0);
final int iMaxY = Location.locToBlock(maxY); final int iMaxY = Location.locToBlock(maxY);
final int iMinZ = Location.locToBlock(minZ); final int iMinZ = Location.locToBlock(minZ);
final int iMaxZ = Location.locToBlock(maxZ); final int iMaxZ = Location.locToBlock(maxZ);
@ -1158,7 +1158,7 @@ public class BlockProperties {
public static final boolean collidesBlock(final IBlockAccess access, final double minX, double minY, final double minZ, final double maxX, final double maxY, final double maxZ, final int id){ public static final boolean collidesBlock(final IBlockAccess access, final double minX, double minY, final double minZ, final double maxX, final double maxY, final double maxZ, final int id){
final int iMinX = Location.locToBlock(minX); final int iMinX = Location.locToBlock(minX);
final int iMaxX = Location.locToBlock(maxX); final int iMaxX = Location.locToBlock(maxX);
final int iMinY = Location.locToBlock(minY); final int iMinY = Location.locToBlock(minY - (blockFlags[id] & F_HEIGHT150) != 0 ? 0.5625 : 0);
final int iMaxY = Location.locToBlock(maxY); final int iMaxY = Location.locToBlock(maxY);
final int iMinZ = Location.locToBlock(minZ); final int iMinZ = Location.locToBlock(minZ);
final int iMaxZ = Location.locToBlock(maxZ); final int iMaxZ = Location.locToBlock(maxZ);