ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-14 20:54:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #661 from daemitus/corehookCatch

Browse source
This commit is contained in:
goaaats 2021-10-26 17:49:29 +02:00 • committed by GitHub
commit 7a54c0006a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Dalamud/Hooking/Hook.cs
View file

@ -5,6 +5,7 @@ using Dalamud.Configuration.Internal;
using Dalamud.Hooking.Internal; using Dalamud.Hooking.Internal;
using Dalamud.Memory; using Dalamud.Memory;
using Reloaded.Hooks; using Reloaded.Hooks;
using Serilog;
namespace Dalamud.Hooking namespace Dalamud.Hooking
{ {
@ -54,7 +55,16 @@ namespace Dalamud.Hooking
this.address = address; this.address = address;
if (this.isCoreHook) if (this.isCoreHook)
{ {
this.coreHookImpl = CoreHook.HookFactory.CreateHook<T>(address, detour); try
{
this.coreHookImpl = CoreHook.HookFactory.CreateHook<T>(address, detour);
}
catch (Exception ex)
{
this.isCoreHook = false;
Log.Error(ex, "CoreHook is having a bad day, defaulting to Reloaded");
this.hookImpl = ReloadedHooks.Instance.CreateHook<T>(detour, address.ToInt64());
}
} }
else else
{ {