Merge branch 'permission-overhaul'. Closes #49

Conflicts: Barotrauma/BarotraumaShared/Source/DebugConsole.cs Barotrauma/BarotraumaShared/Source/Networking/ChatMessage.cs
2017-12-20 19:35:58 +02:00
parent d03dd40336 b3c3970209
commit ce37411a29
19 changed files with 1126 additions and 268 deletions
@@ -2,7 +2,6 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.Linq;

 namespace Barotrauma
 {
@@ -16,7 +15,7 @@ namespace Barotrauma
            {
                while (QueuedCommands.Count>0)
                {
-                    ExecuteCommand(QueuedCommands[0], GameMain.Instance);
+                    ExecuteCommand(QueuedCommands[0]);
                    QueuedCommands.RemoveAt(0);
                }
            }