Remove workarounds for querying the PlayerActor in Created

abcdefg30 · reaperrr · commit 27d046589156 · 2020-05-30T19:47:29.000+02:00
diff --git a/OpenRA.Mods.Cnc/Traits/ResourcePurifier.cs b/OpenRA.Mods.Cnc/Traits/ResourcePurifier.cs
@@ -52,12 +52,7 @@ public ResourcePurifier(Actor self, ResourcePurifierInfo info)
 
 		protected override void Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query other player traits from self, knowing that
-			// it refers to the same actor as self.Owner.PlayerActor
-			var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;
-			playerResources = playerActor.Trait<PlayerResources>();
+			playerResources = self.Owner.PlayerActor.Trait<PlayerResources>();
 
 			base.Created(self);
 		}
diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/GrantPrerequisiteChargeDrainPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/GrantPrerequisiteChargeDrainPower.cs
@@ -56,13 +56,7 @@ public GrantPrerequisiteChargeDrainPower(Actor self, GrantPrerequisiteChargeDrai
 
 		protected override void Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query other player traits from self, knowing that
-			// it refers to the same actor as self.Owner.PlayerActor
-			var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;
-
-			techTree = playerActor.Trait<TechTree>();
+			techTree = self.Owner.PlayerActor.Trait<TechTree>();
 
 			base.Created(self);
 		}
diff --git a/OpenRA.Mods.Common/Traits/BotModules/BaseBuilderBotModule.cs b/OpenRA.Mods.Common/Traits/BotModules/BaseBuilderBotModule.cs
@@ -160,13 +160,9 @@ public BaseBuilderBotModule(Actor self, BaseBuilderBotModuleInfo info)
 
 		protected override void Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query player traits from self, which refers
-			// for bot modules always to the Player actor.
-			playerPower = self.TraitOrDefault<PowerManager>();
-			playerResources = self.Trait<PlayerResources>();
-			positionsUpdatedModules = self.TraitsImplementing<IBotPositionsUpdated>().ToArray();
+			playerPower = self.Owner.PlayerActor.TraitOrDefault<PowerManager>();
+			playerResources = self.Owner.PlayerActor.Trait<PlayerResources>();
+			positionsUpdatedModules = self.Owner.PlayerActor.TraitsImplementing<IBotPositionsUpdated>().ToArray();
 		}
 
 		protected override void TraitEnabled(Actor self)
diff --git a/OpenRA.Mods.Common/Traits/BotModules/HarvesterBotModule.cs b/OpenRA.Mods.Common/Traits/BotModules/HarvesterBotModule.cs
@@ -78,11 +78,7 @@ public HarvesterBotModule(Actor self, HarvesterBotModuleInfo info)
 
 		protected override void Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query player traits from self, which refers
-			// for bot modules always to the Player actor.
-			requestUnitProduction = self.TraitsImplementing<IBotRequestUnitProduction>().ToArray();
+			requestUnitProduction = self.Owner.PlayerActor.TraitsImplementing<IBotRequestUnitProduction>().ToArray();
 		}
 
 		protected override void TraitEnabled(Actor self)
diff --git a/OpenRA.Mods.Common/Traits/BotModules/McvManagerBotModule.cs b/OpenRA.Mods.Common/Traits/BotModules/McvManagerBotModule.cs
@@ -82,12 +82,8 @@ public McvManagerBotModule(Actor self, McvManagerBotModuleInfo info)
 
 		protected override void Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query player traits from self, which refers
-			// for bot modules always to the Player actor.
-			notifyPositionsUpdated = self.TraitsImplementing<IBotPositionsUpdated>().ToArray();
-			requestUnitProduction = self.TraitsImplementing<IBotRequestUnitProduction>().ToArray();
+			notifyPositionsUpdated = self.Owner.PlayerActor.TraitsImplementing<IBotPositionsUpdated>().ToArray();
+			requestUnitProduction = self.Owner.PlayerActor.TraitsImplementing<IBotRequestUnitProduction>().ToArray();
 		}
 
 		protected override void TraitEnabled(Actor self)
diff --git a/OpenRA.Mods.Common/Traits/BotModules/SquadManagerBotModule.cs b/OpenRA.Mods.Common/Traits/BotModules/SquadManagerBotModule.cs
@@ -150,12 +150,8 @@ public bool IsNotHiddenUnit(Actor a)
 
 		protected override void Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query player traits from self, which refers
