Skip to content

Fix HookCommandProcessing not working in v1.4.5 #158

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
SignatureBeef merged 1 commit into from
Jan 28, 2026
Merged

Fix HookCommandProcessing not working in v1.4.5 #158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion OTAPI.Scripts/Mods/HookCommandProcessing.Server.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,18 @@ void HookCommandProcessing(MonoModder modder)
var startDedInputCallBack = modder.GetILCursor(() => Terraria.Main.startDedInputCallBack());

var vText = startDedInputCallBack.Body.Variables[0];
#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
#else
var vTextLowered = startDedInputCallBack.Body.Variables[1];
#endif

if (vText.VariableType.FullName != modder.Module.TypeSystem.String.FullName)
throw new NotSupportedException("Expected the first variable to be string");
#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
#else
if (vTextLowered.VariableType.FullName != modder.Module.TypeSystem.String.FullName)
throw new NotSupportedException("Expected the second variable to be string");

#endif
var exceptionHandler = startDedInputCallBack.Body.ExceptionHandlers.Single(
x => (
x.TryStart.Next.OpCode == OpCodes.Ldstr
Expand All @@ -62,8 +67,12 @@ void HookCommandProcessing(MonoModder modder)

exceptionHandler.TryStart.ReplaceTransfer(newStart, startDedInputCallBack.Method);

#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
startDedInputCallBack.EmitDelegate<Func<string, bool>>(OTAPI.Hooks.Main.InvokeCommandProcess);
#else
startDedInputCallBack.Emit(OpCodes.Ldloc, vTextLowered)
.EmitDelegate<Func<string, string, bool>>(OTAPI.Hooks.Main.InvokeCommandProcess);
#endif
startDedInputCallBack.Emit(OpCodes.Brfalse, exceptionHandler.TryEnd.Previous);
}

Expand Down Expand Up @@ -92,6 +101,17 @@ public static bool InvokeCommandProcess(string lowered, string raw)
CommandProcess?.Invoke(null, args);
return args.Result != HookResult.Cancel;
}

public static bool InvokeCommandProcess(string raw)
{
var args = new CommandProcessEventArgs()
{
Lowered = raw.ToLower(),
Command = raw,
};
CommandProcess?.Invoke(null, args);
return args.Result != HookResult.Cancel;
}
}
}
}
Expand Down
Loading