Unstable 0.1500.8.0

2021-10-16 10:32:38 +09:00
parent de917c5d74
commit fc2f7b76da
57 changed files with 608 additions and 302 deletions
@@ -2470,6 +2470,7 @@ namespace Barotrauma.Networking
            msg.Write(serverSettings.AllowRespawn && missionAllowRespawn);
            msg.Write(serverSettings.AllowDisguises);
            msg.Write(serverSettings.AllowRewiring);
+            msg.Write(serverSettings.AllowFriendlyFire);
            msg.Write(serverSettings.LockAllDefaultWires);
            msg.Write(serverSettings.AllowRagdollButton);
            msg.Write(serverSettings.UseRespawnShuttle);
@@ -92,7 +92,7 @@ namespace Barotrauma
                case VoteType.Mode:
                    string modeIdentifier = inc.ReadString();
                    GameModePreset mode = GameModePreset.List.Find(gm => gm.Identifier == modeIdentifier);
-                    if (!mode.Votable) { break; }
+                    if (mode == null || !mode.Votable) { break; }
                    sender.SetVote(voteType, mode);
                    break;
                case VoteType.EndRound: