Version 0.4.2, bugfixes

Zetrith · Zetrith · commit 994f60bce1e7 · 2019-01-17T16:17:14.000+01:00
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -3,7 +3,7 @@
 <Manifest>
 
   <identifier>Multiplayer</identifier>
-  <version>0.4.1</version>
+  <version>0.4.2</version>
   <manifestUri>https://raw.githubusercontent.com/Zetrith/Multiplayer/master/About/Manifest.xml</manifestUri>
   <downloadUri>https://github.com/Zetrith/Multiplayer/releases/latest</downloadUri>
 
diff --git a/Source/Client/ArbiterPatches.cs b/Source/Client/ArbiterPatches.cs
@@ -12,7 +12,7 @@
 
 namespace Multiplayer.Client
 {
-    [HarmonyPatch(typeof(GUI), nameof(GUI.skin), MethodType.Getter)]
+    [MpPatch(typeof(GUI), "get_" + nameof(GUI.skin))]
     static class GUISkinArbiter_Patch
     {
         static bool Prefix(ref GUISkin __result)
@@ -53,6 +53,7 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
     [MpPatch(typeof(Section), nameof(Section.RegenerateLayers))]
     [MpPatch(typeof(SectionLayer), nameof(SectionLayer.DrawLayer))]
     [MpPatch(typeof(Map), nameof(Map.MapUpdate))]
+    [MpPatch(typeof(GUIStyle), nameof(GUIStyle.CalcSize))]
     static class CancelForArbiter
     {
         static bool Prefix() => !Multiplayer.arbiterInstance;
diff --git a/Source/Client/ClientNetworking.cs b/Source/Client/ClientNetworking.cs
@@ -494,7 +494,7 @@ public SteamServerConn(CSteamID remoteId) : base(remoteId)
 
         protected override void OnDisconnect()
         {
-            serverPlayer.Server.OnDisconnected(this);
+            serverPlayer.Server.OnDisconnected(this, MpDisconnectReason.ClientLeft);
         }
     }
 
diff --git a/Source/Client/Multiplayer.cs b/Source/Client/Multiplayer.cs
@@ -152,6 +152,8 @@ static Multiplayer()
             Sync.InitHandlers();
 
             HandleCommandLine();
+
+            RuntimeHelpers.RunClassConstructor(typeof(Text).TypeHandle);
         }
 
         private static void SetUsername()
@@ -174,6 +176,11 @@ private static void SetUsername()
                 Multiplayer.username = "Player" + Rand.Range(0, 9999);
         }
 
+        private static void DoubleLongEvent(Action action, string textKey)
+        {
+            LongEventHandler.QueueLongEvent(() => LongEventHandler.QueueLongEvent(action, textKey, false, null), textKey, false, null);
+        }
+
         private static void HandleCommandLine()
         {
             if (GenCommandLine.TryGetCommandLineArg("connect", out string ip))
@@ -190,7 +197,7 @@ private static void HandleCommandLine()
                     int.TryParse(split[1], out port);
 
                 if (IPAddress.TryParse(ip, out IPAddress addr))
-                    LongEventHandler.QueueLongEvent(() => ClientUtil.TryConnect(addr, port), "Connecting", false, null);
+                    DoubleLongEvent(() => ClientUtil.TryConnect(addr, port), "Connecting");
             }
 
             if (GenCommandLine.CommandLineArgPassed("arbiter"))
@@ -202,7 +209,7 @@ private static void HandleCommandLine()
 
             if (GenCommandLine.TryGetCommandLineArg("replay", out string replay))
             {
-                LongEventHandler.QueueLongEvent(() =>
+                DoubleLongEvent(() =>
                 {
                     Replay.LoadReplay(Replay.ReplayFile(replay), true, () =>
                     {
@@ -214,7 +221,7 @@ private static void HandleCommandLine()
 
                         Application.Quit();
                     });
-                }, "Replay", false, null);
+                }, "Replay");
             }
 
             if (GenCommandLine.CommandLineArgPassed("printsync"))
