From df53c1662080601f69808bedeb1d57765a0303d3 Mon Sep 17 00:00:00 2001 From: Jabin <1094679+jabinb@users.noreply.github.com> Date: Tue, 28 Jul 2020 02:15:29 +1000 Subject: [PATCH] Handle exceptions when generating spawners as pattern may match non-spawner files (#186) --- .../UOContent/Engines/Spawners/GenerateSpawners.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Projects/UOContent/Engines/Spawners/GenerateSpawners.cs b/Projects/UOContent/Engines/Spawners/GenerateSpawners.cs index 6bc0edc95..17e16b908 100644 --- a/Projects/UOContent/Engines/Spawners/GenerateSpawners.cs +++ b/Projects/UOContent/Engines/Spawners/GenerateSpawners.cs @@ -42,8 +42,16 @@ namespace Server.Engines.Spawners { var file = files[i]; from.SendMessage("GenerateSpawners: Generating spawners for {0}...", file.Name); - List spawners = JsonConfig.Deserialize>(file.FullName); - ParseSpawnerList(from, spawners, options); + + try + { + var spawners = JsonConfig.Deserialize>(file.FullName); + ParseSpawnerList(from, spawners, options); + } + catch (JsonException) + { + from.SendMessage("GenerateSpawners: Exception parsing {0}, file may not be in the correct format.", file.FullName); + } } }