From 2cc2183e238f95ca68d61989bee1c8753b952bcf Mon Sep 17 00:00:00 2001 From: dmillerw Date: Sun, 13 Apr 2014 12:59:40 -0700 Subject: [PATCH] Fixed creative engine desync --- .../buildcraft/energy/TileEngineCreative.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/common/buildcraft/energy/TileEngineCreative.java b/common/buildcraft/energy/TileEngineCreative.java index 03007357..59d33b5e 100644 --- a/common/buildcraft/energy/TileEngineCreative.java +++ b/common/buildcraft/energy/TileEngineCreative.java @@ -1,6 +1,7 @@ package buildcraft.energy; import buildcraft.api.tools.IToolWrench; +import buildcraft.core.network.NetworkData; import buildcraft.core.utils.StringUtils; import buildcraft.transport.pipes.PipePowerIron; import net.minecraft.entity.player.EntityPlayer; @@ -12,6 +13,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class TileEngineCreative extends TileEngine { + @NetworkData private PipePowerIron.PowerMode powerMode = PipePowerIron.PowerMode.M2; @Override @@ -36,21 +38,23 @@ public class TileEngineCreative extends TileEngine { @Override public boolean onBlockActivated(EntityPlayer player, ForgeDirection side) { - Item equipped = player.getCurrentEquippedItem() != null ? player.getCurrentEquippedItem().getItem() : null; + if (!getWorld().isRemote) { + Item equipped = player.getCurrentEquippedItem() != null ? player.getCurrentEquippedItem().getItem() : null; - if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(player, xCoord, yCoord, zCoord)) { - powerMode = powerMode.getNext(); - energy = 0; + if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(player, xCoord, yCoord, zCoord)) { + powerMode = powerMode.getNext(); + energy = 0; - if (!getWorld().isRemote) { player.addChatMessage(new ChatComponentText(String.format(StringUtils.localize("chat.pipe.power.iron.mode"), powerMode.maxPower))); - } - ((IToolWrench) equipped).wrenchUsed(player, xCoord, yCoord, zCoord); - return true; + sendNetworkUpdate(); + + ((IToolWrench) equipped).wrenchUsed(player, xCoord, yCoord, zCoord); + return true; + } } - return false; + return !player.isSneaking(); } @Override