From 4a270a1ec11ea90b668767671ddb1741c02ca271 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 9 Jul 2019 23:07:31 +1000
Subject: [PATCH 1/4] enable viera/hrothgar character creation

---
 src/lobby/GameConnection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp
index f90a4ff1..53548626 100644
--- a/src/lobby/GameConnection.cpp
+++ b/src/lobby/GameConnection.cpp
@@ -180,7 +180,7 @@ void Lobby::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, uint32_t t
     // TODO: Eventually move to account info storage
     if( i == 3 )
     {
-      charListPacket->data().entitledExpansion = 2;
+      charListPacket->data().entitledExpansion = 3;
       charListPacket->data().maxCharOnWorld = 25;
       charListPacket->data().unknown8 = 8;
       charListPacket->data().veteranRank = 12;

From cff255303097e464902d0e214a1964a733112374 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 14 Jul 2019 17:26:13 +1000
Subject: [PATCH 2/4] add gathering point event type

---
 src/world/Event/EventHandler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/Event/EventHandler.h b/src/world/Event/EventHandler.h
index 5117b8f6..11b36c27 100644
--- a/src/world/Event/EventHandler.h
+++ b/src/world/Event/EventHandler.h
@@ -49,7 +49,7 @@ namespace Sapphire::Event
     {
       Quest = 0x0001,
       Warp = 0x0002,
-      Unknown = 0x0003, // Came up in the client with "Begin" unsure that means
+      GatheringPoint = 0x0003, // Came up in the client with "Begin" unsure that means
       Shop = 0x0004,
       Aetheryte = 0x0005,
       GuildLeveAssignment = 0x0006,

From 973b0c90267992c09d826a7801eb3d2caad9dc42 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 14 Jul 2019 17:34:55 +1000
Subject: [PATCH 3/4] fix update position packet

---
 src/common/Network/PacketDef/Ipcs.h               |  3 ++-
 src/common/Network/PacketDef/Zone/ClientZoneDef.h | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index f1c5918b..36d6c756 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -323,7 +323,6 @@ namespace Sapphire::Network::Packets
     AoESkillHandler = 0x140, // updated 5.0
 
     UpdatePositionHandler = 0x0141, // updated 5.0
-    UpdatePositionInstance = 0x0183, // updated 4.3
 
     InventoryModifyHandler = 0x0148, // updated 5.0
 
@@ -351,6 +350,8 @@ namespace Sapphire::Network::Packets
 
     SetSharedEstateSettings = 0x017B, // updated 5.0
 
+    UpdatePositionInstance = 0x0180, // updated 5.0
+
     PerformNoteHandler = 0x029B, // updated 4.3
 
 
diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
index bf19fb7e..b15936bf 100644
--- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h
@@ -51,11 +51,11 @@ struct FFXIVIpcUpdatePosition :
   /* 0000 */ float rotation;
   /* 0004 */ uint8_t unk_1[ 3 ];
   /* 0007 */ uint8_t headPosition;
-  /* 0008 */ uint8_t animationType;
-  /* 0009 */ uint8_t animationState;
-  /* 000A */ uint8_t clientAnimationType;
-  /* 000B */ uint8_t unk_2;
-  /* 000C */ Common::FFXIVARR_POSITION3 position;
+  /* 0008 */ Common::FFXIVARR_POSITION3 position;
+  /* 000C */ uint8_t animationType;
+  /* 000D */ uint8_t animationState;
+  /* 000E */ uint8_t clientAnimationType;
+  /* 000F */ uint8_t unk_2;
 };
 
 struct FFXIVIpcSkillHandler :

From 1cc79428e4fc44cc110fa939c6924a01f85606f9 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 14 Jul 2019 18:14:14 +1000
Subject: [PATCH 4/4] headrotation and rotation switched places, fixes actor
 rotation

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 200e0907..ef6b0e17 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -656,8 +656,8 @@ namespace Sapphire::Network::Packets::Server
   */
   struct FFXIVIpcActorMove : FFXIVIpcBasePacket< ActorMove >
   {
-    /* 0000 */ uint8_t rotation;
-    /* 0001 */ uint8_t headRotation;
+    /* 0000 */ uint8_t headRotation;
+    /* 0001 */ uint8_t rotation;
     /* 0002 */ uint8_t animationType;
     /* 0003 */ uint8_t animationState;
     /* 0004 */ uint8_t animationSpeed;