From 4708ba94a80bcb66d6a8d1d5301b569a6cc65e83 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 8 Oct 2015 18:06:23 -0700 Subject: [PATCH] Fix #877 TileStairs NullPointerException --- .../arboriculture/gadgets/BlockArbStairs.java | 4 ++-- .../forestry/arboriculture/gadgets/TileStairs.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java index 1896a1a54..025288e18 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java @@ -122,7 +122,7 @@ public class BlockArbStairs extends BlockStairs { TileStairs stairs = getStairTile(world, x, y, z); NBTTagCompound nbttagcompound = new NBTTagCompound(); - if (stairs == null || stairs.getWoodType() == null) { + if (stairs == null) { return nbttagcompound; } @@ -141,7 +141,7 @@ public class BlockArbStairs extends BlockStairs { @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { TileStairs stairs = getStairTile(world, x, y, z); - if (stairs != null && stairs.getWoodType() != null) { + if (stairs != null) { return stairs.getWoodType().getPlankIcon(); } else { return WoodType.LARCH.getPlankIcon(); diff --git a/src/main/java/forestry/arboriculture/gadgets/TileStairs.java b/src/main/java/forestry/arboriculture/gadgets/TileStairs.java index 3b1a032fc..b51a56477 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileStairs.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileStairs.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.gadgets; +import javax.annotation.Nonnull; import java.io.IOException; import net.minecraft.nbt.NBTTagCompound; @@ -25,13 +26,15 @@ import forestry.core.proxy.Proxies; public class TileStairs extends TileEntity implements IStreamable { - private WoodType woodType; + @Nonnull + private WoodType woodType = WoodType.LARCH; + @Nonnull public WoodType getWoodType() { return this.woodType; } - public void setWoodType(WoodType woodType) { + public void setWoodType(@Nonnull WoodType woodType) { this.woodType = woodType; sendNetworkUpdate(); } @@ -49,10 +52,7 @@ public class TileStairs extends TileEntity implements IStreamable { @Override public void writeToNBT(NBTTagCompound nbttagcompound) { super.writeToNBT(nbttagcompound); - - if (woodType != null) { - nbttagcompound.setShort("WT", (short) woodType.ordinal()); - } + nbttagcompound.setShort("WT", (short) woodType.ordinal()); } /* UPDATING */