From dbf5ea0d0d7b55d2a2f0ae5a9e95172b222a4460 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 3 Nov 2015 21:34:34 +0000 Subject: [PATCH] Fixed the Dandelifeon being able to generate mana from cells ticked by other Dandelifeons. Closes #1511 --- .../common/block/subtile/generating/SubTileDandelifeon.java | 4 +++- src/main/java/vazkii/botania/common/block/tile/TileCell.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 723961cc0..c496fefa9 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 @@ -166,7 +166,9 @@ public class SubTileDandelifeon extends SubTileGenerating { Block blockAt = world.getBlock(x, y, z); if(gen == -2) { int val = prevGen * MANA_PER_GEN; - mana = Math.min(getMaxMana(), mana + val); + if(((TileCell) world.getTileEntity(x, y, z)).isSameFlower(supertile)) + mana = Math.min(getMaxMana(), mana + val); + world.setBlockToAir(x, y, z); } else if(blockAt == ModBlocks.cellBlock) { if(gen < 0 || gen > MAX_GENERATIONS) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCell.java b/src/main/java/vazkii/botania/common/block/tile/TileCell.java index 6c7429f23..5e9234dc4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCell.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -49,6 +49,10 @@ public class TileCell extends TileMod { worldObj.setBlockToAir(xCoord, yCoord, zCoord); } + public boolean isSameFlower(TileEntity flower) { + return matchCoords(validCoords, this) && matchCoords(flowerCoords, flower); + } + private boolean matchCoords(ChunkCoordinates coords, TileEntity tile) { return coords.posX == tile.xCoord && coords.posY == tile.yCoord && coords.posZ == tile.zCoord; }