keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix possible null case for collision bounding box.

Browse source
This commit is contained in:
Christian 2013-02-04 13:58:55 -05:00
parent 7e5a9076f0
commit 40a3660c93
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
View file

@ -11,7 +11,7 @@
import net.minecraft.world.World; import net.minecraft.world.World;
public class TileEntity public class TileEntity
@@ -296,4 +299,79 @@ @@ -296,4 +299,84 @@
addMapping(TileEntityBeacon.class, "Beacon"); addMapping(TileEntityBeacon.class, "Beacon");
addMapping(TileEntitySkull.class, "Skull"); addMapping(TileEntitySkull.class, "Skull");
} }
@ -84,10 +84,15 @@
+ @SideOnly(Side.CLIENT) + @SideOnly(Side.CLIENT)
+ public AxisAlignedBB getRenderBoundingBox() + public AxisAlignedBB getRenderBoundingBox()
+ { + {
+ AxisAlignedBB bb = INFINITE_EXTENT_AABB;
+ if (getBlockType()!=null && getBlockType() != Block.chest) + if (getBlockType()!=null && getBlockType() != Block.chest)
+ { + {
+ return getBlockType().getCollisionBoundingBoxFromPool(worldObj, xCoord, yCoord, zCoord); + AxisAlignedBB cbb = getBlockType().getCollisionBoundingBoxFromPool(worldObj, xCoord, yCoord, zCoord);
+ if (cbb != null)
+ {
+ bb = cbb;
+ }
+ } + }
+ return INFINITE_EXTENT_AABB; + return bb;
+ } + }
} }