From aade0197ff5ffaae1c561fea8be1a043be6965eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 31 May 2015 15:24:06 +0200 Subject: [PATCH] fix a possible NRE --- OpenRA.Game/Traits/Health.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenRA.Game/Traits/Health.cs b/OpenRA.Game/Traits/Health.cs index e7f268bc84..cb0efa4868 100755 --- a/OpenRA.Game/Traits/Health.cs +++ b/OpenRA.Game/Traits/Health.cs @@ -157,7 +157,10 @@ namespace OpenRA.Traits if (RemoveOnDeath) self.Destroy(); - Log.Write("debug", "{0} #{1} killed by {2} #{3}", self.Info.Name, self.ActorID, attacker.Info.Name, attacker.ActorID); + if (attacker == null) + Log.Write("debug", "{0} #{1} was killed.", self.Info.Name, self.ActorID); + else + Log.Write("debug", "{0} #{1} killed by {2} #{3}", self.Info.Name, self.ActorID, attacker.Info.Name, attacker.ActorID); } }