conflict fix

This commit is contained in:
Regalis
2017-05-17 18:56:45 +03:00
parent 095054182e
commit 9c1a76707f
+1 -1
View File
@@ -538,7 +538,7 @@ namespace Barotrauma.Networking
break; break;
case ServerPacketHeader.STARTGAME: case ServerPacketHeader.STARTGAME:
startGameCoroutine = GameMain.ShowLoading(StartGame(inc), false); startGameCoroutine = GameMain.Instance.ShowLoading(StartGame(inc), false);
break; break;
case ServerPacketHeader.ENDGAME: case ServerPacketHeader.ENDGAME:
string endMessage = inc.ReadString(); string endMessage = inc.ReadString();