From a1f5c83bcb5c8304573fafff56c41bfeac375cc1 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 18 May 2014 15:17:21 +0100 Subject: [PATCH] Added a check for illegal block items around the Pure Daisy. Fixes a weird crash. --- .../block/subtile/SubTilePureDaisy.java | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/MODSRC/vazkii/botania/common/block/subtile/SubTilePureDaisy.java index 4b7c58efa..08a5f4a03 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/MODSRC/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChunkCoordinates; @@ -57,27 +58,30 @@ public class SubTilePureDaisy extends SubTileEntity { ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord + acoords[0], supertile.yCoord + acoords[1], supertile.zCoord + acoords[2]); Block block = supertile.getWorldObj().getBlock(coords.posX, coords.posY, coords.posZ); if(block != Blocks.air) { - String oredict = OreDictionary.getOreName(OreDictionary.getOreID(new ItemStack(block, 1, supertile.getWorldObj().getBlockMetadata(coords.posX, coords.posY, coords.posZ)))); - Block output = oredict.equals("stone") ? ModBlocks.livingrock : oredict.endsWith("logWood") ? ModBlocks.livingwood : null; - if(output != null) { - ticksRemaining[positionAt] = ticksRemaining[positionAt] - 1; + Item item = Item.getItemFromBlock(block); + if(item != null) { + String oredict = OreDictionary.getOreName(OreDictionary.getOreID(new ItemStack(item, 1, supertile.getWorldObj().getBlockMetadata(coords.posX, coords.posY, coords.posZ)))); + Block output = oredict.equals("stone") ? ModBlocks.livingrock : oredict.endsWith("logWood") ? ModBlocks.livingwood : null; + if(output != null) { + ticksRemaining[positionAt] = ticksRemaining[positionAt] - 1; - Botania.proxy.sparkleFX(supertile.getWorldObj(), coords.posX + Math.random(), coords.posY + Math.random(), coords.posZ + Math.random(), 1F, 1F, 1F, (float) Math.random(), 5); + Botania.proxy.sparkleFX(supertile.getWorldObj(), coords.posX + Math.random(), coords.posY + Math.random(), coords.posZ + Math.random(), 1F, 1F, 1F, (float) Math.random(), 5); - if(ticksRemaining[positionAt] <= 0) { - supertile.getWorldObj().setBlock(coords.posX, coords.posY, coords.posZ, output); - ticksRemaining[positionAt] = 200; + if(ticksRemaining[positionAt] <= 0) { + supertile.getWorldObj().setBlock(coords.posX, coords.posY, coords.posZ, output); + ticksRemaining[positionAt] = 200; - for(int i = 0; i < 25; i++) { - double x = coords.posX + Math.random(); - double y = coords.posY + Math.random() + 0.5; - double z = coords.posZ + Math.random(); + for(int i = 0; i < 25; i++) { + double x = coords.posX + Math.random(); + double y = coords.posY + Math.random() + 0.5; + double z = coords.posZ + Math.random(); - Botania.proxy.wispFX(supertile.getWorldObj(), x, y, z, 1F, 1F, 1F, (float) Math.random() / 2F); + Botania.proxy.wispFX(supertile.getWorldObj(), x, y, z, 1F, 1F, 1F, (float) Math.random() / 2F); + } + supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(block) + (supertile.getWorldObj().getBlockMetadata(coords.posX, coords.posY, coords.posZ) << 12)); } - supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(block) + (supertile.getWorldObj().getBlockMetadata(coords.posX, coords.posY, coords.posZ) << 12)); - } - } else ticksRemaining[positionAt] = 200; + } else ticksRemaining[positionAt] = 200; + } } }