diff --git a/Barotrauma/BarotraumaServer/LinuxServer.csproj b/Barotrauma/BarotraumaServer/LinuxServer.csproj index 70d21f2f9..75ee24511 100644 --- a/Barotrauma/BarotraumaServer/LinuxServer.csproj +++ b/Barotrauma/BarotraumaServer/LinuxServer.csproj @@ -64,12 +64,14 @@ + + diff --git a/Barotrauma/BarotraumaServer/MacServer.csproj b/Barotrauma/BarotraumaServer/MacServer.csproj index c52ac83db..97d829f40 100644 --- a/Barotrauma/BarotraumaServer/MacServer.csproj +++ b/Barotrauma/BarotraumaServer/MacServer.csproj @@ -70,12 +70,14 @@ + + diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs index 7c40a6239..8e1d25257 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs @@ -211,9 +211,10 @@ namespace Barotrauma.Networking } Vector2 spawnPos = FindSpawnPos(); + bool anyCharacterSpawnedInShuttle = false; if (!GameMain.LuaCs.Game.overrideRespawnSub) { - RespawnCharacters(spawnPos, out bool anyCharacterSpawnedInShuttle); + RespawnCharacters(spawnPos, out anyCharacterSpawnedInShuttle); } if (anyCharacterSpawnedInShuttle) { diff --git a/Barotrauma/BarotraumaServer/WindowsServer.csproj b/Barotrauma/BarotraumaServer/WindowsServer.csproj index 8f3feeb16..a068d6734 100644 --- a/Barotrauma/BarotraumaServer/WindowsServer.csproj +++ b/Barotrauma/BarotraumaServer/WindowsServer.csproj @@ -70,6 +70,7 @@ + @@ -77,6 +78,7 @@ + diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua index c4b9f270d..410c41dad 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua @@ -326,7 +326,8 @@ RegisterBarotrauma("MissionMode") RegisterBarotrauma("PvPMode") RegisterBarotrauma("Mission") RegisterBarotrauma("AbandonedOutpostMission") -RegisterBarotrauma("AlienRuinMission") +RegisterBarotrauma("EliminateTargetsMission") +RegisterBarotrauma("EndMission") RegisterBarotrauma("BeaconMission") RegisterBarotrauma("CargoMission") RegisterBarotrauma("CombatMission") diff --git a/Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs b/Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs index 1c4840f4d..16db83df7 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs @@ -39,7 +39,7 @@ namespace Barotrauma.Networking CIRCUITBOX, READY_CHECK, READY_TO_SPAWN, - TAKEOVERBOT + TAKEOVERBOT, LUA_NET_MESSAGE }