From dac35a60ad0ec607255fb7774ab3b9751f960986 Mon Sep 17 00:00:00 2001 From: michaeldgg2 <119738087+michaeldgg2@users.noreply.github.com> Date: Thu, 1 Jun 2023 21:05:58 +0200 Subject: [PATCH] WithDecoration: fixed crash when Palette is null --- OpenRA.Mods.Common/Traits/Render/WithDecoration.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs b/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs index 7c9c9baff3..862fc708f9 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs @@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits.Render protected virtual PaletteReference GetPalette(Actor self, WorldRenderer wr) { - return wr.Palette(Info.Palette + (Info.IsPlayerPalette ? self.Owner.InternalName : "")); + return wr.Palette(Info.IsPlayerPalette ? Info.Palette + self.Owner.InternalName : Info.Palette); } protected override IEnumerable RenderDecoration(Actor self, WorldRenderer wr, int2 screenPos)