-			// for bot modules always to the Player actor.
-			notifyPositionsUpdated = self.TraitsImplementing<IBotPositionsUpdated>().ToArray();
-			notifyIdleBaseUnits = self.TraitsImplementing<IBotNotifyIdleBaseUnits>().ToArray();
+			notifyPositionsUpdated = self.Owner.PlayerActor.TraitsImplementing<IBotPositionsUpdated>().ToArray();
+			notifyIdleBaseUnits = self.Owner.PlayerActor.TraitsImplementing<IBotNotifyIdleBaseUnits>().ToArray();
 		}
 
 		protected override void TraitEnabled(Actor self)
diff --git a/OpenRA.Mods.Common/Traits/BotModules/SupportPowerBotModule.cs b/OpenRA.Mods.Common/Traits/BotModules/SupportPowerBotModule.cs
@@ -54,11 +54,7 @@ public SupportPowerBotModule(Actor self, SupportPowerBotModuleInfo info)
 
 		protected override void Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query player traits from self, which refers
-			// for bot modules always to the Player actor.
-			supportPowerManager = self.Trait<SupportPowerManager>();
+			supportPowerManager = self.Owner.PlayerActor.Trait<SupportPowerManager>();
 		}
 
 		protected override void TraitEnabled(Actor self)
diff --git a/OpenRA.Mods.Common/Traits/BotModules/UnitBuilderBotModule.cs b/OpenRA.Mods.Common/Traits/BotModules/UnitBuilderBotModule.cs
@@ -62,11 +62,7 @@ public UnitBuilderBotModule(Actor self, UnitBuilderBotModuleInfo info)
 
 		protected override void Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query player traits from self, which refers
-			// for bot modules always to the Player actor.
-			requestPause = self.TraitsImplementing<IBotRequestPauseUnitProduction>().ToArray();
+			requestPause = self.Owner.PlayerActor.TraitsImplementing<IBotRequestPauseUnitProduction>().ToArray();
 		}
 
 		void IBotNotifyIdleBaseUnits.UpdatedIdleBaseUnits(List<Actor> idleUnits)
diff --git a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPlayerResources.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPlayerResources.cs
@@ -42,12 +42,7 @@ public GrantConditionOnPlayerResources(GrantConditionOnPlayerResourcesInfo info)
 
 		void INotifyCreated.Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query other player traits from self, knowing that
-			// it refers to the same actor as self.Owner.PlayerActor
-			var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;
-			playerResources = playerActor.Trait<PlayerResources>();
+			playerResources = self.Owner.PlayerActor.Trait<PlayerResources>();
 		}
 
 		void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
diff --git a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPrerequisite.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPrerequisite.cs
@@ -44,13 +44,7 @@ public GrantConditionOnPrerequisite(Actor self, GrantConditionOnPrerequisiteInfo
 
 		void INotifyCreated.Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query other player traits from self, knowing that
-			// it refers to the same actor as self.Owner.PlayerActor
-			var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;
-
-			globalManager = playerActor.Trait<GrantConditionOnPrerequisiteManager>();
+			globalManager = self.Owner.PlayerActor.Trait<GrantConditionOnPrerequisiteManager>();
 		}
 
 		void INotifyAddedToWorld.AddedToWorld(Actor self)
diff --git a/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs b/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
@@ -141,19 +141,13 @@ public ProductionQueue(ActorInitializer init, Actor playerActor, ProductionQueue
 
 		void INotifyCreated.Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query other player traits from self, knowing that
-			// it refers to the same actor as self.Owner.PlayerActor
-			var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;
-
-			playerPower = playerActor.TraitOrDefault<PowerManager>();
-			playerResources = playerActor.Trait<PlayerResources>();
-			developerMode = playerActor.Trait<DeveloperMode>();
-			techTree = playerActor.Trait<TechTree>();
+			playerPower = self.Owner.PlayerActor.TraitOrDefault<PowerManager>();
+			playerResources = self.Owner.PlayerActor.Trait<PlayerResources>();
+			developerMode = self.Owner.PlayerActor.Trait<DeveloperMode>();
+			techTree = self.Owner.PlayerActor.Trait<TechTree>();
 
 			productionTraits = self.TraitsImplementing<Production>().Where(p => p.Info.Produces.Contains(Info.Type)).ToArray();
-			CacheProducibles(playerActor);
+			CacheProducibles(self.Owner.PlayerActor);
 		}
 
 		protected void ClearQueue()
