From 7ffcee3075f4ae51eaf9a75f64727200e549fdd8 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sun, 7 Apr 2019 13:41:34 +0300
Subject: [PATCH] (df011a643) Fixed affliction source not being copied when
 creating a list of merged afflictions. Prevented affliction-based causes of
 death from getting the "killer" field assigned correctly, which prevented
 some afflictions from being unlocked.

---
 .../BarotraumaShared/Source/Characters/Health/CharacterHealth.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Health/CharacterHealth.cs b/Barotrauma/BarotraumaShared/Source/Characters/Health/CharacterHealth.cs
index e7f908c4e..9a25fcd52 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Health/CharacterHealth.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Health/CharacterHealth.cs
@@ -695,6 +695,7 @@ namespace Barotrauma
                     if (existingAffliction == null)
                     {
                         var newAffliction = affliction.Prefab.Instantiate(affliction.Strength);
+                        if (affliction.Source != null) { newAffliction.Source = affliction.Source; }
                         newAffliction.DamagePerSecond = affliction.DamagePerSecond;
                         newAffliction.DamagePerSecondTimer = affliction.DamagePerSecondTimer;
                         mergedAfflictions.Add(newAffliction);