From fed22ef73ad9119ed2df228c79bba7cf64fd22bf Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 14 Apr 2014 21:01:13 +0100 Subject: [PATCH] Fixed Mana Spreaders, again. --- MODSRC/vazkii/botania/common/block/tile/TileSpreader.java | 7 +++++++ MODSRC/vazkii/botania/common/entity/EntityManaBurst.java | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java b/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java index 4ad46826b..dc11a6683 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java @@ -64,6 +64,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, public float rotationX, rotationY; boolean added = false; boolean requestsClientUpdate = false; + boolean hasReceivedInitialPacket = false; IManaReceiver receiver = null; @@ -157,6 +158,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(cmp.hasKey(TAG_KNOWN_MANA)) knownMana = cmp.getInteger(TAG_KNOWN_MANA); + + if(worldObj != null && worldObj.isRemote) + hasReceivedInitialPacket = true; } @Override @@ -207,6 +211,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } private boolean needsNewBurstSimulation() { + if(worldObj.isRemote && !hasReceivedInitialPacket) + return false; + if(lastTentativeBurst == null) return true; diff --git a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java index 7df75d457..515ad2b8c 100644 --- a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java +++ b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java @@ -492,7 +492,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(movingobjectposition.entityHit == null) { TileEntity tile = worldObj.getTileEntity(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); - + if(tile instanceof IManaCollisionGhost && ((IManaCollisionGhost) tile).isGhost()) return; @@ -720,7 +720,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public final int meta; public PositionProperties(Entity entity) { - int x = (int) entity.posX - 1; + int x = (int) entity.posX; int y = (int) entity.posY; int z = (int) entity.posZ; coords = new ChunkCoordinates(x, y, z);