Whitelist + conflict resolve

This commit is contained in:
juanjp600
2016-09-03 14:57:36 -03:00
parent 05f8805f81
commit ef2b0d8721
11 changed files with 368 additions and 70 deletions

View File

@@ -244,7 +244,7 @@ namespace Barotrauma
missionButton.UserData = InfoFrameTab.Mission;
missionButton.OnClicked = SelectInfoFrameTab;
if (GameMain.Server != null)
if (GameMain.Server != null)
{
var manageButton = new GUIButton(new Rectangle(200, -30, 130, 20), "Manage players", GUI.Style, infoFrame);
manageButton.UserData = InfoFrameTab.ManagePlayers;
@@ -269,7 +269,7 @@ namespace Barotrauma
break;
case InfoFrameTab.Mission:
CreateMissionInfo(infoFrame);
break;
break;
case InfoFrameTab.ManagePlayers:
GameMain.Server.ManagePlayersFrame(infoFrame);
break;