anth64/CommandHook
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: isolate listener exceptions in Before/After dispatch

Browse Source
This commit is contained in:
anth64
2026-06-17 20:39:43 +02:00
parent d0dcd599cf
commit 775c02794e
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CommandHook/CommandHookModSystem.cs
+26 -6
View File
@@ -1,3 +1,4 @@
using System;
using System.Collections.Frozen;
using System.Collections.Generic;
using HarmonyLib;
@@ -109,8 +110,8 @@ public class CommandHookModSystem : ModSystem
}
foreach (var wildcard in wildcards)
foreach (var mods in builder.Values)
mods[wildcard.ModId] = wildcard.Registration;
foreach (var mods in builder.Values)
mods[wildcard.ModId] = wildcard.Registration;
var pruned = new Dictionary<string, FrozenDictionary<string, CommandRegistration>>(
builder.Count
@@ -126,9 +127,17 @@ public class CommandHookModSystem : ModSystem
{
if (registrations.TryGetValue(commandName, out var mods))
{
foreach (var (_, reg) in mods)
foreach (var (modId, reg) in mods)
{
reg.Before?.Invoke(ref data);
try
{
reg.Before?.Invoke(ref data);
}
catch (Exception ex)
{
Mod.Logger.Error("[{0}] Before /{1} threw: {2}", modId, commandName, ex);
}
if (data.Cancel)
break;
}
@@ -140,8 +149,19 @@ public class CommandHookModSystem : ModSystem
internal void FireAfter(string commandName, ref CommandData data, TextCommandResult result)
{
if (registrations.TryGetValue(commandName, out var mods))
foreach (var (_, reg) in mods)
reg.After?.Invoke(ref data, result);
{
foreach (var (modId, reg) in mods)
{
try
{
reg.After?.Invoke(ref data, result);
}
catch (Exception ex)
{
Mod.Logger.Error("[{0}] After /{1} threw: {2}", modId, commandName, ex);
}
}
}
}
private void SyncWildcard(ICommandHookListener listener, IReadOnlyList<string> commands)