diff --git a/OpenRA.Mods.Common/Traits/Player/ProvidesPrerequisite.cs b/OpenRA.Mods.Common/Traits/Player/ProvidesPrerequisite.cs
@@ -69,13 +69,7 @@ public IEnumerable<string> ProvidesPrerequisites
 
 		protected override void Created(Actor self)
 		{
-			// Special case handling is required for the Player actor.
-			// Created is called before Player.PlayerActor is assigned,
-			// so we must query other player traits from self, knowing that
-			// it refers to the same actor as self.Owner.PlayerActor
-			var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;
-
-			techTree = playerActor.Trait<TechTree>();
+			techTree = self.Owner.PlayerActor.Trait<TechTree>();
 
 			Update();
 

Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,7 @@ public ResourcePurifier(Actor self, ResourcePurifierInfo info)`
`52`	`52`
`53`	`53`	`protected override void Created(Actor self)`
`54`	`54`	`{`
`55`		`- // Special case handling is required for the Player actor.`
`56`		`- // Created is called before Player.PlayerActor is assigned,`
`57`		`- // so we must query other player traits from self, knowing that`
`58`		`- // it refers to the same actor as self.Owner.PlayerActor`
`59`		`- var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;`
`60`		`- playerResources = playerActor.Trait<PlayerResources>();`
	`55`	`+ playerResources = self.Owner.PlayerActor.Trait<PlayerResources>();`
`61`	`56`
`62`	`57`	`base.Created(self);`
`63`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,7 @@ public GrantPrerequisiteChargeDrainPower(Actor self, GrantPrerequisiteChargeDrai`
`56`	`56`
`57`	`57`	`protected override void Created(Actor self)`
`58`	`58`	`{`
`59`		`- // Special case handling is required for the Player actor.`
`60`		`- // Created is called before Player.PlayerActor is assigned,`
`61`		`- // so we must query other player traits from self, knowing that`
`62`		`- // it refers to the same actor as self.Owner.PlayerActor`
`63`		`- var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;`
`64`		`-`
`65`		`- techTree = playerActor.Trait<TechTree>();`
	`59`	`+ techTree = self.Owner.PlayerActor.Trait<TechTree>();`
`66`	`60`
`67`	`61`	`base.Created(self);`
`68`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,11 +78,7 @@ public HarvesterBotModule(Actor self, HarvesterBotModuleInfo info)`
`78`	`78`
`79`	`79`	`protected override void Created(Actor self)`
`80`	`80`	`{`
`81`		`- // Special case handling is required for the Player actor.`
`82`		`- // Created is called before Player.PlayerActor is assigned,`
`83`		`- // so we must query player traits from self, which refers`
`84`		`- // for bot modules always to the Player actor.`
`85`		`- requestUnitProduction = self.TraitsImplementing<IBotRequestUnitProduction>().ToArray();`
	`81`	`+ requestUnitProduction = self.Owner.PlayerActor.TraitsImplementing<IBotRequestUnitProduction>().ToArray();`
`86`	`82`	`}`
`87`	`83`
`88`	`84`	`protected override void TraitEnabled(Actor self)`
Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,8 @@ public McvManagerBotModule(Actor self, McvManagerBotModuleInfo info)`
`82`	`82`
`83`	`83`	`protected override void Created(Actor self)`
`84`	`84`	`{`
`85`		`- // Special case handling is required for the Player actor.`
`86`		`- // Created is called before Player.PlayerActor is assigned,`
`87`		`- // so we must query player traits from self, which refers`
`88`		`- // for bot modules always to the Player actor.`
`89`		`- notifyPositionsUpdated = self.TraitsImplementing<IBotPositionsUpdated>().ToArray();`
`90`		`- requestUnitProduction = self.TraitsImplementing<IBotRequestUnitProduction>().ToArray();`
	`85`	`+ notifyPositionsUpdated = self.Owner.PlayerActor.TraitsImplementing<IBotPositionsUpdated>().ToArray();`
	`86`	`+ requestUnitProduction = self.Owner.PlayerActor.TraitsImplementing<IBotRequestUnitProduction>().ToArray();`
`91`	`87`	`}`
`92`	`88`
`93`	`89`	`protected override void TraitEnabled(Actor self)`
Original file line number	Diff line number	Diff line change
`@@ -150,12 +150,8 @@ public bool IsNotHiddenUnit(Actor a)`
`150`	`150`
`151`	`151`	`protected override void Created(Actor self)`
`152`	`152`	`{`
`153`		`- // Special case handling is required for the Player actor.`
`154`		`- // Created is called before Player.PlayerActor is assigned,`
`155`		`- // so we must query player traits from self, which refers`
`156`		`- // for bot modules always to the Player actor.`
`157`		`- notifyPositionsUpdated = self.TraitsImplementing<IBotPositionsUpdated>().ToArray();`
`158`		`- notifyIdleBaseUnits = self.TraitsImplementing<IBotNotifyIdleBaseUnits>().ToArray();`
	`153`	`+ notifyPositionsUpdated = self.Owner.PlayerActor.TraitsImplementing<IBotPositionsUpdated>().ToArray();`
	`154`	`+ notifyIdleBaseUnits = self.Owner.PlayerActor.TraitsImplementing<IBotNotifyIdleBaseUnits>().ToArray();`
`159`	`155`	`}`
`160`	`156`
`161`	`157`	`protected override void TraitEnabled(Actor self)`
Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,7 @@ public SupportPowerBotModule(Actor self, SupportPowerBotModuleInfo info)`
`54`	`54`
`55`	`55`	`protected override void Created(Actor self)`
`56`	`56`	`{`
`57`		`- // Special case handling is required for the Player actor.`
`58`		`- // Created is called before Player.PlayerActor is assigned,`
`59`		`- // so we must query player traits from self, which refers`
`60`		`- // for bot modules always to the Player actor.`
`61`		`- supportPowerManager = self.Trait<SupportPowerManager>();`
	`57`	`+ supportPowerManager = self.Owner.PlayerActor.Trait<SupportPowerManager>();`
`62`	`58`	`}`
`63`	`59`
`64`	`60`	`protected override void TraitEnabled(Actor self)`
Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,7 @@ public UnitBuilderBotModule(Actor self, UnitBuilderBotModuleInfo info)`
`62`	`62`
`63`	`63`	`protected override void Created(Actor self)`
`64`	`64`	`{`
`65`		`- // Special case handling is required for the Player actor.`
`66`		`- // Created is called before Player.PlayerActor is assigned,`
`67`		`- // so we must query player traits from self, which refers`
`68`		`- // for bot modules always to the Player actor.`
`69`		`- requestPause = self.TraitsImplementing<IBotRequestPauseUnitProduction>().ToArray();`
	`65`	`+ requestPause = self.Owner.PlayerActor.TraitsImplementing<IBotRequestPauseUnitProduction>().ToArray();`
`70`	`66`	`}`
`71`	`67`
`72`	`68`	`void IBotNotifyIdleBaseUnits.UpdatedIdleBaseUnits(List<Actor> idleUnits)`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,7 @@ public GrantConditionOnPlayerResources(GrantConditionOnPlayerResourcesInfo info)`
`42`	`42`
`43`	`43`	`void INotifyCreated.Created(Actor self)`
`44`	`44`	`{`
`45`		`- // Special case handling is required for the Player actor.`
`46`		`- // Created is called before Player.PlayerActor is assigned,`
`47`		`- // so we must query other player traits from self, knowing that`
`48`		`- // it refers to the same actor as self.Owner.PlayerActor`
`49`		`- var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;`
`50`		`- playerResources = playerActor.Trait<PlayerResources>();`
	`45`	`+ playerResources = self.Owner.PlayerActor.Trait<PlayerResources>();`
`51`	`46`	`}`
`52`	`47`
`53`	`48`	`void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)`
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,7 @@ public GrantConditionOnPrerequisite(Actor self, GrantConditionOnPrerequisiteInfo`
`44`	`44`
`45`	`45`	`void INotifyCreated.Created(Actor self)`
`46`	`46`	`{`
`47`		`- // Special case handling is required for the Player actor.`
`48`		`- // Created is called before Player.PlayerActor is assigned,`
`49`		`- // so we must query other player traits from self, knowing that`
`50`		`- // it refers to the same actor as self.Owner.PlayerActor`
`51`		`- var playerActor = self.Info.Name == "player" ? self : self.Owner.PlayerActor;`
`52`		`-`
`53`		`- globalManager = playerActor.Trait<GrantConditionOnPrerequisiteManager>();`
	`47`	`+ globalManager = self.Owner.PlayerActor.Trait<GrantConditionOnPrerequisiteManager>();`
`54`	`48`	`}`
`55`	`49`
`56`	`50`	`void INotifyAddedToWorld.AddedToWorld(Actor self)`