From 94740f40571e5c5bbff105fb3da824045b40bb09 Mon Sep 17 00:00:00 2001 From: Bluefissure Date: Fri, 7 Aug 2020 21:56:00 -0400 Subject: [PATCH 1/2] change world size to ushort --- Dalamud/Game/ClientState/Structs/Actor.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dalamud/Game/ClientState/Structs/Actor.cs b/Dalamud/Game/ClientState/Structs/Actor.cs index 537963efb..776be40f1 100644 --- a/Dalamud/Game/ClientState/Structs/Actor.cs +++ b/Dalamud/Game/ClientState/Structs/Actor.cs @@ -68,8 +68,8 @@ namespace Dalamud.Game.ClientState.Structs public byte[] CompanyTag; [FieldOffset(ActorOffsets.NameId)] public int NameId; - [FieldOffset(ActorOffsets.CurrentWorld)] public byte CurrentWorld; - [FieldOffset(ActorOffsets.HomeWorld)] public byte HomeWorld; + [FieldOffset(ActorOffsets.CurrentWorld)] public ushort CurrentWorld; + [FieldOffset(ActorOffsets.HomeWorld)] public ushort HomeWorld; [FieldOffset(ActorOffsets.CurrentHp)] public int CurrentHp; [FieldOffset(ActorOffsets.MaxHp)] public int MaxHp; [FieldOffset(ActorOffsets.CurrentMp)] public int CurrentMp; From 8ec60f2eed5a7d7c550325288bfaa2b8365afb99 Mon Sep 17 00:00:00 2001 From: Bluefissure Date: Fri, 7 Aug 2020 22:02:40 -0400 Subject: [PATCH 2/2] fix refs --- Dalamud/Game/ClientState/Actors/Resolvers/World.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Game/ClientState/Actors/Resolvers/World.cs b/Dalamud/Game/ClientState/Actors/Resolvers/World.cs index 23d89d22e..41ea07d04 100644 --- a/Dalamud/Game/ClientState/Actors/Resolvers/World.cs +++ b/Dalamud/Game/ClientState/Actors/Resolvers/World.cs @@ -25,7 +25,7 @@ namespace Dalamud.Game.ClientState.Actors.Resolvers /// Set up the world resolver with the provided ID. /// /// The ID of the world. - public World(byte id, Dalamud dalamud) : base(dalamud) { + public World(ushort id, Dalamud dalamud) : base(dalamud) { this.Id = id; } }