From d9f5588a1f336b189aa484c17393ce206390ece3 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Mon, 30 Oct 2023 16:29:25 +0100 Subject: [PATCH] Fix warnings about NREs in WithEmbeddedTurretSpriteBody --- .../Traits/Render/WithEmbeddedTurretSpriteBody.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.Cnc/Traits/Render/WithEmbeddedTurretSpriteBody.cs b/OpenRA.Mods.Cnc/Traits/Render/WithEmbeddedTurretSpriteBody.cs index f180ef5a23..2ba3819c95 100644 --- a/OpenRA.Mods.Cnc/Traits/Render/WithEmbeddedTurretSpriteBody.cs +++ b/OpenRA.Mods.Cnc/Traits/Render/WithEmbeddedTurretSpriteBody.cs @@ -33,8 +33,8 @@ namespace OpenRA.Mods.Cnc.Traits.Render if (!EnabledByDefault) yield break; - var t = init.Actor.TraitInfos().FirstOrDefault(); - var wsb = init.Actor.TraitInfos().FirstOrDefault(); + var t = init.Actor.TraitInfos().First(); + var wsb = init.Actor.TraitInfos().First(); // Show the correct turret facing var anim = new Animation(init.World, image, t.WorldFacingFromInit(init)); @@ -52,15 +52,15 @@ namespace OpenRA.Mods.Cnc.Traits.Render static Func MakeTurretFacingFunc(Actor self) { // Turret artwork is baked into the sprite, so only the first turret makes sense. - var turreted = self.TraitsImplementing().FirstOrDefault(); - return () => turreted.WorldOrientation.Yaw; + var firstTurret = self.TraitsImplementing().First(); + return () => firstTurret.WorldOrientation.Yaw; } public WithEmbeddedTurretSpriteBody(ActorInitializer init, WithEmbeddedTurretSpriteBodyInfo info) : base(init, info, MakeTurretFacingFunc(init.Self)) { this.info = info; - turreted = init.Self.TraitsImplementing().FirstOrDefault(); + turreted = init.Self.TraitsImplementing().First(); } protected override void TraitEnabled(Actor self)