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

Merge pull request #2442 from nebel/nameplate-gameobj-more-null-checks
Some checks are pending
Build Dalamud / Build on Windows (push) Waiting to run
Details
Build Dalamud / Check API Compatibility (push) Blocked by required conditions
Details
Build Dalamud / Deploy dalamud-distrib staging (push) Blocked by required conditions
Details
Tag Build / Tag Build (push) Successful in 4s
Details

Browse source 
Add more null checks to NamePlateUpdateHander.GameObject
This commit is contained in:
goat 2025-10-28 19:12:08 +01:00 • committed by GitHub
commit 31340dda84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -340,9 +340,13 @@ internal unsafe class NamePlateUpdateHandler : INamePlateUpdateHandler
return null; return null;
} }
return this.gameObject ??= this.context.ObjectTable[ var objectInfoPtr = this.context.Ui3DModule->NamePlateObjectInfoPointers[this.ArrayIndex];
this.context.Ui3DModule->NamePlateObjectInfoPointers[this.ArrayIndex] if (objectInfoPtr.Value == null) return null;
.Value->GameObject->ObjectIndex];
var gameObjectPtr = objectInfoPtr.Value->GameObject;
if (gameObjectPtr == null) return null;
return this.gameObject ??= this.context.ObjectTable[gameObjectPtr->ObjectIndex];
} }
} }