Fix entity size event not being fired, changed it to split eye height and size calculations. (#9535)

This commit is contained in:
Meldexun authored and GitHub committed 2023-07-13 19:16:17 -07:00
1 parent 2c965fac90
commit 77fb08713f
6 files changed
+138 -59

No files matched your search

@@ -16,7 +16,9 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityDimensions;
import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.entity.Pose;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.item.SpawnEggItem;
import net.minecraft.world.item.ItemStack;
@@ -26,9 +28,11 @@ import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.phys.HitResult;
import net.minecraftforge.common.ForgeMod;
import net.minecraftforge.common.ForgeSpawnEggItem;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.SoundAction;
import net.minecraftforge.common.capabilities.ICapabilitySerializable;
import net.minecraftforge.entity.PartEntity;
import net.minecraftforge.event.entity.EntityEvent;
import net.minecraftforge.fluids.FluidType;
import org.jetbrains.annotations.Nullable;
@@ -424,4 +428,20 @@ public interface IForgeEntity extends ICapabilitySerializable<CompoundTag>
{
return false;
}
default EntityDimensions getDimensionsForge(Pose pose)
{
EntityDimensions size = self().getDimensions(pose);
EntityEvent.Size evt = new EntityEvent.Size(self(), pose, size);
MinecraftForge.EVENT_BUS.post(evt);
return evt.getNewSize();
}
default float getEyeHeightForge(Pose pose, EntityDimensions size)
{
float eyeHeight = self().getEyeHeightAccess(pose, size);
EntityEvent.EyeHeight evt = new EntityEvent.EyeHeight(self(), pose, size, eyeHeight);
MinecraftForge.EVENT_BUS.post(evt);
return evt.getNewEyeHeight();
}
}