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

Release 1.11.5.0 - Winter Update 2025 Hotfix 1

Browse Source
This commit is contained in:
Regalis11
2025-12-18 12:26:30 +02:00
parent b6c3724bf8
commit 4dc0ce9a2f
13 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/LinuxServer.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>1.11.4.1</Version>
<Version>1.11.5.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>
Barotrauma/BarotraumaServer/MacServer.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>1.11.4.1</Version>
<Version>1.11.5.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>
Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/MultiPlayerCampaign.cs
+17 -6
View File
@@ -273,16 +273,27 @@ namespace Barotrauma
}
if (characterInfo == null || characterInfo.Discarded) { continue; }
//reduce skills if the character has died
if (characterInfo.CauseOfDeath != null && characterInfo.CauseOfDeath.Type != CauseOfDeathType.Disconnected)
bool diedToDisconnect = characterInfo.CauseOfDeath is { Type: CauseOfDeathType.Disconnected };
bool diedForReal = characterInfo.CauseOfDeath != null && !diedToDisconnect;
if (diedForReal)
{
characterInfo.ApplyDeathEffects();
}
c.CharacterInfo = characterInfo;
// Only create new character data if the connected client has an active character (which they might not,
// eg. if they are in the lobby). Otherwise the CharacterCampaignData constructor would fall back to a new
// Character object, overwriting the inventory and wallet with empty values.
if (c.Character != null)
//Different scenarios for saving (or not saving) the character:
// 1. Client is controlling a character, character is alive
// -> save normally
// 2. Client is not controlling a character, previous character died
// -> save normally (applying skill reduction, getting rid of the items the character had, etc)
// 3. Client is not controlling a character, previous character died due to a disconnect (e.g. client left or went to the lobby, and later returned)
// -> do not save, the character should retain their skills and items
// 4. Client is not controlling a character, and they don't have any previous character data
// -> we shouldn't be getting to this point at all, we return earlier if no character info that has spawned is found
// 5. Client is not controlling a character, but they have previous character data which has not yet spawned (e.g. they've played on this server on some previous round)
// -> we shouldn't be getting to this point at all, we return earlier if no character info that has spawned is found
if (c.Character != null || diedForReal)
{
SetClientCharacterData(c);
}
Barotrauma/BarotraumaServer/WindowsServer.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<RootNamespace>Barotrauma</RootNamespace>
<Authors>FakeFish, Undertow Games</Authors>
<Product>Barotrauma Dedicated Server</Product>
<Version>1.11.4.1</Version>
<Version>1.11.5.0</Version>
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
<Platforms>AnyCPU;x64</Platforms>
<AssemblyName>DedicatedServer</AssemblyName>