@@ -332,6 +339,16 @@ private static void DoPatches()
                     new HarmonyMethod(typeof(PageModsPatch), nameof(PageModsPatch.Postfix))
                 );
             }
+
+            var cancelForArbiter = new HarmonyMethod(typeof(CancelForArbiter), "Prefix");
+
+            var prisonLaborBehavior = MpReflection.GetTypeByName("PrisonLabor.Behaviour_MotivationIcon");
+            if (prisonLaborBehavior != null)
+                harmony.Patch(prisonLaborBehavior.GetMethod("Update", new Type[0]), cancelForArbiter);
+
+            var prisonLaborPawnIcons = MpReflection.GetTypeByName("PrisonLabor.Core.GUI_Components.PawnIcons") ?? MpReflection.GetTypeByName("PrisonLabor.MapComponent_Icons");
+            if (prisonLaborPawnIcons != null)
+                harmony.Patch(prisonLaborPawnIcons.GetMethod("MapComponentTick", new Type[0]), cancelForArbiter);
         }
 
         public static UniqueList<Texture2D> icons = new UniqueList<Texture2D>();
diff --git a/Source/Client/Patches.cs b/Source/Client/Patches.cs
@@ -830,6 +830,7 @@ static class LoadGameMarker
     [MpPatch(typeof(SoundStarter), nameof(SoundStarter.PlayOneShot))]
     [MpPatch(typeof(Command_SetPlantToGrow), nameof(Command_SetPlantToGrow.WarnAsAppropriate))]
     [MpPatch(typeof(TutorUtility), nameof(TutorUtility.DoModalDialogIfNotKnown))]
+    [MpPatch(typeof(CameraJumper), nameof(CameraJumper.TryHideWorld))]
     static class CancelFeedbackNotTargetedAtMe
     {
         public static bool Cancel =>
@@ -840,6 +841,18 @@ static class CancelFeedbackNotTargetedAtMe
         static bool Prefix() => !Cancel;
     }
 
+    [HarmonyPatch(typeof(Targeter), nameof(Targeter.BeginTargeting), typeof(TargetingParameters), typeof(Action<LocalTargetInfo>), typeof(Pawn), typeof(Action), typeof(Texture2D))]
+    static class CancelBeginTargeting
+    {
+        static bool Prefix()
+        {
+            if (TickPatch.currentExecutingCmdIssuedBySelf && MapAsyncTimeComp.executingCmdMap != null)
+                MapAsyncTimeComp.keepTheMap = true;
+
+            return !CancelFeedbackNotTargetedAtMe.Cancel;
+        }
+    }
+
     [MpPatch(typeof(MoteMaker), nameof(MoteMaker.MakeStaticMote), new[] { typeof(IntVec3), typeof(Map), typeof(ThingDef), typeof(float) })]
     [MpPatch(typeof(MoteMaker), nameof(MoteMaker.MakeStaticMote), new[] { typeof(Vector3), typeof(Map), typeof(ThingDef), typeof(float) })]
     static class CancelMotesNotTargetedAtMe
@@ -1058,6 +1071,9 @@ public static void SetupMap(Map map)
             async.mapTicks = Find.Maps.Where(m => m != map).Select(m => m.AsyncTime()?.mapTicks).Max() ?? Find.TickManager.TicksGame;
             async.storyteller = new Storyteller(Find.Storyteller.def, Find.Storyteller.difficulty);
             async.storyWatcher = new StoryWatcher();
+
+            if (!Multiplayer.WorldComp.asyncTime)
+                async.TimeSpeed = Find.TickManager.CurTimeSpeed;
         }
     }
 
