From 4770929e40363e1cfd5513afae083f9bb15b26b5 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 2 Feb 2016 13:00:24 +0100 Subject: [PATCH] very important crashfix --- NadekoBot/Commands/ServerGreetCommand.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/NadekoBot/Commands/ServerGreetCommand.cs b/NadekoBot/Commands/ServerGreetCommand.cs index bb91c93d..12cce67c 100644 --- a/NadekoBot/Commands/ServerGreetCommand.cs +++ b/NadekoBot/Commands/ServerGreetCommand.cs @@ -49,8 +49,10 @@ namespace NadekoBot.Commands { var controls = AnnouncementsDictionary[e.Server.Id]; var channel = NadekoBot.client.GetChannel(controls.ByeChannel); if (channel == null) return; - - await channel.Send(controls.ByeText.Replace("%user%", e.User.Mention)); + var msg = controls.GreetText.Replace("%user%", e.User.Mention).Trim(); + if (msg == null || msg == "") + return; + await channel.Send(msg); } private async void UserJoined(object sender, Discord.UserEventArgs e) { @@ -61,7 +63,10 @@ namespace NadekoBot.Commands { var channel = NadekoBot.client.GetChannel(controls.GreetChannel); if (channel == null) return; - await channel.Send(controls.GreetText.Replace("%user%", e.User.Mention)); + var msg = controls.GreetText.Replace("%user%", e.User.Mention).Trim(); + if (msg == null || msg == "") + return; + await channel.Send(msg); } public class AnnounceControls {