Quick fixes (#185)

* Only patch if ranks are enabled * fix dumb * Add catch for patch * bring back motd Co-authored-by: Bishbash777 <[email protected]>
TorchAPI · Mar 17, 2021 · b19b8d9 · b19b8d9
1 parent 9f5ae7d
commit b19b8d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Essentials/EssentialsConfig.cs b/Essentials/EssentialsConfig.cs
@@ -34,6 +34,7 @@ public EssentialsConfig()
         public ObservableCollection<InfoCommand> InfoCommands { get; } = new ObservableCollection<InfoCommand>();
 
         private string _motd;
+        [Display(Name = "Motd", Description = "Message displayed to players upon connection")]
         public string Motd { get => _motd; set => SetValue(ref _motd, value); }
 
         public bool _enableRanks = false;

diff --git a/Essentials/Patches/ChatMessagePatch.cs b/Essentials/Patches/ChatMessagePatch.cs
@@ -34,13 +34,16 @@ public static MethodInfo FindOverLoadMethod( MethodInfo[] methodInfo,string name
         }
 
         public static void Patch(PatchContext ctx) {
-            if (EssentialsPlugin.Instance.Config.EnableRanks) {
+            try {
                 var target = FindOverLoadMethod(typeof(MyMultiplayerBase).GetMethods(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Static), "OnChatMessageReceived_Server", 1);
                 var patchMethod = typeof(ChatMessagePatch).GetMethod(nameof(OnChatMessageReceived_Server), BindingFlags.Static | BindingFlags.NonPublic);
                 ctx.GetPattern(target).Prefixes.Add(patchMethod);
 
                 Log.Info("Patched OnChatMessageReceived_Server!");
             }
+            catch {
+                Log.Error("Failed to patch!");
+            }
         }
 
         private static bool OnChatMessageReceived_Server(ref ChatMsg msg) {