Fixes some nullref issues, and empty report reasons

BPEssentials · Mar 22, 2019 · aa7b4ab · aa7b4ab
1 parent bc4c26a
commit aa7b4ab
Show file tree

Hide file tree

Showing 31 changed files with 21 additions and 2,870 deletions.
diff --git a/source/BP-Essentials/Chat/Commands/Everyone/Report.cs b/source/BP-Essentials/Chat/Commands/Everyone/Report.cs
@@ -41,7 +41,11 @@ public static void Run(SvPlayer player, string message)
 			var builder = new StringBuilder();
 			builder.Append("<color=#00ffffff>Reporting</color> <color=#ea8220>" + arg1 + "</color>\n<color=#00ffffff>Reason:</color>\n\n");
 			for (int i = 0; i < ReportReasons.Length; i++)
+			{
+				if (string.IsNullOrWhiteSpace(ReportReasons[i]))
+					continue;
 				builder.Append("<color=#00ffffff>F" + (i + 2) + ":</color> " + ReportReasons[i] + "\n");
+			}
 			player.Send(SvSendType.Self, Channel.Reliable, ClPacket.ShowFunctionMenu, builder + "\n<color=#00ffffff>Press</color> <color=#ea8220>F11</color> <color=#00ffffff>To close this (G)UI</color>");
 			PlayerList[player.player.ID].LastMenu = CurrentMenu.Report;
 			PlayerList[player.player.ID].ReportedPlayer = currPlayer;

diff --git a/source/BP-Essentials/EssentialsChat.cs b/source/BP-Essentials/EssentialsChat.cs
diff --git a/source/BP-Essentials/EssentialsCore.cs b/source/BP-Essentials/EssentialsCore.cs