tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Attempt another Dynamic Tank fix

Browse source
This commit is contained in:
aidancbrady 2015-06-17 15:54:01 -04:00
parent 6bdbb41b2d
commit 43b71cb8cc
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/mekanism/common/PacketHandler.java
View file

@ -321,11 +321,6 @@ public class PacketHandler
public void sendToServer(IMessage message) public void sendToServer(IMessage message)
{ {
netHandler.sendToServer(message); netHandler.sendToServer(message);
if(general.logPackets)
{
System.out.println("[Mekanism] Sending '" + message + "' packet to server");
}
} }
/** /**

10
src/main/java/mekanism/common/network/PacketTileEntity.java
View file

@ -8,13 +8,13 @@ import mekanism.api.Coord4D;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.base.ITileNetwork; import mekanism.common.base.ITileNetwork;
import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.Side;
public class PacketTileEntity implements IMessageHandler<TileEntityMessage, IMessage> public class PacketTileEntity implements IMessageHandler<TileEntityMessage, IMessage>
{ {
@ -61,12 +61,14 @@ public class PacketTileEntity implements IMessageHandler<TileEntityMessage, IMes
dataStream.writeInt(coord4D.zCoord); dataStream.writeInt(coord4D.zCoord);
dataStream.writeInt(coord4D.dimensionId); dataStream.writeInt(coord4D.dimensionId);
if(FMLCommonHandler.instance().getSide() == Side.SERVER) MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
if(server != null)
{ {
World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(coord4D.dimensionId); World world = server.worldServerForDimension(coord4D.dimensionId);
PacketHandler.log("Sending TileEntity packet from coordinate " + coord4D + " (" + coord4D.getTileEntity(world) + ")"); PacketHandler.log("Sending TileEntity packet from coordinate " + coord4D + " (" + coord4D.getTileEntity(world) + ")");
} }
PacketHandler.encode(new Object[] {parameters}, dataStream); PacketHandler.encode(new Object[] {parameters}, dataStream);
} }

2
src/main/java/mekanism/common/tile/TileEntityDynamicTank.java
View file

@ -111,6 +111,8 @@ public class TileEntityDynamicTank extends TileEntityMultiblock<SynchronizedTank
{ {
sendPacketToRenderer(); sendPacketToRenderer();
} }
structure.prevFluid = structure.fluidStored;
} }
manageInventory(); manageInventory();