From 8df5a80725f7d1599299ccdfab87bfd3f040b8b6 Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 13 Jul 2023 22:58:07 -0700 Subject: [PATCH] Fix entity eye height loop. --- .../minecraft/net/minecraft/world/entity/Entity.java.patch | 2 +- .../net/minecraft/world/entity/LivingEntity.java.patch | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/patches/minecraft/net/minecraft/world/entity/Entity.java.patch b/patches/minecraft/net/minecraft/world/entity/Entity.java.patch index 1895a41045..865114811e 100644 --- a/patches/minecraft/net/minecraft/world/entity/Entity.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/Entity.java.patch @@ -649,7 +649,7 @@ + /** + * Accessor method for {@link #getEyeHeight(Pose, EntityDimensions)} + */ -+ public final float getEyeHeightAccess(Pose pose, EntityDimensions size) { ++ public float getEyeHeightAccess(Pose pose, EntityDimensions size) { + return this.m_6380_(pose, size); + } + diff --git a/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch b/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch index 7a74433bb2..a210935af6 100644 --- a/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch @@ -643,12 +643,15 @@ } public boolean m_5830_() { -@@ -3187,11 +_,11 @@ +@@ -3187,11 +_,14 @@ } protected float m_6431_(Pose p_21131_, EntityDimensions p_21132_) { - return super.m_6380_(p_21131_, p_21132_); -+ return this.getEyeHeightForge(p_21131_, p_21132_); ++ float eyeHeight = super.m_6380_(p_21131_, p_21132_); ++ var evt = new net.minecraftforge.event.entity.EntityEvent.EyeHeight(self(), p_21131_, p_21132_, eyeHeight); ++ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(evt); ++ return evt.getNewEyeHeight(); } public ItemStack m_6298_(ItemStack p_21272_) {