vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git

Browse Source
This commit is contained in:
Evil Factory
2022-04-28 12:36:24 -03:00
parent cb50c69fc6 15d18e6ff6
commit 4277dd447c
91 changed files with 1140 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
+11 -12
View File
@@ -286,7 +286,10 @@ namespace Barotrauma.Networking
if (newClient.Connection == OwnerConnection && OwnerConnection != null)
{
newClient.GivePermission(ClientPermissions.All);
newClient.PermittedConsoleCommands.AddRange(DebugConsole.Commands);
foreach (var command in DebugConsole.Commands)
{
newClient.PermittedConsoleCommands.Add(command);
}
SendConsoleMessage("Granted all permissions to " + newClient.Name + ".", newClient);
}
@@ -1239,16 +1242,6 @@ namespace Barotrauma.Networking
}
}
#warning TODO: remove this later
/*private IEnumerable<object> RoundRestartLoop()
{
yield return new WaitForSeconds(8.0f);
EndGame();
yield return new WaitForSeconds(8.0f);
StartGame();
yield return CoroutineStatus.Success;
}*/
private void ReadCrewMessage(IReadMessage inc, Client sender)
{
if (GameMain.GameSession?.Campaign is MultiPlayerCampaign mpCampaign)
@@ -1407,10 +1400,16 @@ namespace Barotrauma.Networking
bool continueCampaign = inc.ReadBoolean();
if (mpCampaign != null && mpCampaign.GameOver || continueCampaign)
{
if (mpCampaign.AllowedToManageCampaign(sender, ClientPermissions.ManageCampaign) || mpCampaign.AllowedToManageCampaign(sender, ClientPermissions.ManageMap))
if (gameStarted)
{
SendDirectChatMessage("Cannot continue the campaign from the previous save (round already running).", sender, ChatMessageType.Error);
break;
}
else if (mpCampaign.AllowedToManageCampaign(sender, ClientPermissions.ManageCampaign) || mpCampaign.AllowedToManageCampaign(sender, ClientPermissions.ManageMap))
{
MultiPlayerCampaign.LoadCampaign(GameMain.GameSession.SavePath);
}
}
else if (!gameStarted && !initiatedStartGame)
{