2020-04-02 21:07:06 +00:00
|
|
|
From 4f7f47c7b6de91c1101b33bf94e221cfc162b145 Mon Sep 17 00:00:00 2001
|
2020-02-11 04:28:39 +00:00
|
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
|
|
Date: Sat, 8 Feb 2020 23:26:18 -0600
|
|
|
|
Subject: [PATCH] Entity Jump API
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java
|
|
|
|
new file mode 100644
|
2020-02-25 18:57:15 +00:00
|
|
|
index 000000000..f0067c2e9
|
2020-02-11 04:28:39 +00:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java
|
|
|
|
@@ -0,0 +1,46 @@
|
|
|
|
+package com.destroystokyo.paper.event.entity;
|
|
|
|
+
|
|
|
|
+import org.bukkit.entity.LivingEntity;
|
|
|
|
+import org.bukkit.event.Cancellable;
|
|
|
|
+import org.bukkit.event.HandlerList;
|
|
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Called when an entity jumps
|
|
|
|
+ * <p>
|
|
|
|
+ * Cancelling the event will stop the entity from jumping
|
|
|
|
+ */
|
|
|
|
+public class EntityJumpEvent extends EntityEvent implements Cancellable {
|
|
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
|
|
+ private boolean canceled;
|
|
|
|
+
|
|
|
|
+ public EntityJumpEvent(@NotNull LivingEntity entity) {
|
|
|
|
+ super(entity);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @NotNull
|
|
|
|
+ @Override
|
|
|
|
+ public LivingEntity getEntity() {
|
|
|
|
+ return (LivingEntity) entity;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean isCancelled() {
|
|
|
|
+ return canceled;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setCancelled(boolean cancel) {
|
|
|
|
+ canceled = cancel;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @NotNull
|
|
|
|
+ @Override
|
|
|
|
+ public HandlerList getHandlers() {
|
|
|
|
+ return handlers;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @NotNull
|
|
|
|
+ public static HandlerList getHandlerList() {
|
|
|
|
+ return handlers;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
2020-02-25 18:57:15 +00:00
|
|
|
index deab50525..7f73e4b92 100644
|
2020-02-11 04:28:39 +00:00
|
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
2020-02-25 18:57:15 +00:00
|
|
|
@@ -711,5 +711,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
2020-02-11 04:28:39 +00:00
|
|
|
* @return Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
|
|
|
|
*/
|
|
|
|
boolean isHandRaised();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get entity jump state.
|
|
|
|
+ * <p>
|
|
|
|
+ * Jump state will be true when the entity has been marked to jump.
|
|
|
|
+ *
|
|
|
|
+ * @return entity jump state.
|
|
|
|
+ */
|
|
|
|
+ boolean isJumping();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Set entity jump state
|
|
|
|
+ * <p>
|
|
|
|
+ * Setting to true will mark the entity to jump.
|
|
|
|
+ * <p>
|
|
|
|
+ * Setting to false will unmark the entity to jump but will not stop a jump already in-progress.
|
|
|
|
+ *
|
|
|
|
+ * @param jumping entity jump state
|
|
|
|
+ */
|
|
|
|
+ void setJumping(boolean jumping);
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
--
|
2020-04-02 21:07:06 +00:00
|
|
|
2.25.1
|
2020-02-11 04:28:39 +00:00
|
|
|
|