From 8a776c7138eb63bbd5b2e81bf3a5313802b341d3 Mon Sep 17 00:00:00 2001
From: Andre Mohren <andremohren@gmail.com>
Date: Wed, 30 Jun 2021 10:54:39 +0200
Subject: [PATCH] 32bpp bullets no longer crash without palette.

---
 OpenRA.Mods.Common/Projectiles/Bullet.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Projectiles/Bullet.cs b/OpenRA.Mods.Common/Projectiles/Bullet.cs
index 0e7fca84d5..b53fbce61a 100644
--- a/OpenRA.Mods.Common/Projectiles/Bullet.cs
+++ b/OpenRA.Mods.Common/Projectiles/Bullet.cs
@@ -297,7 +297,11 @@ namespace OpenRA.Mods.Common.Projectiles
 							.WithAlpha(shadowAlpha);
 				}
 
-				var palette = wr.Palette(info.Palette + (info.IsPlayerPalette ? args.SourceActor.Owner.InternalName : ""));
+				var paletteName = info.Palette;
+				if (paletteName != null && info.IsPlayerPalette)
+					paletteName += args.SourceActor.Owner.InternalName;
+
+				var palette = wr.Palette(paletteName);
 				foreach (var r in anim.Render(pos, palette))
 					yield return r;
 			}