From 8174d0e69ac08100af6d6f9f5d33fb21167a5861 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sat, 3 Feb 2018 15:14:45 +0000
Subject: [PATCH] Use EffectiveOwner for actor tooltips.

---
 OpenRA.Mods.Common/Traits/Tooltip.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Traits/Tooltip.cs b/OpenRA.Mods.Common/Traits/Tooltip.cs
index d2f7040702..4de6597029 100644
--- a/OpenRA.Mods.Common/Traits/Tooltip.cs
+++ b/OpenRA.Mods.Common/Traits/Tooltip.cs
@@ -77,7 +77,14 @@ namespace OpenRA.Mods.Common.Traits
 		readonly TooltipInfo info;
 
 		public ITooltipInfo TooltipInfo { get { return info; } }
-		public Player Owner { get { return self.Owner; } }
+
+		public Player Owner
+		{
+			get
+			{
+				return self.EffectiveOwner != null ? self.EffectiveOwner.Owner : self.Owner;
+			}
+		}
 
 		public Tooltip(Actor self, TooltipInfo info)
 			: base(info)