[ci skip] Cleanup events (#10202)

patches/api/SkeletonHorse-Additions.patch

@@ -18,6 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.entity.EntityEvent;
++import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +import java.util.List;
@@ -26,14 +27,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + * Event called when a player gets close to a skeleton horse and triggers the lightning trap
 + */
 +public class SkeletonHorseTrapEvent extends EntityEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean cancelled;
-+    private final List<HumanEntity> eligibleHumans;
 +
++    private static final HandlerList HANDLER_LIST = new HandlerList();
++
++    private final List<HumanEntity> eligibleHumans;
++    private boolean cancelled;
++
++    @Deprecated
++    @ApiStatus.Internal
 +    public SkeletonHorseTrapEvent(@NotNull SkeletonHorse horse) {
 +        this(horse, ImmutableList.of());
 +    }
 +
++    @ApiStatus.Internal
 +    public SkeletonHorseTrapEvent(@NotNull SkeletonHorse horse, @NotNull List<HumanEntity> eligibleHumans) {
 +        super(horse);
 +        this.eligibleHumans = eligibleHumans;
@@ -45,9 +51,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return (SkeletonHorse) super.getEntity();
 +    }
 +
++    @NotNull
++    public List<HumanEntity> getEligibleHumans() {
++        return this.eligibleHumans;
++    }
++
 +    @Override
 +    public boolean isCancelled() {
-+        return cancelled;
++        return this.cancelled;
 +    }
 +
 +    @Override
@@ -56,19 +67,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @NotNull
-+    public List<HumanEntity> getEligibleHumans() {
-+        return eligibleHumans;
-+    }
-+
-+    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
-+        return handlers;
++        return HANDLER_LIST;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return handlers;
++        return HANDLER_LIST;
 +    }
 +}
 +