diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 8604a4eaf..49113f725 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -373,8 +373,8 @@ public class GuiTeleporter extends GuiMekanism { if(clientFreq != null && clientStatus == 1) { - Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.TELEPORT, clientFreq)); mc.setIngameFocus(); + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.TELEPORT, clientFreq)); } } diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 6d3affd78..84c1ca63a 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -21,7 +21,11 @@ public class ItemPortableTeleporter extends ItemEnergized @Override public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { - entityplayer.openGui(Mekanism.instance, 14, world, 0, 0, 0); + if(!world.isRemote) + { + entityplayer.openGui(Mekanism.instance, 14, world, 0, 0, 0); + } + return itemstack; } diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 5178a0d73..4fec0042f 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -199,6 +199,13 @@ public class PartLogisticalTransporter extends PartTransmitter if(stack.hasPath()) { int currentIndex = stack.pathToTarget.indexOf(Coord4D.get(tile())); + + if(currentIndex == 0) //Necessary for transition reasons, not sure why + { + remove.add(stack); + continue; + } + Coord4D next = stack.pathToTarget.get(currentIndex-1); if(!stack.isFinal(this)) diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index a79f272c7..b4f4a09e7 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -111,6 +111,8 @@ public class PacketPortableTeleporter implements IMessageHandler