mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-04 02:34:48 +02:00
0976d52bbd
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 Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
106 lines
2.8 KiB
Diff
106 lines
2.8 KiB
Diff
From 839ae04d99c14516adbd82e7bc0c0d56c05e8795 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 30 Apr 2018 13:14:30 -0400
|
|
Subject: [PATCH] EndermanEscapeEvent
|
|
|
|
Fires an event anytime an enderman intends to teleport away from the player
|
|
|
|
You may cancel this, enabling ranged attacks to damage the enderman for example.
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
|
|
new file mode 100644
|
|
index 000000000..806112a8b
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java
|
|
@@ -0,0 +1,87 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+import org.bukkit.entity.Enderman;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.Event;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+public class EndermanEscapeEvent extends EntityEvent implements Cancellable {
|
|
+ @NotNull private final Reason reason;
|
|
+
|
|
+ public EndermanEscapeEvent(@NotNull Enderman entity, @NotNull Reason reason) {
|
|
+ super(entity);
|
|
+ this.reason = reason;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public Enderman getEntity() {
|
|
+ return (Enderman) super.getEntity();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return The reason the enderman is trying to escape
|
|
+ */
|
|
+ @NotNull
|
|
+ public Reason getReason() {
|
|
+ return reason;
|
|
+ }
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+
|
|
+ @NotNull
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ private boolean cancelled = false;
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Cancels the escape.
|
|
+ *
|
|
+ * If this escape normally would of resulted in damage avoidance such as indirect,
|
|
+ * the enderman will now take damage.
|
|
+ *
|
|
+ * @param cancel true if you wish to cancel this event
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ public enum Reason {
|
|
+ /**
|
|
+ * The enderman has stopped attacking and ran away
|
|
+ */
|
|
+ RUNAWAY,
|
|
+ /**
|
|
+ * The enderman has teleported away due to indirect damage (ranged)
|
|
+ */
|
|
+ INDIRECT,
|
|
+ /**
|
|
+ * The enderman has teleported away due to a critical hit
|
|
+ */
|
|
+ CRITICAL_HIT,
|
|
+ /**
|
|
+ * The enderman has teleported away due to the player staring at it during combat
|
|
+ */
|
|
+ STARE,
|
|
+ /**
|
|
+ * Specific case for CRITICAL_HIT where the enderman is taking rain damage
|
|
+ */
|
|
+ DROWN
|
|
+ }
|
|
+}
|
|
--
|
|
2.21.0
|
|
|