Unstable 1.2.1.0

Barotrauma/BarotraumaShared/SharedSource/Map/FireSource.cs

@@ -91,7 +91,12 @@ namespace Barotrauma
             get { return hull; }
         }
 
-        public FireSource(Vector2 worldPosition, Hull spawningHull = null, bool isNetworkMessage = false)
+        /// <summary>
+        /// Which character caused this fire (if any)?
+        /// </summary>
+        public readonly Character SourceCharacter;
+
+        public FireSource(Vector2 worldPosition, Hull spawningHull = null, Character sourceCharacter = null, bool isNetworkMessage = false)
         {
             hull = Hull.FindHull(worldPosition, spawningHull);
             if (hull == null || worldPosition.Y < hull.WorldSurface) { return; }
@@ -109,6 +114,8 @@ namespace Barotrauma
                 position -= Submarine.Position;
             }
 
+            SourceCharacter = sourceCharacter;
+
 #if CLIENT
             lightSource = new LightSource(this.position, 50.0f, new Color(1.0f, 0.9f, 0.7f), hull?.Submarine);
 #endif
@@ -306,8 +313,12 @@ namespace Barotrauma
                 foreach (Limb limb in c.AnimController.Limbs)
                 {
                     if (limb.IsSevered) { continue; }
-                    c.LastDamageSource = null;
-                    c.DamageLimb(WorldPosition, limb, AfflictionPrefab.Burn.Instantiate(dmg).ToEnumerable(), 0.0f, false, 0.0f);
+                    c.LastDamageSource = SourceCharacter;
+                    c.DamageLimb(WorldPosition, limb, AfflictionPrefab.Burn.Instantiate(dmg).ToEnumerable(), 
+                        stun: 0.0f, 
+                        playSound: false, 
+                        attackImpulse: Vector2.Zero, 
+                        attacker: SourceCharacter);
                 }
 #if CLIENT
                 //let clients display the client-side damage immediately, otherwise they may not be able to react to the damage fast enough