diff --git a/Source/Client/PlayerCursors.cs b/Source/Client/PlayerCursors.cs
@@ -74,6 +74,7 @@ static void Postfix()
                 {
                     if (!drawnThisUpdate.Add(sel.Key)) continue;
                     if (!ThingsById.thingsById.TryGetValue(sel.Key, out Thing thing)) continue;
+                    if (thing.Map != Find.CurrentMap) continue;
 
                     selTimes[thing] = sel.Value;
                     SelectionDrawerUtility.CalculateSelectionBracketPositionsWorld(SelectionDrawer.bracketLocs, thing, thing.DrawPos, thing.RotatedSize.ToVector2(), selTimes, Vector2.one, 1f);
diff --git a/Source/Client/ScribeUtil.cs b/Source/Client/ScribeUtil.cs
@@ -31,7 +31,7 @@ public void UnregisterAllTemp()
 
         public void UnregisterAllFrom(Map map)
         {
-            foreach (var val in allObjectsByLoadID.Values)
+            foreach (var val in allObjectsByLoadID.Values.ToArray())
             {
                 if (val is Thing thing && thing.Map == map ||
                     val is PassingShip ship && ship.Map == map ||
diff --git a/Source/Common/MultiplayerServer.cs b/Source/Common/MultiplayerServer.cs
@@ -220,7 +220,7 @@ public ServerPlayer OnConnected(IConnection conn)
             return conn.serverPlayer;
         }
 
-        public void OnDisconnected(IConnection conn)
+        public void OnDisconnected(IConnection conn, MpDisconnectReason reason)
         {
             if (conn.State == ConnectionStateEnum.Disconnected) return;
 
@@ -243,7 +243,7 @@ public void OnDisconnected(IConnection conn)
 
             conn.State = ConnectionStateEnum.Disconnected;
 
-            MpLog.Log($"Disconnected: {conn}");
+            MpLog.Log($"Disconnected ({reason}): {conn}");
         }
 
         public void SendToAll(Packets id)
@@ -371,7 +371,7 @@ public void OnPeerConnected(NetPeer peer)
         public void OnPeerDisconnected(NetPeer peer, DisconnectInfo disconnectInfo)
         {
             IConnection conn = peer.GetConnection();
-            server.OnDisconnected(conn);
+            server.OnDisconnected(conn, MpDisconnectReason.ClientLeft);
         }
 
         public void OnNetworkLatencyUpdate(NetPeer peer, int latency)
@@ -468,7 +468,7 @@ public void Disconnect(string reasonKey)
         public void Disconnect(MpDisconnectReason reason, byte[] data = null)
         {
             conn.Close(reason, data);
-            Server.OnDisconnected(conn);
+            Server.OnDisconnected(conn, reason);
         }
 
         public void SendChat(string msg)
diff --git a/Source/Common/Networking.cs b/Source/Common/Networking.cs
@@ -253,6 +253,7 @@ public enum MpDisconnectReason : byte
         ServerClosed,
         ServerFull,
         Kick,
+        ClientLeft,
     }
 
     public class PacketReadException : Exception
diff --git a/Source/Common/Version.cs b/Source/Common/Version.cs
@@ -2,7 +2,7 @@
 {
     public static class MpVersion
     {
-        public const string Version = "0.4.1";
+        public const string Version = "0.4.2";
         public const int Protocol = 11;
 
 #if DEBUG

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace Multiplayer.Client`
`14`	`14`	`{`
`15`		`- [HarmonyPatch(typeof(GUI), nameof(GUI.skin), MethodType.Getter)]`
	`15`	`+ [MpPatch(typeof(GUI), "get_" + nameof(GUI.skin))]`
`16`	`16`	`static class GUISkinArbiter_Patch`
`17`	`17`	`{`
`18`	`18`	`static bool Prefix(ref GUISkin __result)`
`@@ -53,6 +53,7 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst`
`53`	`53`	`[MpPatch(typeof(Section), nameof(Section.RegenerateLayers))]`
`54`	`54`	`[MpPatch(typeof(SectionLayer), nameof(SectionLayer.DrawLayer))]`
`55`	`55`	`[MpPatch(typeof(Map), nameof(Map.MapUpdate))]`
	`56`	`+ [MpPatch(typeof(GUIStyle), nameof(GUIStyle.CalcSize))]`
`56`	`57`	`static class CancelForArbiter`
`57`	`58`	`{`
`58`	`59`	`static bool Prefix() => !Multiplayer.arbiterInstance;`
Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ public SteamServerConn(CSteamID remoteId) : base(remoteId)`
`494`	`494`
`495`	`495`	`protected override void OnDisconnect()`
`496`	`496`	`{`
`497`		`- serverPlayer.Server.OnDisconnected(this);`
	`497`	`+ serverPlayer.Server.OnDisconnected(this, MpDisconnectReason.ClientLeft);`
`498`	`498`	`}`
`499`	`499`	`}`
`500`	`500`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,8 @@ static Multiplayer()`
`152`	`152`	`Sync.InitHandlers();`
`153`	`153`
`154`	`154`	`HandleCommandLine();`
	`155`	`+`
	`156`	`+ RuntimeHelpers.RunClassConstructor(typeof(Text).TypeHandle);`
`155`	`157`	`}`
`156`	`158`
`157`	`159`	`private static void SetUsername()`
`@@ -174,6 +176,11 @@ private static void SetUsername()`
`174`	`176`	`Multiplayer.username = "Player" + Rand.Range(0, 9999);`
`175`	`177`	`}`
`176`	`178`
	`179`	`+ private static void DoubleLongEvent(Action action, string textKey)`
	`180`	`+ {`
	`181`	`+ LongEventHandler.QueueLongEvent(() => LongEventHandler.QueueLongEvent(action, textKey, false, null), textKey, false, null);`
	`182`	`+ }`
	`183`	`+`
`177`	`184`	`private static void HandleCommandLine()`
`178`	`185`	`{`
`179`	`186`	`if (GenCommandLine.TryGetCommandLineArg("connect", out string ip))`
`@@ -190,7 +197,7 @@ private static void HandleCommandLine()`
`190`	`197`	`int.TryParse(split[1], out port);`
`191`	`198`
`192`	`199`	`if (IPAddress.TryParse(ip, out IPAddress addr))`
`193`		`- LongEventHandler.QueueLongEvent(() => ClientUtil.TryConnect(addr, port), "Connecting", false, null);`
	`200`	`+ DoubleLongEvent(() => ClientUtil.TryConnect(addr, port), "Connecting");`
`194`	`201`	`}`
`195`	`202`
`196`	`203`	`if (GenCommandLine.CommandLineArgPassed("arbiter"))`
`@@ -202,7 +209,7 @@ private static void HandleCommandLine()`
`202`	`209`
`203`	`210`	`if (GenCommandLine.TryGetCommandLineArg("replay", out string replay))`
`204`	`211`	`{`
`205`		`- LongEventHandler.QueueLongEvent(() =>`
	`212`	`+ DoubleLongEvent(() =>`
`206`	`213`	`{`
`207`	`214`	`Replay.LoadReplay(Replay.ReplayFile(replay), true, () =>`
`208`	`215`	`{`
`@@ -214,7 +221,7 @@ private static void HandleCommandLine()`
`214`	`221`
`215`	`222`	`Application.Quit();`
`216`	`223`	`});`
`217`		`- }, "Replay", false, null);`
	`224`	`+ }, "Replay");`
`218`	`225`	`}`
`219`	`226`
`220`	`227`	`if (GenCommandLine.CommandLineArgPassed("printsync"))`
`@@ -332,6 +339,16 @@ private static void DoPatches()`
`332`	`339`	`new HarmonyMethod(typeof(PageModsPatch), nameof(PageModsPatch.Postfix))`
`333`	`340`	`);`
`334`	`341`	`}`
	`342`	`+`
	`343`	`+ var cancelForArbiter = new HarmonyMethod(typeof(CancelForArbiter), "Prefix");`
	`344`	`+`
	`345`	`+ var prisonLaborBehavior = MpReflection.GetTypeByName("PrisonLabor.Behaviour_MotivationIcon");`
	`346`	`+ if (prisonLaborBehavior != null)`
	`347`	`+ harmony.Patch(prisonLaborBehavior.GetMethod("Update", new Type[0]), cancelForArbiter);`
	`348`	`+`
	`349`	`+ var prisonLaborPawnIcons = MpReflection.GetTypeByName("PrisonLabor.Core.GUI_Components.PawnIcons") ?? MpReflection.GetTypeByName("PrisonLabor.MapComponent_Icons");`
	`350`	`+ if (prisonLaborPawnIcons != null)`
	`351`	`+ harmony.Patch(prisonLaborPawnIcons.GetMethod("MapComponentTick", new Type[0]), cancelForArbiter);`
`335`	`352`	`}`
`336`	`353`
`337`	`354`	`public static UniqueList<Texture2D> icons = new UniqueList<Texture2D>();`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ static void Postfix()`
`74`	`74`	`{`
`75`	`75`	`if (!drawnThisUpdate.Add(sel.Key)) continue;`
`76`	`76`	`if (!ThingsById.thingsById.TryGetValue(sel.Key, out Thing thing)) continue;`
	`77`	`+ if (thing.Map != Find.CurrentMap) continue;`
`77`	`78`
`78`	`79`	`selTimes[thing] = sel.Value;`
`79`	`80`	`SelectionDrawerUtility.CalculateSelectionBracketPositionsWorld(SelectionDrawer.bracketLocs, thing, thing.DrawPos, thing.RotatedSize.ToVector2(), selTimes, Vector2.one, 1f);`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void UnregisterAllTemp()`
`31`	`31`
`32`	`32`	`public void UnregisterAllFrom(Map map)`
`33`	`33`	`{`
`34`		`- foreach (var val in allObjectsByLoadID.Values)`
	`34`	`+ foreach (var val in allObjectsByLoadID.Values.ToArray())`
`35`	`35`	`{`
`36`	`36`	`if (val is Thing thing && thing.Map == map \|\|`
`37`	`37`	`val is PassingShip ship && ship.Map == map \|\|`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ public ServerPlayer OnConnected(IConnection conn)`
`220`	`220`	`return conn.serverPlayer;`
`221`	`221`	`}`
`222`	`222`
`223`		`- public void OnDisconnected(IConnection conn)`
	`223`	`+ public void OnDisconnected(IConnection conn, MpDisconnectReason reason)`
`224`	`224`	`{`
`225`	`225`	`if (conn.State == ConnectionStateEnum.Disconnected) return;`
`226`	`226`
`@@ -243,7 +243,7 @@ public void OnDisconnected(IConnection conn)`
`243`	`243`
`244`	`244`	`conn.State = ConnectionStateEnum.Disconnected;`
`245`	`245`
`246`		`- MpLog.Log($"Disconnected: {conn}");`
	`246`	`+ MpLog.Log($"Disconnected ({reason}): {conn}");`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`public void SendToAll(Packets id)`
`@@ -371,7 +371,7 @@ public void OnPeerConnected(NetPeer peer)`
`371`	`371`	`public void OnPeerDisconnected(NetPeer peer, DisconnectInfo disconnectInfo)`
`372`	`372`	`{`
`373`	`373`	`IConnection conn = peer.GetConnection();`
`374`		`- server.OnDisconnected(conn);`
	`374`	`+ server.OnDisconnected(conn, MpDisconnectReason.ClientLeft);`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`public void OnNetworkLatencyUpdate(NetPeer peer, int latency)`
`@@ -468,7 +468,7 @@ public void Disconnect(string reasonKey)`
`468`	`468`	`public void Disconnect(MpDisconnectReason reason, byte[] data = null)`
`469`	`469`	`{`
`470`	`470`	`conn.Close(reason, data);`
`471`		`- Server.OnDisconnected(conn);`
	`471`	`+ Server.OnDisconnected(conn, reason);`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`public void SendChat(string msg)`
Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,7 @@ public enum MpDisconnectReason : byte`
`253`	`253`	`ServerClosed,`
`254`	`254`	`ServerFull,`
`255`	`255`	`Kick,`
	`256`	`+ ClientLeft,`
`256`	`257`	`}`
`257`	`258`
`258`	`259`	`public class PacketReadException : Exception`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`public static class MpVersion`
`4`	`4`	`{`
`5`		`- public const string Version = "0.4.1";`
	`5`	`+ public const string Version = "0.4.2";`
`6`	`6`	`public const int Protocol = 11;`
`7`	`7`
`8`	`8`	`#if DEBUG`