diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java index 10cf738d8..95cb67e82 100644 --- a/src/main/java/net/minestom/server/entity/Entity.java +++ b/src/main/java/net/minestom/server/entity/Entity.java @@ -125,7 +125,7 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer, private long ticks; private final EntityTickEvent tickEvent = new EntityTickEvent(this); - private final Acquirable acquirable = Acquirable.of(this); + private final Acquirable acquirable = Acquirable.of(this); /** * Lock used to support #switchEntityType @@ -1573,8 +1573,12 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer, return Objects.requireNonNullElse(this.customSynchronizationCooldown, SYNCHRONIZATION_COOLDOWN); } - public @NotNull Acquirable getAcquirable() { - return acquirable; + public @NotNull Acquirable getAcquirable() { + return (Acquirable) acquirable; + } + + public @NotNull Acquirable getAcquirable(@NotNull Class clazz) { + return (Acquirable) acquirable; } public enum Pose { diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java index 6598ce603..46a6f6a0f 100644 --- a/src/main/java/net/minestom/server/entity/Player.java +++ b/src/main/java/net/minestom/server/entity/Player.java @@ -15,7 +15,6 @@ import net.kyori.adventure.text.event.HoverEventSource; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.title.Title; import net.minestom.server.MinecraftServer; -import net.minestom.server.acquirable.Acquirable; import net.minestom.server.advancements.AdvancementTab; import net.minestom.server.adventure.AdventurePacketConvertor; import net.minestom.server.adventure.Localizable; @@ -2448,11 +2447,6 @@ public class Player extends LivingEntity implements CommandSender, Localizable, return lastKeepAlive; } - @Override - public @NotNull Acquirable getAcquirable() { - return (Acquirable) super.getAcquirable(); - } - @Override public @NotNull HoverEvent asHoverEvent(@NotNull UnaryOperator op) { return HoverEvent.showEntity(ShowEntity.of(EntityType.PLAYER, this.uuid, this.displayName));