Fix crash with empty MOTD

Jimmacle · Jimmacle · commit d587e415298e · 2017-07-26T09:47:47.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Essentials 1.5.1
+* Fixes
+    - Fixed crash if the MOTD field is empty
+
 # Essentials 1.5
 * Features
     - Added MOTD
diff --git a/Essentials/EssentialsPlugin.cs b/Essentials/EssentialsPlugin.cs
@@ -17,7 +17,7 @@
 
 namespace Essentials
 {
-    [Plugin("Essentials", "1.5", "cbfdd6ab-4cda-4544-a201-f73efa3d46c0")]
+    [Plugin("Essentials", "1.5.1", "cbfdd6ab-4cda-4544-a201-f73efa3d46c0")]
     public class EssentialsPlugin : TorchPluginBase, IWpfPlugin
     {
         public EssentialsConfig Config => _config?.Data;
@@ -59,7 +59,7 @@ private void MotdOnce(MyEntity obj)
             if (obj is MyCharacter character)
             {
                 var id = character.ControllerInfo?.ControllingIdentityId ?? 0;
-                if (_motdOnce.Contains(id))
+                if (string.IsNullOrEmpty(Config.Motd) || _motdOnce.Contains(id))
                     return;
 
                 Torch.Multiplayer.SendMessage(Config.Motd, "MOTD", id);

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`namespace Essentials`
`19`	`19`	`{`
`20`		`- [Plugin("Essentials", "1.5", "cbfdd6ab-4cda-4544-a201-f73efa3d46c0")]`
	`20`	`+ [Plugin("Essentials", "1.5.1", "cbfdd6ab-4cda-4544-a201-f73efa3d46c0")]`
`21`	`21`	`public class EssentialsPlugin : TorchPluginBase, IWpfPlugin`
`22`	`22`	`{`
`23`	`23`	`public EssentialsConfig Config => _config?.Data;`
`@@ -59,7 +59,7 @@ private void MotdOnce(MyEntity obj)`
`59`	`59`	`if (obj is MyCharacter character)`
`60`	`60`	`{`
`61`	`61`	`var id = character.ControllerInfo?.ControllingIdentityId ?? 0;`
`62`		`- if (_motdOnce.Contains(id))`
	`62`	`+ if (string.IsNullOrEmpty(Config.Motd) \|\| _motdOnce.Contains(id))`
`63`	`63`	`return;`
`64`	`64`
`65`	`65`	`Torch.Multiplayer.SendMessage(Config.Motd, "MOTD", id);`