Skip to content

Quick fixes #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bishbash777 merged 5 commits into from
Mar 17, 2021
Merged

Quick fixes #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2162b61
Only patch if ranks are enabled
Mar 17, 2021
c270590
fix dumb
Mar 17, 2021
7beb52b
Add catch for patch
Mar 17, 2021
bf6c4ce
bring back motd
Mar 17, 2021
2903ced
Merge branch 'master' into quick-fixes
Bishbash777 Mar 17, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Essentials/EssentialsConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion Essentials/Patches/ChatMessagePatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down