Merge pull request goatcorp#1332 from MidoriKami/PlayerCharacter_Reso…

…lveObsolete Resolve Character.cs Obsoletes
fallingflow · Jul 31, 2023 · e101ac0 · e101ac0
2 parents f69fb6c + 29debac
commit e101ac0
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/Dalamud/Game/ClientState/Objects/Types/Character.cs b/Dalamud/Game/ClientState/Objects/Types/Character.cs
@@ -26,52 +26,52 @@ internal Character(IntPtr address)
     /// <summary>
     /// Gets the current HP of this Chara.
     /// </summary>
-    public uint CurrentHp => this.Struct->Health;
+    public uint CurrentHp => this.Struct->CharacterData.Health;
 
     /// <summary>
     /// Gets the maximum HP of this Chara.
     /// </summary>
-    public uint MaxHp => this.Struct->MaxHealth;
+    public uint MaxHp => this.Struct->CharacterData.MaxHealth;
 
     /// <summary>
     /// Gets the current MP of this Chara.
     /// </summary>
-    public uint CurrentMp => this.Struct->Mana;
+    public uint CurrentMp => this.Struct->CharacterData.Mana;
 
     /// <summary>
     /// Gets the maximum MP of this Chara.
     /// </summary>
-    public uint MaxMp => this.Struct->MaxMana;
+    public uint MaxMp => this.Struct->CharacterData.MaxMana;
 
     /// <summary>
     /// Gets the current GP of this Chara.
     /// </summary>
-    public uint CurrentGp => this.Struct->GatheringPoints;
+    public uint CurrentGp => this.Struct->CharacterData.GatheringPoints;
 
     /// <summary>
     /// Gets the maximum GP of this Chara.
     /// </summary>
-    public uint MaxGp => this.Struct->MaxGatheringPoints;
+    public uint MaxGp => this.Struct->CharacterData.MaxGatheringPoints;
 
     /// <summary>
     /// Gets the current CP of this Chara.
     /// </summary>
-    public uint CurrentCp => this.Struct->CraftingPoints;
+    public uint CurrentCp => this.Struct->CharacterData.CraftingPoints;
 
     /// <summary>
     /// Gets the maximum CP of this Chara.
     /// </summary>
-    public uint MaxCp => this.Struct->MaxCraftingPoints;
+    public uint MaxCp => this.Struct->CharacterData.MaxCraftingPoints;
 
     /// <summary>
     /// Gets the ClassJob of this Chara.
     /// </summary>
-    public ExcelResolver<ClassJob> ClassJob => new(this.Struct->ClassJob);
+    public ExcelResolver<ClassJob> ClassJob => new(this.Struct->CharacterData.ClassJob);
 
     /// <summary>
     /// Gets the level of this Chara.
     /// </summary>
-    public byte Level => this.Struct->Level;
+    public byte Level => this.Struct->CharacterData.Level;
 
     /// <summary>
     /// Gets a byte array describing the visual appearance of this Chara.
@@ -97,7 +97,7 @@ internal Character(IntPtr address)
     /// <summary>
     /// Gets the current online status of the character.
     /// </summary>
-    public ExcelResolver<OnlineStatus> OnlineStatus => new(this.Struct->OnlineStatus);
+    public ExcelResolver<OnlineStatus> OnlineStatus => new(this.Struct->CharacterData.OnlineStatus);
 
     /// <summary>
     /// Gets the status flags.