From 655c620cb69c60c78417cc42542be89f9b4bc531 Mon Sep 17 00:00:00 2001 From: asofold Date: Sun, 11 Nov 2012 13:26:13 +0100 Subject: [PATCH] Account for 1.5 block high blocks in collidesId and collidesBlock. --- src/fr/neatmonster/nocheatplus/utilities/BlockProperties.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fr/neatmonster/nocheatplus/utilities/BlockProperties.java b/src/fr/neatmonster/nocheatplus/utilities/BlockProperties.java index c8c1bf72..ec39dddf 100644 --- a/src/fr/neatmonster/nocheatplus/utilities/BlockProperties.java +++ b/src/fr/neatmonster/nocheatplus/utilities/BlockProperties.java @@ -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){ final int iMinX = Location.locToBlock(minX); 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 iMinZ = Location.locToBlock(minZ); 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){ final int iMinX = Location.locToBlock(minX); 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 iMinZ = Location.locToBlock(minZ); final int iMaxZ = Location.locToBlock(maxZ);