From 431acee6c7e23b1f30c9b2fa618881d02faaeac6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath <Blake.Galbreath@GMail.com> Date: Fri, 27 Jul 2018 22:36:17 -0500 Subject: [PATCH] SkeletonHorse Additions --- .../event/entity/SkeletonHorseTrapEvent.java | 64 +++++++++++++++++++ .../java/org/bukkit/entity/SkeletonHorse.java | 14 ++++ 2 files changed, 78 insertions(+) create mode 100644 paper-api/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java diff --git a/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java new file mode 100644 index 0000000000..a70f4972a0 --- /dev/null +++ b/paper-api/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java @@ -0,0 +1,64 @@ +package com.destroystokyo.paper.event.entity; + +import com.google.common.collect.ImmutableList; +import java.util.List; +import org.bukkit.entity.HumanEntity; +import org.bukkit.entity.SkeletonHorse; +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; +import org.bukkit.event.entity.EntityEvent; +import org.jetbrains.annotations.ApiStatus; +import org.jspecify.annotations.NullMarked; + +/** + * Event called when a player gets close to a skeleton horse and triggers the lightning trap + */ +@NullMarked +public class SkeletonHorseTrapEvent extends EntityEvent implements Cancellable { + + private static final HandlerList HANDLER_LIST = new HandlerList(); + + private final List<HumanEntity> eligibleHumans; + private boolean cancelled; + + @Deprecated + @ApiStatus.Internal + public SkeletonHorseTrapEvent(final SkeletonHorse horse) { + this(horse, ImmutableList.of()); + } + + @ApiStatus.Internal + public SkeletonHorseTrapEvent(final SkeletonHorse horse, final List<HumanEntity> eligibleHumans) { + super(horse); + this.eligibleHumans = eligibleHumans; + } + + @Override + public SkeletonHorse getEntity() { + return (SkeletonHorse) super.getEntity(); + } + + public List<HumanEntity> getEligibleHumans() { + return this.eligibleHumans; + } + + @Override + public boolean isCancelled() { + return this.cancelled; + } + + @Override + public void setCancelled(final boolean cancel) { + this.cancelled = cancel; + } + + @Override + public HandlerList getHandlers() { + return HANDLER_LIST; + } + + public static HandlerList getHandlerList() { + return HANDLER_LIST; + } +} + diff --git a/paper-api/src/main/java/org/bukkit/entity/SkeletonHorse.java b/paper-api/src/main/java/org/bukkit/entity/SkeletonHorse.java index a34ad28fc4..38539d5b77 100644 --- a/paper-api/src/main/java/org/bukkit/entity/SkeletonHorse.java +++ b/paper-api/src/main/java/org/bukkit/entity/SkeletonHorse.java @@ -43,4 +43,18 @@ public interface SkeletonHorse extends AbstractHorse { * @param trapTime new trap time */ void setTrapTime(int trapTime); + + // Paper start + /** + * @deprecated use {@link #isTrapped()} + */ + @Deprecated + boolean isTrap(); + + /** + * @deprecated use {@link #setTrapped(boolean)} + */ + @Deprecated + void setTrap(boolean trap); + // Paper end }