muffin v7.38.8
This commit is contained in:
parent
5e2d8f648b
commit
3e10cbbbf2
51 changed files with 2585 additions and 1972 deletions
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using Dalamud.Game.ClientState.Objects.Types;
|
||||
using Dalamud.Hooking;
|
||||
using Dalamud.Plugin.Services;
|
||||
using FFXIVClientStructs.FFXIV.Client.Game;
|
||||
|
|
@ -135,15 +136,18 @@ internal sealed class InterruptHandler : IDisposable
|
|||
|
||||
private readonly IClientState _clientState;
|
||||
|
||||
private readonly IObjectTable _objectTable;
|
||||
|
||||
private readonly TerritoryData _territoryData;
|
||||
|
||||
private readonly ILogger<InterruptHandler> _logger;
|
||||
|
||||
public event EventHandler? Interrupted;
|
||||
|
||||
public unsafe InterruptHandler(IGameInteropProvider gameInteropProvider, IClientState clientState, TerritoryData territoryData, ILogger<InterruptHandler> logger)
|
||||
public unsafe InterruptHandler(IGameInteropProvider gameInteropProvider, IClientState clientState, IObjectTable objectTable, TerritoryData territoryData, ILogger<InterruptHandler> logger)
|
||||
{
|
||||
_clientState = clientState;
|
||||
_objectTable = objectTable;
|
||||
_territoryData = territoryData;
|
||||
_logger = logger;
|
||||
_processActionEffectHook = gameInteropProvider.HookFromSignature<ProcessActionEffect>("40 ?? 56 57 41 ?? 41 ?? 41 ?? 48 ?? ?? ?? ?? ?? ?? ?? 48", HandleProcessActionEffect);
|
||||
|
|
@ -158,11 +162,12 @@ internal sealed class InterruptHandler : IDisposable
|
|||
{
|
||||
return;
|
||||
}
|
||||
IGameObject gameObject = _objectTable[0];
|
||||
for (int i = 0; i < effectHeader->TargetCount; i++)
|
||||
{
|
||||
int num = (int)(effectTail[i] & 0xFFFFFFFFu);
|
||||
EffectEntry* ptr = effectArray + 8 * i;
|
||||
bool flag = (uint)num == _clientState.LocalPlayer?.GameObjectId;
|
||||
bool flag = (uint)num == gameObject?.GameObjectId;
|
||||
if (flag)
|
||||
{
|
||||
EActionEffectType type = ptr->Type;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue