diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java index 68b60692a..bb8b16cc8 100644 --- a/src/main/java/net/minestom/server/entity/Entity.java +++ b/src/main/java/net/minestom/server/entity/Entity.java @@ -90,7 +90,6 @@ public abstract class Entity implements Viewable, EventHandler, DataContainer, P protected float gravityAcceleration; protected float gravityTerminalVelocity; protected int gravityTickCount; // Number of tick where gravity tick was applied - protected float eyeHeight; private boolean autoViewable; private final int id; @@ -1208,20 +1207,13 @@ public abstract class Entity implements Viewable, EventHandler, DataContainer, P /** * Gets the entity eye height. + *

+ * Default to {@link BoundingBox#getHeight()}x0.85 * * @return the entity eye height */ public float getEyeHeight() { - return eyeHeight; - } - - /** - * Changes the entity eye height. - * - * @param eyeHeight the entity eye height - */ - public void setEyeHeight(float eyeHeight) { - this.eyeHeight = eyeHeight; + return boundingBox.getHeight() * 0.85f; } /** diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java index 246c7ddf5..7decf3683 100644 --- a/src/main/java/net/minestom/server/entity/Player.java +++ b/src/main/java/net/minestom/server/entity/Player.java @@ -202,7 +202,6 @@ public class Player extends LivingEntity implements CommandSender { this.playerConnection = playerConnection; setBoundingBox(0.6f, 1.8f, 0.6f); - setEyeHeight(1.62f); setRespawnPoint(new Position(0, 0, 0)); diff --git a/src/main/java/net/minestom/server/entity/type/monster/EntityCaveSpider.java b/src/main/java/net/minestom/server/entity/type/monster/EntityCaveSpider.java index c00594d6a..b607f23c9 100644 --- a/src/main/java/net/minestom/server/entity/type/monster/EntityCaveSpider.java +++ b/src/main/java/net/minestom/server/entity/type/monster/EntityCaveSpider.java @@ -9,6 +9,5 @@ public class EntityCaveSpider extends EntityCreature implements Monster { public EntityCaveSpider(Position spawnPosition) { super(EntityType.CAVE_SPIDER, spawnPosition); setBoundingBox(0.7f, 0.5f, 0.7f); - setEyeHeight(0.45f); } } diff --git a/src/main/java/net/minestom/server/entity/type/monster/EntityEndermite.java b/src/main/java/net/minestom/server/entity/type/monster/EntityEndermite.java index f94dc59a9..b951d4abc 100644 --- a/src/main/java/net/minestom/server/entity/type/monster/EntityEndermite.java +++ b/src/main/java/net/minestom/server/entity/type/monster/EntityEndermite.java @@ -9,6 +9,5 @@ public class EntityEndermite extends EntityCreature implements Monster { public EntityEndermite(Position spawnPosition) { super(EntityType.ENDERMITE, spawnPosition); setBoundingBox(0.4f, 0.3f, 0.4f); - setEyeHeight(0.13f); } } diff --git a/src/main/java/net/minestom/server/entity/type/monster/EntityGhast.java b/src/main/java/net/minestom/server/entity/type/monster/EntityGhast.java index 279f72234..69186ba30 100644 --- a/src/main/java/net/minestom/server/entity/type/monster/EntityGhast.java +++ b/src/main/java/net/minestom/server/entity/type/monster/EntityGhast.java @@ -16,7 +16,6 @@ public class EntityGhast extends EntityCreature implements Monster { public EntityGhast(Position spawnPosition) { super(EntityType.GHAST, spawnPosition); setBoundingBox(4, 4, 4); - setEyeHeight(2.6f); } @NotNull diff --git a/src/main/java/net/minestom/server/entity/type/monster/EntitySilverfish.java b/src/main/java/net/minestom/server/entity/type/monster/EntitySilverfish.java index ce10a6830..b9bd87c37 100644 --- a/src/main/java/net/minestom/server/entity/type/monster/EntitySilverfish.java +++ b/src/main/java/net/minestom/server/entity/type/monster/EntitySilverfish.java @@ -9,6 +9,5 @@ public class EntitySilverfish extends EntityCreature implements Monster { public EntitySilverfish(Position spawnPosition) { super(EntityType.SILVERFISH, spawnPosition); setBoundingBox(0.4f, 0.3f, 0.4f); - setEyeHeight(0.13f); } } diff --git a/src/main/java/net/minestom/server/entity/type/monster/EntitySpider.java b/src/main/java/net/minestom/server/entity/type/monster/EntitySpider.java index f3246408a..d3607ebe8 100644 --- a/src/main/java/net/minestom/server/entity/type/monster/EntitySpider.java +++ b/src/main/java/net/minestom/server/entity/type/monster/EntitySpider.java @@ -16,7 +16,6 @@ public class EntitySpider extends EntityCreature implements Monster { public EntitySpider(Position spawnPosition) { super(EntityType.SPIDER, spawnPosition); setBoundingBox(1.4f, 0.9f, 1.4f); - setEyeHeight(0.65f); } @NotNull diff --git a/src/main/java/net/minestom/server/entity/type/monster/EntityWitch.java b/src/main/java/net/minestom/server/entity/type/monster/EntityWitch.java index ebeded4ca..0eccaf81e 100644 --- a/src/main/java/net/minestom/server/entity/type/monster/EntityWitch.java +++ b/src/main/java/net/minestom/server/entity/type/monster/EntityWitch.java @@ -16,7 +16,6 @@ public class EntityWitch extends EntityCreature implements Monster { public EntityWitch(Position spawnPosition) { super(EntityType.WITCH, spawnPosition); setBoundingBox(0.6f, 1.95f, 0.6f); - setEyeHeight(1.62f); } @NotNull