From ed30225c194d09f2da9ee9e12f172e9a2c21ae77 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 4 Feb 2018 15:39:38 +0100
Subject: [PATCH] Npc spawn packet fixed

---
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index ead2d3cb..16ea8098 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -416,20 +416,21 @@ struct FFXIVIpcNpcSpawn : FFXIVIpcBasePacket<NpcSpawn>
 {
    uint16_t title;
    uint16_t u1b;
-   uint16_t u2a;
-   uint16_t u2b;
-
-   uint8_t pose;
+   uint8_t u2b;
+   uint8_t u2ab;
+   uint8_t gmRank;
    uint8_t u3b;
+
+   uint8_t u3a;
+   uint8_t onlineStatus;
    uint8_t u3c;
-   uint8_t u3d;
+   uint8_t pose;
 
    uint32_t u4;
 
    uint64_t targetId;
    uint32_t u6;
    uint32_t u7;
-
    uint64_t mainWeaponModel;
    uint64_t secWeaponModel;
    uint64_t craftToolModel;
@@ -440,44 +441,40 @@ struct FFXIVIpcNpcSpawn : FFXIVIpcBasePacket<NpcSpawn>
    uint32_t bNPCName;
    uint32_t u18;
    uint32_t u19;
-   uint32_t u20;
-   uint32_t u21;
+   uint32_t directorId;
+   uint32_t ownerId;
    uint32_t u22;
-
-   uint32_t hPCurr;
    uint32_t hPMax;
+   uint32_t hPCurr;
    uint32_t displayFlags;
    uint16_t fateID;
    uint16_t mPCurr;
    uint16_t tPCurr;
    uint16_t mPMax;
-
-   uint16_t unk21a;
+   uint16_t tPMax;
    uint16_t modelChara;
    uint16_t rotation;
-   uint16_t unk22b;
+   uint16_t activeMinion;
    uint8_t spawnIndex;
-   uint8_t state; // ActorState
-   uint8_t u24a;
-   uint8_t type; // 1 for player, 2 for NPC, else furniture;
-   uint8_t subtype; // 4 for players, 2 for pet, 3 for companion, 5 for mob, 7 for minion
-   uint8_t u25b;
+   uint8_t state;
+   uint8_t persistantEmote;
+   uint8_t type;
+   uint8_t subtype;
+   uint8_t voice;
    uint16_t u25c;
-
-   uint8_t enemyType; // 0 for friendly, anything else is an enemy
+   uint8_t enemyType;
    uint8_t level;
    uint8_t classJob;
    uint8_t u26d;
-
    uint16_t u27a;
-
    uint8_t currentMount;
    uint8_t mountHead;
    uint8_t mountBody;
    uint8_t mountFeet;
-   uint16_t mountColor;
-
+   uint8_t mountColor;
+   uint8_t scale;
    uint32_t u29b;
+   uint32_t u30b;
    Common::StatusEffect effect[30];
    Common::FFXIVARR_POSITION3 pos;
    uint32_t models[10];