1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-04 09:47:46 +00:00

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
NotAdam 2018-08-12 22:53:29 +10:00
commit 4ec63805d7

View file

@ -481,7 +481,7 @@ struct FFXIVIpcNpcSpawn : FFXIVIpcBasePacket<NpcSpawn>
uint32_t u19; uint32_t u19;
uint32_t directorId; uint32_t directorId;
uint32_t ownerId; uint32_t ownerId;
uint32_t parentOwnerId; uint32_t parentActorId;
uint32_t hPMax; uint32_t hPMax;
uint32_t hPCurr; uint32_t hPCurr;
uint32_t displayFlags; uint32_t displayFlags;
@ -521,7 +521,7 @@ struct FFXIVIpcNpcSpawn : FFXIVIpcBasePacket<NpcSpawn>
char fcTag[6]; char fcTag[6];
uint32_t unk30; uint32_t unk30;
uint32_t unk31; uint32_t unk31;
uint8_t bnpcPartSlot; uint8_t bNPCPartSlot;
uint8_t unk32; uint8_t unk32;
uint16_t unk33; uint16_t unk33;
uint32_t unk34; uint32_t unk34;