From 68fbbcee1e63fcf0887ad4a910f3f8bb18b8db6e Mon Sep 17 00:00:00 2001 From: asofold Date: Thu, 29 Nov 2012 15:57:57 +0100 Subject: [PATCH] Prevent npe in one place. --- src/fr/neatmonster/nocheatplus/utilities/BlockProperties.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fr/neatmonster/nocheatplus/utilities/BlockProperties.java b/src/fr/neatmonster/nocheatplus/utilities/BlockProperties.java index 0a5ab238..f2409e3e 100644 --- a/src/fr/neatmonster/nocheatplus/utilities/BlockProperties.java +++ b/src/fr/neatmonster/nocheatplus/utilities/BlockProperties.java @@ -1208,6 +1208,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 x, final int y, final int z, final int id){ // TODO: use internal block data unless delegation wanted? final Block block = Block.byId[id]; + if (block == null) return false; // TODO: policy ? block.updateShape(access, x, y, z); final long flags = blockFlags[id]; final double bminX, bminZ, bminY;