Fixed a few crashes

This commit is contained in:
Aidan C. Brady 2015-04-03 20:21:05 -04:00
parent 63f751c710
commit 41cfed37b7
5 changed files with 16 additions and 2 deletions

View file

@ -373,8 +373,8 @@ public class GuiTeleporter extends GuiMekanism
{ {
if(clientFreq != null && clientStatus == 1) if(clientFreq != null && clientStatus == 1)
{ {
Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.TELEPORT, clientFreq));
mc.setIngameFocus(); mc.setIngameFocus();
Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.TELEPORT, clientFreq));
} }
} }

View file

@ -21,7 +21,11 @@ public class ItemPortableTeleporter extends ItemEnergized
@Override @Override
public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) 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; return itemstack;
} }

View file

@ -199,6 +199,13 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
if(stack.hasPath()) if(stack.hasPath())
{ {
int currentIndex = stack.pathToTarget.indexOf(Coord4D.get(tile())); 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); Coord4D next = stack.pathToTarget.get(currentIndex-1);
if(!stack.isFinal(this)) if(!stack.isFinal(this))

View file

@ -111,6 +111,8 @@ public class PacketPortableTeleporter implements IMessageHandler<PortableTelepor
MekanismUtils.setPrivateValue(((EntityPlayerMP)player).playerNetServerHandler, 0, NetHandlerPlayServer.class, ObfuscatedNames.NetHandlerPlayServer_floatingTickCount); MekanismUtils.setPrivateValue(((EntityPlayerMP)player).playerNetServerHandler, 0, NetHandlerPlayServer.class, ObfuscatedNames.NetHandlerPlayServer_floatingTickCount);
} }
player.closeScreen();
Mekanism.packetHandler.sendToAllAround(new PortalFXMessage(new Coord4D(player)), coords.getTargetPoint(40D)); Mekanism.packetHandler.sendToAllAround(new PortalFXMessage(new Coord4D(player)), coords.getTargetPoint(40D));
TileEntityTeleporter.teleportPlayerTo((EntityPlayerMP)player, coords, teleporter); TileEntityTeleporter.teleportPlayerTo((EntityPlayerMP)player, coords, teleporter);

View file

@ -399,6 +399,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IPe
player.theItemInWorldManager.setWorld(newWorld); player.theItemInWorldManager.setWorld(newWorld);
player.mcServer.getConfigurationManager().updateTimeAndWeatherForPlayer(player, newWorld); player.mcServer.getConfigurationManager().updateTimeAndWeatherForPlayer(player, newWorld);
player.mcServer.getConfigurationManager().syncPlayerInventory(player); player.mcServer.getConfigurationManager().syncPlayerInventory(player);
Iterator iterator = player.getActivePotionEffects().iterator(); Iterator iterator = player.getActivePotionEffects().iterator();
while(iterator.hasNext()) while(iterator.hasNext())