File tree Expand file tree Collapse file tree
plugin/CactbotEventSource Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -25,28 +25,28 @@ public unsafe struct EntityMemory {
2525 [ FieldOffset ( 0x30 ) ]
2626 public fixed byte Name [ nameBytes ] ;
2727
28- [ FieldOffset ( 0x74 ) ]
28+ [ FieldOffset ( 0x78 ) ]
2929 public uint id ;
3030
31- [ FieldOffset ( 0x8C ) ]
31+ [ FieldOffset ( 0x90 ) ]
3232 public EntityType type ;
3333
34- [ FieldOffset ( 0x92 ) ]
34+ [ FieldOffset ( 0x96 ) ]
3535 public ushort distance ;
3636
37- [ FieldOffset ( 0xA0 ) ]
37+ [ FieldOffset ( 0xB0 ) ]
3838 public Single pos_x ;
3939
40- [ FieldOffset ( 0xA4 ) ]
40+ [ FieldOffset ( 0xB4 ) ]
4141 public Single pos_z ;
4242
43- [ FieldOffset ( 0xA8 ) ]
43+ [ FieldOffset ( 0xB8 ) ]
4444 public Single pos_y ;
4545
46- [ FieldOffset ( 0xB0 ) ]
46+ [ FieldOffset ( 0xC0 ) ]
4747 public Single rotation ;
4848
49- [ FieldOffset ( 0x190 ) ]
49+ [ FieldOffset ( 0x1A0 ) ]
5050 public CharacterDetails charDetails ;
5151 }
5252
@@ -106,7 +106,8 @@ public FFXIVProcessTc(ILogger logger) : base(logger) { }
106106 // In combat boolean.
107107 // This address is written to by "mov [rax+rcx],bl" and has three readers.
108108 // This reader is "cmp byte ptr [ffxiv_dx11.exe+????????],00 { (0),0 }"
109- private static String kInCombatSignature = "803D??????????74??488B03488BCBFF50" ;
109+ // Updated in 7.3, signature was no longer unique, include the preceeding "jz LAB_?????????"
110+ private static String kInCombatSignature = "74??803D??????????74??488B03488BCBFF50" ;
110111 private static int kInCombatSignatureOffset = - 15 ;
111112 private static bool kInCombatSignatureRIP = true ;
112113 // Because this line is a cmp byte line, the signature is not at the end of the line.
You can’t perform that action at this time.
0 commit comments