From 7bbfd823d00a23ca7d092600bce2e19bcd87e8c7 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sun, 23 Jun 2019 11:47:26 +0200 Subject: [PATCH] Fix Minelayer crashes --- OpenRA.Mods.Cnc/Traits/Minelayer.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Cnc/Traits/Minelayer.cs b/OpenRA.Mods.Cnc/Traits/Minelayer.cs index d5acff01f1..755fa99c03 100644 --- a/OpenRA.Mods.Cnc/Traits/Minelayer.cs +++ b/OpenRA.Mods.Cnc/Traits/Minelayer.cs @@ -54,7 +54,10 @@ namespace OpenRA.Mods.Cnc.Traits this.info = info; var tileset = self.World.Map.Tileset.ToLowerInvariant(); - tile = self.World.Map.Rules.Sequences.GetSequence("overlay", "build-valid-{0}".F(tileset)).GetSprite(0); + if (self.World.Map.Rules.Sequences.HasSequence("overlay", "build-valid-{0}".F(tileset))) + tile = self.World.Map.Rules.Sequences.GetSequence("overlay", "build-valid-{0}".F(tileset)).GetSprite(0); + else + tile = self.World.Map.Rules.Sequences.GetSequence("overlay", "build-valid").GetSprite(0); } IEnumerable IIssueOrder.Orders @@ -175,7 +178,11 @@ namespace OpenRA.Mods.Cnc.Traits this.queued = queued; var tileset = a.World.Map.Tileset.ToLowerInvariant(); - tileOk = a.World.Map.Rules.Sequences.GetSequence("overlay", "build-valid-{0}".F(tileset)).GetSprite(0); + if (a.World.Map.Rules.Sequences.HasSequence("overlay", "build-valid-{0}".F(tileset))) + tileOk = a.World.Map.Rules.Sequences.GetSequence("overlay", "build-valid-{0}".F(tileset)).GetSprite(0); + else + tileOk = a.World.Map.Rules.Sequences.GetSequence("overlay", "build-valid").GetSprite(0); + tileBlocked = a.World.Map.Rules.Sequences.GetSequence("overlay", "build-invalid").GetSprite(0); }