From a08cc322cea60be9a92d28523a8462084d747753 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 3 Dec 2013 09:00:03 -0500 Subject: [PATCH] Changed how gui packets are sent instead of asking the machine to send the packet the prefab asks for the data to send. This way the need to know how to send the packet is not needed. Rather the only thing that needs to be done is to return a new packet with the data. --- src/dark/core/prefab/machine/TileEntityEnergyMachine.java | 4 ++++ src/dark/core/prefab/terminal/TileEntityTerminal.java | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/dark/core/prefab/machine/TileEntityEnergyMachine.java b/src/dark/core/prefab/machine/TileEntityEnergyMachine.java index e6bad041f..26bf8974a 100644 --- a/src/dark/core/prefab/machine/TileEntityEnergyMachine.java +++ b/src/dark/core/prefab/machine/TileEntityEnergyMachine.java @@ -154,6 +154,10 @@ public abstract class TileEntityEnergyMachine extends TileEntityMachine implemen /** Called to consume power from the internal storage */ public boolean consumePower(float watts, boolean doDrain) { + if (watts <= 0) + { + return true; + } if (!this.runPowerLess() && this.getEnergyStored() >= watts) { if (doDrain) diff --git a/src/dark/core/prefab/terminal/TileEntityTerminal.java b/src/dark/core/prefab/terminal/TileEntityTerminal.java index 798a6aa48..f2406bdb7 100644 --- a/src/dark/core/prefab/terminal/TileEntityTerminal.java +++ b/src/dark/core/prefab/terminal/TileEntityTerminal.java @@ -46,12 +46,9 @@ public abstract class TileEntityTerminal extends TileEntityEnergyMachine impleme } @Override - public void sendGUIPacket(EntityPlayer entity) + public Packet getGUIPacket() { - if (!this.worldObj.isRemote) - { - PacketDispatcher.sendPacketToPlayer(this.getDescriptionPacket(), (Player) entity); - } + return this.getDescriptionPacket(); } /** Sends all NBT data. Server -> Client */