mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +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:77fd87e4
SPIGOT-2304: Implement LootGenerateEventa1a705ee
SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712edd
SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
91 lines
2.6 KiB
Diff
91 lines
2.6 KiB
Diff
From ffafa77c36486a1d9d4a989d09df94dd80a06355 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 000000000..f0067c2e9
|
|
--- /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
|
|
index deab50525..7f73e4b92 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -711,5 +711,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
* @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
|
|
}
|
|
--
|
|
2.26.2
|
|
|