From e569ee9803d14c960a54438ef37d6e194e66232d Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 4 Nov 2015 13:36:31 +0000 Subject: [PATCH] Fixed the Dandelifeon not generating mana properly. --- .../block/subtile/generating/SubTileDandelifeon.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index f6a784143..7489df288 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -52,6 +52,7 @@ public class SubTileDandelifeon extends SubTileGenerating { void runSimulation() { int[][] table = getCellTable(); List changes = new ArrayList(); + List cells = new ArrayList(); boolean wipe = false; for(int i = 0; i < table.length; i++) @@ -122,7 +123,7 @@ public class SubTileDandelifeon extends SubTileGenerating { int getCellGeneration(int x, int y, int z) { TileEntity tile = supertile.getWorldObj().getTileEntity(x, y, z); if(tile instanceof TileCell) - return ((TileCell) tile).getGeneration(); + return ((TileCell) tile).isSameFlower(supertile) ? ((TileCell) tile).getGeneration() : 0; return -1; } @@ -167,12 +168,8 @@ public class SubTileDandelifeon extends SubTileGenerating { TileEntity tile = world.getTileEntity(x, y, z); if(gen == -2) { int val = prevGen * MANA_PER_GEN; - if(tile instanceof TileCell) { - if(((TileCell) tile).isSameFlower(supertile)) - mana = Math.min(getMaxMana(), mana + val); - world.setBlockToAir(x, y, z); - - } + mana = Math.min(getMaxMana(), mana + val); + //world.setBlockToAir(x, y, z); } else if(blockAt == ModBlocks.cellBlock) { if(gen < 0 || gen > MAX_GENERATIONS) world.setBlockToAir(x, y, z);