From 2226788f01d043f4c3839259447f0bacb3c166fb Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 00:57:16 -0500 Subject: [PATCH] Ridables --- .../event/entity/RidableSpacebarEvent.java | 37 ++++++++++++++++++ src/main/java/org/bukkit/entity/Entity.java | 38 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java new file mode 100644 index 000000000..c0ec5a130 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java @@ -0,0 +1,37 @@ +package net.pl3x.purpur.event.entity; + +import org.bukkit.entity.Entity; +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; +import org.bukkit.event.entity.EntityEvent; +import org.jetbrains.annotations.NotNull; + +public class RidableSpacebarEvent extends EntityEvent implements Cancellable { + private static final HandlerList handlers = new HandlerList(); + private boolean cancelled; + + public RidableSpacebarEvent(@NotNull Entity entity) { + super(entity); + } + + @Override + public boolean isCancelled() { + return cancelled; + } + + @Override + public void setCancelled(boolean cancel) { + cancelled = cancel; + } + + @Override + @NotNull + public HandlerList getHandlers() { + return handlers; + } + + @NotNull + public static HandlerList getHandlerList() { + return handlers; + } +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java index 5518ecd21..809021b20 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -656,4 +656,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason(); // Paper end + + // Purpur start + /** + * Get the riding player + * + * @return Riding player + */ + @Nullable + Player getRider(); + + /** + * Check if entity is being ridden + * + * @return True if being ridden + */ + boolean hasRider(); + + /** + * Check if entity is ridable + * + * @return True if ridable + */ + boolean isRidable(); + + /** + * Check if entity is ridable in water + * + * @return True if ridable in water + */ + boolean isRidableInWater(); + + /** + * Check if shift is required to mount this entity + * + * @return True if shift is required + */ + boolean requireShiftToMount(); + // Purpur end } -- 2.24.0