From 5be92460c1e5ec2f3fce0c837fbad41614a361b4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 24 Oct 2018 18:53:05 -0400 Subject: [PATCH] Fixed crash --- core/src/io/anuke/mindustry/maps/missions/Mission.java | 2 +- core/src/io/anuke/mindustry/net/NetworkIO.java | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/core/src/io/anuke/mindustry/maps/missions/Mission.java b/core/src/io/anuke/mindustry/maps/missions/Mission.java index 4c0b880040..bcf52e91bf 100644 --- a/core/src/io/anuke/mindustry/maps/missions/Mission.java +++ b/core/src/io/anuke/mindustry/maps/missions/Mission.java @@ -79,7 +79,7 @@ public abstract class Mission{ public void onComplete(){ if(showComplete && !headless){ - ui.hudfrag.showText("[LIGHT_GRAY]"+menuDisplayString() + ":\n" + Bundles.get("text.mission.complete")); + threads.runGraphics(() -> ui.hudfrag.showText("[LIGHT_GRAY]"+menuDisplayString() + ":\n" + Bundles.get("text.mission.complete"))); } } diff --git a/core/src/io/anuke/mindustry/net/NetworkIO.java b/core/src/io/anuke/mindustry/net/NetworkIO.java index 9083b1803e..f6a3abf58b 100644 --- a/core/src/io/anuke/mindustry/net/NetworkIO.java +++ b/core/src/io/anuke/mindustry/net/NetworkIO.java @@ -29,10 +29,6 @@ public class NetworkIO{ public static void writeWorld(Player player, OutputStream os){ try(DataOutputStream stream = new DataOutputStream(os)){ - - stream.writeFloat(Timers.time()); //timer time - stream.writeLong(TimeUtils.millis()); //timestamp - //--GENERAL STATE-- stream.writeByte(state.mode.ordinal()); //gamemode stream.writeUTF(world.getMap().name); //map name @@ -156,11 +152,7 @@ public class NetworkIO{ Player player = players[0]; try(DataInputStream stream = new DataInputStream(is)){ - float timerTime = stream.readFloat(); - long timestamp = stream.readLong(); - Timers.clear(); - Timers.resetTime(timerTime + (TimeUtils.timeSinceMillis(timestamp) / 1000f) * 60f); //general state byte mode = stream.readByte();