From ee5196b372891f83a1ab3a19d1503ba1943c2019 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 4 Feb 2018 00:43:36 +0100
Subject: [PATCH] Fixed state flags

---
 src/common/Common.h                               | 1 -
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 9 ++++-----
 src/servers/sapphire_zone/Action/EventAction.cpp  | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 507f8727..17b20358 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -388,7 +388,6 @@ namespace Common {
 
    enum struct PlayerStateFlag : uint8_t
    {
-      SomeFlag,
       NoCombat,
       Combat,
       Casting,
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 37578406..ead2d3cb 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -829,11 +829,10 @@ struct FFXIVIpcActorOwner : FFXIVIpcBasePacket<ActorOwner>
 */
 struct FFXIVIpcPlayerStateFlags : FFXIVIpcBasePacket<PlayerStateFlags>
 {
-   /* 0000 */ uint16_t padding;
-   /* 0002 */ uint8_t flags[7];
-   /* 0009 */ uint8_t padding1[3];
-   /* 000C */ uint32_t padding2;
-
+   uint8_t flags[7];
+   uint8_t padding1[3];
+   uint32_t padding2;
+   uint16_t padding;
 };
 
 /**
diff --git a/src/servers/sapphire_zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp
index b5e935cf..24a08001 100644
--- a/src/servers/sapphire_zone/Action/EventAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventAction.cpp
@@ -53,7 +53,7 @@ void Core::Action::EventAction::onStart()
    if( m_pSource->isPlayer() )
    {
       m_pSource->sendToInRangeSet( control, true );
-      m_pSource->getAsPlayer()->setStateFlag( PlayerStateFlag::SomeFlag );
+      m_pSource->getAsPlayer()->setStateFlag( PlayerStateFlag::Occupied2 );
    }
    else
       m_pSource->sendToInRangeSet( control );
@@ -82,7 +82,7 @@ void Core::Action::EventAction::onFinish()
 
       if( m_pSource->isPlayer() )
       {
-         m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::SomeFlag );
+         m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied2 );
          m_pSource->sendToInRangeSet( control, true );
       }
       else