Update for 6.35

Author: AsgardXIV

Brio/Game/Render/RenderHookService.cs

@@ -8,15 +8,14 @@ namespace Brio.Game.Render;
 public unsafe class RenderHookService : ServiceBase<RenderHookService>
 {
     private delegate long EnforceKindRestrictionsDelegate(void* a1, void* a2);
-    private Hook<EnforceKindRestrictionsDelegate> EnforceKindRestrictionsHook = null!;
+    private Hook<EnforceKindRestrictionsDelegate> _enforceKindRestrictionsHook = null!;
     private uint _forceNpcHackCount = 0;
 
     public RenderHookService()
     {
         var enforceKindRestrictionsAddress = Dalamud.SigScanner.ScanText("E8 ?? ?? ?? ?? 41 B0 ?? 48 8B D3 48 8B CD");
-        EnforceKindRestrictionsHook = Hook<EnforceKindRestrictionsDelegate>.FromAddress(enforceKindRestrictionsAddress, EnforceKindRestrictionsDetour);
-
-        EnforceKindRestrictionsHook.Enable();
+        _enforceKindRestrictionsHook = Hook<EnforceKindRestrictionsDelegate>.FromAddress(enforceKindRestrictionsAddress, EnforceKindRestrictionsDetour);
+        _enforceKindRestrictionsHook.Enable();
     }
 
     public void PushForceNpcHack() => ++_forceNpcHackCount;
@@ -39,11 +38,11 @@ private long EnforceKindRestrictionsDetour(void* a1, void* a2)
         if(ConfigService.Configuration.ApplyNPCHack == ApplyNPCHack.InGPose && GPoseService.Instance.IsInGPose)
             return 0;
 
-        return EnforceKindRestrictionsHook.Original(a1, a2);
+        return _enforceKindRestrictionsHook.Original(a1, a2);
     }
 
     public override void Dispose()
     {
-        EnforceKindRestrictionsHook.Dispose();
+        _enforceKindRestrictionsHook.Dispose();
     }
 }

Brio/Game/World/Interop/FestivalInterop.cs

@@ -88,7 +88,7 @@ public unsafe class GameMainInterop
     private SetActiveFestivalsDelegate _setActiveFestivals = null!;
     public void SetActiveFestivals(uint festival1, uint festival2, uint festival3, uint festival4) => _setActiveFestivals(GameMain.Instance(), festival1, festival2, festival3, festival4);
 
-    [Signature("E8 ?? ?? ?? ?? E9 08 29 00 00", ScanType = ScanType.Text)]
+    [Signature("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 8B 44 24 60 48 8D 8D", ScanType = ScanType.Text)]
     private SetActiveFestivalsDelegate _queueActiveFestivals = null!;
     public void QueueActiveFestivals(uint festival1, uint festival2, uint festival3, uint festival4) => _queueActiveFestivals(GameMain.Instance(), festival1, festival2, festival3, festival4);