From d674606e0454239bc610330be923486efb19a93b Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Sat, 27 Apr 2024 20:17:12 +1000 Subject: Fix: Various SkyHanniRenderEntityEvent things (#1555) --- .../java/at/hannibal2/skyhanni/utils/EntityUtils.kt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (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 494fe1efa..70fdb6c4e 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt @@ -181,14 +181,6 @@ object EntityUtils { fun getEntityByID(entityId: Int) = Minecraft.getMinecraft()?.thePlayer?.entityWorld?.getEntityByID(entityId) - @SubscribeEvent - fun onEntityRender(event: RenderLivingEvent<*>) { - val shEvent = SkyHanniRenderEntityEvent(event.entity, event.renderer, event.x, event.y, event.z) - if (shEvent.postAndCatch()) { - event.cancel() - } - } - @SubscribeEvent fun onEntityRenderPre(event: RenderLivingEvent.Pre<*>) { val shEvent = SkyHanniRenderEntityEvent.Pre(event.entity, event.renderer, event.x, event.y, event.z) @@ -199,10 +191,7 @@ object EntityUtils { @SubscribeEvent fun onEntityRenderPost(event: RenderLivingEvent.Post<*>) { - val shEvent = SkyHanniRenderEntityEvent.Post(event.entity, event.renderer, event.x, event.y, event.z) - if (shEvent.postAndCatch()) { - event.cancel() - } + SkyHanniRenderEntityEvent.Post(event.entity, event.renderer, event.x, event.y, event.z) } @SubscribeEvent @@ -215,10 +204,7 @@ object EntityUtils { @SubscribeEvent fun onEntityRenderSpecialsPost(event: RenderLivingEvent.Specials.Post<*>) { - val shEvent = SkyHanniRenderEntityEvent.Specials.Post(event.entity, event.renderer, event.x, event.y, event.z) - if (shEvent.postAndCatch()) { - event.cancel() - } + SkyHanniRenderEntityEvent.Specials.Post(event.entity, event.renderer, event.x, event.y, event.z) } fun EntityLivingBase.isCorrupted() = baseMaxHealth == health.toInt().derpy() * 3 || isRunicAndCorrupt() -- cgit