2020-05-06 17:48:49 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-08-05 09:12:41 +08:00
|
|
|
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
|
2020-08-24 03:57:55 +08:00
|
|
|
index 0000000000000000000000000000000000000000..9ce2948dfaa56d0adf53fe9b6117a90d7773b771
|
2018-08-05 09:12:41 +08:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
|
2020-08-24 03:57:55 +08:00
|
|
|
@@ -0,0 +1,62 @@
|
2018-08-05 09:12:41 +08:00
|
|
|
+package com.destroystokyo.paper.event.entity;
|
|
|
|
+
|
2020-08-24 03:57:55 +08:00
|
|
|
+import com.google.common.collect.ImmutableList;
|
|
|
|
+import org.bukkit.entity.HumanEntity;
|
2018-08-05 09:12:41 +08:00
|
|
|
+import org.bukkit.entity.SkeletonHorse;
|
|
|
|
+import org.bukkit.event.Cancellable;
|
|
|
|
+import org.bukkit.event.HandlerList;
|
|
|
|
+import org.bukkit.event.entity.EntityEvent;
|
2019-03-20 08:28:15 +08:00
|
|
|
+import org.jetbrains.annotations.NotNull;
|
2018-08-05 09:12:41 +08:00
|
|
|
+
|
2020-08-24 03:57:55 +08:00
|
|
|
+import java.util.List;
|
|
|
|
+
|
2018-08-05 09:12:41 +08:00
|
|
|
+/**
|
|
|
|
+ * 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;
|
2020-08-24 03:57:55 +08:00
|
|
|
+ private final List<HumanEntity> eligibleHumans;
|
2018-08-05 09:12:41 +08:00
|
|
|
+
|
2019-03-20 08:28:15 +08:00
|
|
|
+ public SkeletonHorseTrapEvent(@NotNull SkeletonHorse horse) {
|
2020-08-24 03:57:55 +08:00
|
|
|
+ this(horse, ImmutableList.of());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public SkeletonHorseTrapEvent(@NotNull SkeletonHorse horse, @NotNull List<HumanEntity> eligibleHumans) {
|
2018-08-05 09:12:41 +08:00
|
|
|
+ super(horse);
|
2020-08-24 03:57:55 +08:00
|
|
|
+ this.eligibleHumans = eligibleHumans;
|
2018-08-05 09:12:41 +08:00
|
|
|
+ }
|
|
|
|
+
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
2018-08-05 09:12:41 +08:00
|
|
|
+ @Override
|
|
|
|
+ public SkeletonHorse getEntity() {
|
|
|
|
+ return (SkeletonHorse) super.getEntity();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isCancelled() {
|
|
|
|
+ return cancelled;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setCancelled(boolean cancel) {
|
|
|
|
+ this.cancelled = cancel;
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
2020-08-24 03:57:55 +08:00
|
|
|
+ public List<HumanEntity> getEligibleHumans() {
|
|
|
|
+ return eligibleHumans;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @NotNull
|
2018-08-05 09:12:41 +08:00
|
|
|
+ @Override
|
|
|
|
+ public HandlerList getHandlers() {
|
|
|
|
+ return handlers;
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-20 08:28:15 +08:00
|
|
|
+ @NotNull
|
2018-08-05 09:12:41 +08:00
|
|
|
+ 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
|
2020-05-06 17:48:49 +08:00
|
|
|
index b2c6b6a8689f6bd6ce784bbe6f571f756dd700c1..ba9983463263f77db3d3487bc12f01db4508a32b 100644
|
2018-08-05 09:12:41 +08:00
|
|
|
--- 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
|
|
|
|
+}
|