mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 15:30:19 +01:00
57dd397155
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
80 lines
2.3 KiB
Diff
80 lines
2.3 KiB
Diff
From f51bcff92d8ae89a6a86234b508d4778a30e8b2d 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
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
|
|
new file mode 100644
|
|
index 000000000..d79dbcd68
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
|
|
@@ -0,0 +1,47 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+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.NotNull;
|
|
+
|
|
+/**
|
|
+ * 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;
|
|
+
|
|
+ public SkeletonHorseTrapEvent(@NotNull SkeletonHorse horse) {
|
|
+ super(horse);
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public SkeletonHorse getEntity() {
|
|
+ return (SkeletonHorse) super.getEntity();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
+
|
|
diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java
|
|
index b2c6b6a86..ba9983463 100644
|
|
--- a/src/main/java/org/bukkit/entity/SkeletonHorse.java
|
|
+++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java
|
|
@@ -3,4 +3,12 @@ package org.bukkit.entity;
|
|
/**
|
|
* Represents a SkeletonHorse - variant of {@link AbstractHorse}.
|
|
*/
|
|
-public interface SkeletonHorse extends AbstractHorse { }
|
|
+public interface SkeletonHorse extends AbstractHorse {
|
|
+ // Paper start
|
|
+ int getTrapTime();
|
|
+
|
|
+ boolean isTrap();
|
|
+
|
|
+ void setTrap(boolean trap);
|
|
+ // Paper end
|
|
+}
|
|
--
|
|
2.26.2
|
|
|