From 93840aff9361e2082a5834a18e54582713a7ebc1 Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Sat, 22 Jun 2024 23:55:06 +0900
Subject: [PATCH 1/2] fix InitZone and enable flying

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h   | 4 ++--
 src/world/Actor/Player.cpp                          | 3 +--
 src/world/Network/Handlers/ClientTriggerHandler.cpp | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index ea7cbad2..b91d8298 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -931,14 +931,14 @@ namespace Sapphire::Network::Packets::Server
     uint32_t unknown8;
     uint16_t festivalId;
     uint16_t additionalFestivalId;
-    uint32_t unknown9;
+    uint32_t unknown9[2];
     uint32_t unknown10;
     uint32_t unknown11;
     uint32_t unknown12[4];
     uint32_t unknown13[3];
     Common::FFXIVARR_POSITION3 pos;
     uint32_t unknown14[3];
-    uint32_t unknown15;
+    uint32_t unknown15[2];
   };
 
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 73ec81bf..577386a8 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1936,7 +1936,7 @@ void Sapphire::Entity::Player::sendZonePackets()
   auto initZonePacket = makeZonePacket< FFXIVIpcInitZone >( getId() );
   initZonePacket->data().zoneId = getCurrentTerritory()->getTerritoryTypeId();
   initZonePacket->data().weatherId = static_cast< uint8_t >( getCurrentTerritory()->getCurrentWeather() );
-  initZonePacket->data().bitmask = 0x1;
+  initZonePacket->data().bitmask1 = 0x10;
   initZonePacket->data().festivalId = getCurrentTerritory()->getCurrentFestival().first;
   initZonePacket->data().additionalFestivalId = getCurrentTerritory()->getCurrentFestival().second;
   initZonePacket->data().pos.x = getPos().x;
@@ -1945,7 +1945,6 @@ void Sapphire::Entity::Player::sendZonePackets()
   if( auto d = getCurrentTerritory()->getAsDirector() )
   {
     initZonePacket->data().contentfinderConditionId = d->getContentFinderConditionId();
-    initZonePacket->data().bitmask = 0xFF;
     initZonePacket->data().bitmask1 = 0x2A;
   }
   queuePacket( initZonePacket );
diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp
index 8c60c233..4315d2bc 100644
--- a/src/world/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp
@@ -154,7 +154,7 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( const Packets::FFX
     }
     case ClientTriggerType::Examine:
     {
-      uint32_t targetId = p1u64;
+      uint32_t targetId = p1;
       examineHandler( player, targetId );
       break;
     }

From 7363ca03ff2c9ca5091864d466243e9eefc32fdb Mon Sep 17 00:00:00 2001
From: collett <collett0301@gmail.com>
Date: Tue, 25 Jun 2024 17:14:58 +0900
Subject: [PATCH 2/2] update CeremonySetActorAppearance

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index b91d8298..874f5475 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -2270,8 +2270,8 @@ namespace Sapphire::Network::Packets::Server
       uint16_t guardianDeity;
       uint32_t u5;
       uint32_t models[10];
+      uint8_t unknown[10];
       uint8_t look[26];
-      uint16_t padding3;
     } actors[2];
   };