From 572e159de71827c5c8a6433de90adba2ebec5c4a Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 30 Oct 2023 20:02:47 +0100
Subject: NullPointerException fix for getEntityByID (#652)

Fixed rare error message while disconnecting. #652
---
 src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/main/java/at/hannibal2/skyhanni/utils')

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
index 8e0cd9fdb..f1d0544a2 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -155,4 +155,11 @@ object EntityUtils {
     }?.asSequence()?.filterNotNull() ?: emptySequence()
 
     fun Entity.canBeSeen(radius: Double = 150.0) = getLorenzVec().add(y = 0.5).canBeSeen(radius)
+
+    fun getEntityByID(id: Int): Entity? {
+        val minecraft = Minecraft.getMinecraft() ?: return null
+        val world = minecraft.theWorld ?: return null
+        if (minecraft.thePlayer == null) return null
+        return world.getEntityByID(id)
+    }
 }
-- 
cgit