From ed0756e80c541e77c3d818ac18c0e60d60343050 Mon Sep 17 00:00:00 2001 From: Deathmax Date: Sun, 27 May 2012 21:05:28 +0800 Subject: [PATCH] Fixes null exception thrown on /save TShock.Players was not being checked for null objects. Reported by InanZen. --- TShockAPI/Commands.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 7b650953..c7eb3e5b 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -2172,14 +2172,14 @@ namespace TShockAPI private static void Save(CommandArgs args) { - SaveManager.Instance.SaveWorld(false); - foreach (TSPlayer tsply in TShock.Players) - { - tsply.SaveServerInventory(); - } + SaveManager.Instance.SaveWorld(false); + foreach (TSPlayer tsply in TShock.Players.Where(tsply => tsply != null)) + { + tsply.SaveServerInventory(); + } } - private static void Settle(CommandArgs args) + private static void Settle(CommandArgs args) { if (Liquid.panicMode) {