From 06e011e244c314c461458c2bf781523bf8699b90 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 17 Jun 2016 16:45:53 -0400 Subject: [PATCH] Packet crash fixes, fixed Seismic Reader crash, fixed Portable Teleporter interface crash, fixed teleport crash --- .../java/mekanism/client/ClientProxy.java | 12 ++++++++++-- .../mekanism/client/gui/GuiSeismicReader.java | 2 +- .../RenderThermoelectricBoiler.java | 2 +- .../transmitter/RenderMechanicalPipe.java | 9 ++++++--- .../java/mekanism/common/CommonProxy.java | 6 +++--- .../java/mekanism/common/PacketHandler.java | 5 ++--- .../network/PacketConfigurationUpdate.java | 4 ++-- .../network/PacketContainerEditMode.java | 4 ++-- .../common/network/PacketDataRequest.java | 4 ++-- .../common/network/PacketDigitalMinerGui.java | 4 ++-- .../common/network/PacketDropperUse.java | 4 ++-- .../common/network/PacketEditFilter.java | 8 ++++---- .../common/network/PacketEntityMove.java | 4 ++-- .../network/PacketFlamethrowerData.java | 4 ++-- .../common/network/PacketJetpackData.java | 4 ++-- .../network/PacketLogisticalSorterGui.java | 4 ++-- .../common/network/PacketNewFilter.java | 8 ++++---- .../network/PacketOredictionificatorGui.java | 4 ++-- .../common/network/PacketPersonalChest.java | 4 ++-- .../network/PacketPortableTeleporter.java | 19 ++++++++++++------- .../common/network/PacketPortalFX.java | 4 ++-- .../common/network/PacketRedstoneControl.java | 4 ++-- .../common/network/PacketRemoveUpgrade.java | 4 ++-- .../mekanism/common/network/PacketRobit.java | 4 ++-- .../common/network/PacketSecurityMode.java | 4 ++-- .../common/network/PacketSimpleGui.java | 4 ++-- .../common/network/PacketTileEntity.java | 4 ++-- .../network/PacketTransmitterUpdate.java | 4 ++-- .../common/tile/TileEntityTeleporter.java | 2 +- 29 files changed, 82 insertions(+), 67 deletions(-) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 1f8f96164..7240d7fda 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -225,6 +225,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; @@ -1112,9 +1113,16 @@ public class ClientProxy extends CommonProxy } @Override - public void handlePacket(Runnable runnable, World world) + public void handlePacket(Runnable runnable, EntityPlayer player) { - Minecraft.getMinecraft().addScheduledTask(runnable); + if(player == null || player.worldObj.isRemote) + { + Minecraft.getMinecraft().addScheduledTask(runnable); + } + else if(player != null && !player.worldObj.isRemote) + { + ((WorldServer)player.worldObj).addScheduledTask(runnable); //singleplayer + } } @Override diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index b54d158be..18184e435 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -43,7 +43,7 @@ public class GuiSeismicReader extends GuiScreen public GuiSeismicReader(World world, Coord4D coord, ItemStack stack) { - pos = new Coord4D(coord.xCoord, Math.min(255, coord.yCoord), coord.zCoord, worldObj.provider.getDimension()); + pos = new Coord4D(coord.xCoord, Math.min(255, coord.yCoord), coord.zCoord, world.provider.getDimension()); worldObj = world; itemStack = stack; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index 86ade8eff..f66c770c3 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -93,7 +93,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer 0) { RenderData data = new RenderData(); diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index 187e4af64..0ccb0ba07 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -257,9 +257,12 @@ public class RenderMechanicalPipe extends RenderTransmitterBase publicFreqs = new ArrayList(); @@ -205,7 +205,7 @@ public class PacketPortableTeleporter implements IMessageHandler publicFreqs, List privateFreqs) + public PortableTeleporterMessage(EnumHand hand, Frequency freq, byte b, List publicFreqs, List privateFreqs) { packetType = PortableTeleporterPacketType.DATA_RESPONSE; + currentHand = hand; frequency = freq; status = b; @@ -294,6 +295,8 @@ public class PacketPortableTeleporter implements IMessageHandler { EntityPlayer player = PacketHandler.getPlayer(context); - PacketHandler.handlePacket(new Runnable() { + PacketHandler.handlePacket(new Thread() { @Override public void run() { @@ -81,7 +81,7 @@ public class PacketRobit implements IMessageHandler } } } - }, player.worldObj); + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketSecurityMode.java b/src/main/java/mekanism/common/network/PacketSecurityMode.java index 71889c130..b6d3e6a9f 100644 --- a/src/main/java/mekanism/common/network/PacketSecurityMode.java +++ b/src/main/java/mekanism/common/network/PacketSecurityMode.java @@ -22,7 +22,7 @@ public class PacketSecurityMode implements IMessageHandler