From c050324f8b6fb52a541909a093ffecbdc8482732 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Fri, 8 Mar 2019 19:50:10 -0700 Subject: [PATCH] Make sure to handle state changes on main world thread --- .../network/PacketFlamethrowerData.java | 31 ++++++++------- .../common/network/PacketJetpackData.java | 32 ++++++++------- .../common/network/PacketScubaTankData.java | 39 ++++++++++--------- 3 files changed, 54 insertions(+), 48 deletions(-) diff --git a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java index 000f0091b..1557a169a 100644 --- a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java +++ b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java @@ -17,23 +17,24 @@ public class PacketFlamethrowerData implements IMessageHandler { + if (message.packetType == FlamethrowerPacket.UPDATE) { + Mekanism.playerState.setFlamethrowerState(message.username, message.value, false); - if (message.packetType == FlamethrowerPacket.UPDATE) { - Mekanism.playerState.setFlamethrowerState(message.username, message.value, false); - - // If we got this packet on the server, resend out to all clients in same dimension - // TODO: Why is this a dimensional thing?! - if (!player.world.isRemote) { - Mekanism.packetHandler.sendToDimension(message, player.world.provider.getDimension()); - } - } else if (message.packetType == FlamethrowerPacket.MODE) { - ItemStack stack = player.getHeldItem(message.currentHand); - if (!stack.isEmpty() && stack.getItem() instanceof ItemFlamethrower) { - ((ItemFlamethrower) stack.getItem()).incrementMode(stack); - } + // If we got this packet on the server, resend out to all clients in same dimension + // TODO: Why is this a dimensional thing?! + if (!player.world.isRemote) { + Mekanism.packetHandler.sendToDimension(message, player.world.provider.getDimension()); } - + } else if (message.packetType == FlamethrowerPacket.MODE) { + ItemStack stack = player.getHeldItem(message.currentHand); + if (!stack.isEmpty() && stack.getItem() instanceof ItemFlamethrower) { + ((ItemFlamethrower) stack.getItem()).incrementMode(stack); + } + } + }, player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketJetpackData.java b/src/main/java/mekanism/common/network/PacketJetpackData.java index 588f00dfa..40fa9fb88 100644 --- a/src/main/java/mekanism/common/network/PacketJetpackData.java +++ b/src/main/java/mekanism/common/network/PacketJetpackData.java @@ -21,31 +21,35 @@ public class PacketJetpackData implements IMessageHandler { + if (message.packetType == JetpackPacket.UPDATE) { Mekanism.playerState.setJetpackState(message.username, message.value, false); - // If we got this packet on the server, propagate it out to all players in the same dimension + // If we got this packet on the server, propagate it out to all players in the same + // dimension // TODO: Why is this a dimensional thing?! if (!player.world.isRemote) { - Mekanism.packetHandler.sendToDimension(message, player.world.provider.getDimension()); + Mekanism.packetHandler.sendToDimension(message, player.world.provider.getDimension()); } - } else if (message.packetType == JetpackPacket.MODE) { + } else if (message.packetType == JetpackPacket.MODE) { // Use has changed the mode of their jetpack; update it ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); if (!stack.isEmpty() && stack.getItem() instanceof ItemJetpack) { - if (!message.value) { - ((ItemJetpack) stack.getItem()).incrementMode(stack); - } else { - ((ItemJetpack) stack.getItem()).setMode(stack, JetpackMode.DISABLED); - } + if (!message.value) { + ((ItemJetpack) stack.getItem()).incrementMode(stack); + } else { + ((ItemJetpack) stack.getItem()).setMode(stack, JetpackMode.DISABLED); + } } - } else if (message.packetType == JetpackPacket.FULL) { + } else if (message.packetType == JetpackPacket.FULL) { // This is a full sync; merge it into our player state Mekanism.playerState.setActiveJetpacks(message.activeJetpacks); - } - + } + }, + player); return null; } diff --git a/src/main/java/mekanism/common/network/PacketScubaTankData.java b/src/main/java/mekanism/common/network/PacketScubaTankData.java index 458fa582a..0ac29238c 100644 --- a/src/main/java/mekanism/common/network/PacketScubaTankData.java +++ b/src/main/java/mekanism/common/network/PacketScubaTankData.java @@ -20,29 +20,30 @@ public class PacketScubaTankData implements IMessageHandler{ + if(message.packetType == ScubaTankPacket.UPDATE) { + Mekanism.playerState.setGasmaskState(message.username, message.value, false); - // If we got this on the server, relay out to all players in the same dimension - // TODO: Why is this a dimensional thing?! - if(!player.world.isRemote) { - Mekanism.packetHandler.sendToDimension(message, player.world.provider.getDimension()); + // If we got this on the server, relay out to all players in the same dimension + // TODO: Why is this a dimensional thing?! + if(!player.world.isRemote) { + Mekanism.packetHandler.sendToDimension(message, player.world.provider.getDimension()); + } } - } - else if(message.packetType == ScubaTankPacket.MODE) { - // Use has changed the mode of their gasmask; update it - ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); - if(!stack.isEmpty() && stack.getItem() instanceof ItemScubaTank) { - ((ItemScubaTank)stack.getItem()).toggleFlowing(stack); + else if(message.packetType == ScubaTankPacket.MODE) { + // Use has changed the mode of their gasmask; update it + ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + if(!stack.isEmpty() && stack.getItem() instanceof ItemScubaTank) { + ((ItemScubaTank)stack.getItem()).toggleFlowing(stack); + } } - } - else if (message.packetType == ScubaTankPacket.FULL) { - // This is a full sync; merge into our player state - Mekanism.playerState.setActiveGasmasks(message.activeGasmasks); - } - + else if (message.packetType == ScubaTankPacket.FULL) { + // This is a full sync; merge into our player state + Mekanism.playerState.setActiveGasmasks(message.activeGasmasks); + } + }, player); return null; }