From 03f89dfbee374f8181f158ea1aa6f537c64157b6 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Sat, 21 Dec 2019 16:17:46 -0800
Subject: [PATCH 1/3] Identify elementalLevel and element in PlayerSpawn packet

---
 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 9dc959b9..e4fc231b 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -694,8 +694,8 @@ namespace Sapphire::Network::Packets::Server
     uint8_t mountFeet;
     uint8_t mountColor;
     uint8_t scale;
-    uint32_t u29b;
-    uint32_t u30b;
+    uint32_t elementalLevel;
+    uint32_t element;
     Common::StatusEffect effect[30];
     Common::FFXIVARR_POSITION3 pos;
     uint32_t models[10];

From bca39ac17af8306d8c39c562c19aa94728b70a80 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Thu, 2 Jan 2020 16:15:05 -0800
Subject: [PATCH 2/3] CFNotifyPop and CFPreferredRole

---
 src/common/Network/PacketDef/Ipcs.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index c49b0a5a..c2cb3892 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -67,9 +67,11 @@ namespace Sapphire::Network::Packets
     Playtime = 0x01DB, // updated 5.1
     Logout = 0x011D, // updated 5.1
     CFNotify = 0x0078,
+    CFNotifyPop = 0x01F8, // added 5.18
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0x007F,
+    CFPreferredRole = 0x032A, // added 5.18
 
     SocialRequestError = 0x00AD,
 

From 61ac094b2bde15a0e4349ba5e061cf39bd7b4252 Mon Sep 17 00:00:00 2001
From: karashiiro <49822414+karashiiro@users.noreply.github.com>
Date: Thu, 2 Jan 2020 18:38:53 -0800
Subject: [PATCH 3/3] merge duplicate keys

---
 src/common/Network/PacketDef/Ipcs.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 38d4ce1d..b046be2f 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -66,8 +66,7 @@ namespace Sapphire::Network::Packets
     ChatBanned = 0x006B,
     Playtime = 0x00E7, // updated 5.18
     Logout = 0x142, // updated 5.18
-    CFNotify = 0x0078,
-    CFNotifyPop = 0x01F8, // added 5.18
+    CFNotify = 0x01F8, // updated 5.18
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
     CFPlayerInNeed = 0x007F,