(913ed2ce9) Merge remote-tracking branch 'origin/dev' into enemy-ai

2019-03-26 14:07:11 +02:00
parent 14832e2040
commit 4b3e78b566
11 changed files with 167 additions and 45 deletions
@@ -813,7 +813,16 @@ namespace Barotrauma.Networking

            Log(c.Name + " has reported an error: " + errorStr, ServerLog.MessageType.Error);
            GameAnalyticsManager.AddErrorEventOnce("GameServer.HandleClientError:LevelsDontMatch" + error, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorStr);
-            KickClient(c, errorStr);
+
+            if (c.Connection == OwnerConnection)
+            {
+                SendDirectChatMessage(errorStr, c, ChatMessageType.MessageBox);
+                EndGame();
+            }
+            else
+            {
+                KickClient(c, errorStr);
+            }
        }

        public override void CreateEntityEvent(INetSerializable entity, object[] extraData = null)
@@ -1030,7 +1039,7 @@ namespace Barotrauma.Networking
            if (command == ClientPermissions.ManageRound && inc.PeekBoolean() && 
                GameMain.GameSession?.GameMode is MultiPlayerCampaign mpCampaign)
            {
-                if (!mpCampaign.AllowedToEndRound(sender.Character))
+                if (!mpCampaign.AllowedToEndRound(sender.Character) && !sender.HasPermission(command))
                {
                    return;
                }