ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 06:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1063 from NotNite/beef-videos

Browse source 
fix: uint->ulong for some object ids
This commit is contained in:
goat 2023-01-11 02:15:53 +01:00 • committed by GitHub
commit d52172bbbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Game/ClientState/Objects/ObjectTable.cs
View file

@ -60,7 +60,7 @@ public sealed partial class ObjectTable : IServiceType
/// </summary>
/// <param name="objectId">Object ID to find.</param>
/// <returns>A game object or null.</returns>
public GameObject? SearchById(uint objectId)
public GameObject? SearchById(ulong objectId)
{
if (objectId is GameObject.InvalidGameObjectId or 0)
return null;

2
Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
View file

@ -25,5 +25,5 @@ public unsafe class BattleNpc : BattleChara
public BattleNpcSubKind BattleNpcKind => (BattleNpcSubKind)this.Struct->Character.GameObject.SubKind;
/// <inheritdoc/>
public override uint TargetObjectId => this.Struct->Character.TargetObjectID;
public override ulong TargetObjectId => this.Struct->Character.TargetObjectID;
}

2
Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs
View file

@ -33,5 +33,5 @@ public unsafe class PlayerCharacter : BattleChara
/// <summary>
/// Gets the target actor ID of the PlayerCharacter.
/// </summary>
public override uint TargetObjectId => this.Struct->Character.PlayerTargetObjectID;
public override ulong TargetObjectId => this.Struct->Character.PlayerTargetObjectID;
}

2
Dalamud/Game/ClientState/Objects/Types/Character.cs
View file

@ -87,7 +87,7 @@ public unsafe class Character : GameObject
/// <summary>
/// Gets the target object ID of the character.
/// </summary>
public override uint TargetObjectId => this.Struct->TargetObjectID;
public override ulong TargetObjectId => this.Struct->TargetObjectID;
/// <summary>
/// Gets the name ID of the character.

2
Dalamud/Game/ClientState/Objects/Types/GameObject.cs
View file

@ -158,7 +158,7 @@ public unsafe partial class GameObject
/// <summary>
/// Gets the current target of the game object.
/// </summary>
public virtual uint TargetObjectId => 0;
public virtual ulong TargetObjectId => 0;
/// <summary>
/// Gets the target object of the game object.