diff --git a/Dalamud/Game/ClientState/Objects/Types/Character.cs b/Dalamud/Game/ClientState/Objects/Types/Character.cs
index 291148708..afc94bd0f 100644
--- a/Dalamud/Game/ClientState/Objects/Types/Character.cs
+++ b/Dalamud/Game/ClientState/Objects/Types/Character.cs
@@ -102,7 +102,15 @@ public unsafe class Character : GameObject
///
/// Gets the status flags.
///
- public StatusFlags StatusFlags => (StatusFlags)this.Struct->StatusFlags;
+ public StatusFlags StatusFlags =>
+ (this.Struct->IsHostile ? StatusFlags.Hostile : StatusFlags.None) |
+ (this.Struct->InCombat ? StatusFlags.InCombat : StatusFlags.None) |
+ (this.Struct->IsWeaponDrawn ? StatusFlags.WeaponOut : StatusFlags.None) |
+ (this.Struct->IsOffhandDrawn ? StatusFlags.OffhandOut : StatusFlags.None) |
+ (this.Struct->IsPartyMember ? StatusFlags.PartyMember : StatusFlags.None) |
+ (this.Struct->IsAllianceMember ? StatusFlags.AllianceMember : StatusFlags.None) |
+ (this.Struct->IsFriend ? StatusFlags.Friend : StatusFlags.None) |
+ (this.Struct->IsCasting ? StatusFlags.IsCasting : StatusFlags.None);
///
/// Gets the underlying structure.
diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index befdb399a..ebec8bacf 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit befdb399a3a579025b82d583fbe3bf84b2ececed
+Subproject commit ebec8bacf50aa082e99c955ec2d4a5ae61937174