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

2025-06-17 15:45:16 -03:00
parent 8af2267c53 fd34473640
commit 2368640841
298 changed files with 7347 additions and 2422 deletions
@@ -677,6 +677,7 @@ namespace Barotrauma
                {
                    msg.WriteUInt32(CauseOfDeath.Affliction.UintIdentifier);
                }
+                msg.WriteUInt16(CauseOfDeath.Killer?.ID ?? NullEntityID);
                msg.WriteBoolean(forceAfflictionData);
                if (forceAfflictionData)
                {