Packets should be thread safe now

This commit is contained in:
aidancbrady committed 2016-06-17 15:56:22 -04:00
1 parent 542e806644
commit e4aed3f7c1
25 files changed
+788 -624

No files matched your search

@@ -25,37 +25,43 @@ public class PacketPersonalChest implements IMessageHandler<PersonalChestMessage
{
EntityPlayer player = PacketHandler.getPlayer(context);
if(message.packetType == PersonalChestPacketType.SERVER_OPEN)
{
try {
if(message.isBlock)
PacketHandler.handlePacket(new Runnable() {
@Override
public void run()
{
if(message.packetType == PersonalChestPacketType.SERVER_OPEN)
{
TileEntityPersonalChest tileEntity = (TileEntityPersonalChest)message.coord4D.getTileEntity(player.worldObj);
MekanismUtils.openPersonalChestGui((EntityPlayerMP)player, tileEntity, null, true);
}
else {
ItemStack stack = player.getHeldItem(message.currentHand);
if(MachineType.get(stack) == MachineType.PERSONAL_CHEST)
{
InventoryPersonalChest inventory = new InventoryPersonalChest(player, message.currentHand);
MekanismUtils.openPersonalChestGui((EntityPlayerMP)player, null, inventory, false);
try {
if(message.isBlock)
{
TileEntityPersonalChest tileEntity = (TileEntityPersonalChest)message.coord4D.getTileEntity(player.worldObj);
MekanismUtils.openPersonalChestGui((EntityPlayerMP)player, tileEntity, null, true);
}
else {
ItemStack stack = player.getHeldItem(message.currentHand);
if(MachineType.get(stack) == MachineType.PERSONAL_CHEST)
{
InventoryPersonalChest inventory = new InventoryPersonalChest(player, message.currentHand);
MekanismUtils.openPersonalChestGui((EntityPlayerMP)player, null, inventory, false);
}
}
} catch(Exception e) {
Mekanism.logger.error("Error while handling electric chest open packet.");
e.printStackTrace();
}
}
else if(message.packetType == PersonalChestPacketType.CLIENT_OPEN)
{
try {
Mekanism.proxy.openPersonalChest(player, message.guiType, message.windowId, message.isBlock, message.coord4D == null ? BlockPos.ORIGIN : message.coord4D.getPos(), message.currentHand);
} catch(Exception e) {
Mekanism.logger.error("Error while handling electric chest open packet.");
e.printStackTrace();
}
}
} catch(Exception e) {
Mekanism.logger.error("Error while handling electric chest open packet.");
e.printStackTrace();
}
}
else if(message.packetType == PersonalChestPacketType.CLIENT_OPEN)
{
try {
Mekanism.proxy.openPersonalChest(player, message.guiType, message.windowId, message.isBlock, message.coord4D == null ? BlockPos.ORIGIN : message.coord4D.getPos(), message.currentHand);
} catch(Exception e) {
Mekanism.logger.error("Error while handling electric chest open packet.");
e.printStackTrace();
}
}
}, player.worldObj);
return null;
}