Merge remote-tracking branch 'origin/1.12.3' into notification-changes
This commit is contained in:
@@ -98,7 +98,19 @@ public class PlayerDataFactory
|
|||||||
|
|
||||||
private unsafe bool CheckForNullDrawObjectUnsafe(IntPtr playerPointer)
|
private unsafe bool CheckForNullDrawObjectUnsafe(IntPtr playerPointer)
|
||||||
{
|
{
|
||||||
return ((Character*)playerPointer)->GameObject.DrawObject == null;
|
if (playerPointer == IntPtr.Zero)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
var character = (Character*)playerPointer;
|
||||||
|
|
||||||
|
if (character == null)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
var gameObject = &character->GameObject;
|
||||||
|
if (gameObject == null)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return gameObject->DrawObject == null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<CharacterDataFragment> CreateCharacterData(GameObjectHandler playerRelatedObject, CancellationToken ct)
|
private async Task<CharacterDataFragment> CreateCharacterData(GameObjectHandler playerRelatedObject, CancellationToken ct)
|
||||||
|
|||||||
Reference in New Issue
Block a user