ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-14 12:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't allow nameplate GameObject lookup when ObjectId is invalid (#2137)

Browse source
This commit is contained in:
nebel 2024-12-05 06:23:17 +09:00 • committed by GitHub
parent 4c62158aea
commit 75f414578d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Dalamud/Game/Gui/NamePlate/NamePlateUpdateHandler.cs
View file

@ -328,9 +328,22 @@ internal unsafe class NamePlateUpdateHandler : INamePlateUpdateHandler
public ulong GameObjectId => this.gameObjectId ??= this.NamePlateInfo->ObjectId; public ulong GameObjectId => this.gameObjectId ??= this.NamePlateInfo->ObjectId;
/// <inheritdoc/> /// <inheritdoc/>
public IGameObject? GameObject => this.gameObject ??= this.context.ObjectTable[ public IGameObject? GameObject
this.context.Ui3DModule->NamePlateObjectInfoPointers[this.ArrayIndex] {
.Value->GameObject->ObjectIndex]; get
{
if (this.GameObjectId == 0xE0000000)
{
// Skipping Ui3DModule lookup for invalid nameplate (NamePlateInfo->ObjectId is 0xE0000000). This
// prevents crashes around certain Doman Reconstruction cutscenes.
return null;
}
return this.gameObject ??= this.context.ObjectTable[
this.context.Ui3DModule->NamePlateObjectInfoPointers[this.ArrayIndex]
.Value->GameObject->ObjectIndex];
}
}
/// <inheritdoc/> /// <inheritdoc/>
public IBattleChara? BattleChara => this.GameObject as IBattleChara; public IBattleChara? BattleChara => this.GameObject as IBattleChara;