conflict fix
This commit is contained in:
@@ -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();
|
||||||
|
|||||||
Reference in New Issue
Block a user