5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
105 lines
2.8 KiB
Diff
105 lines
2.8 KiB
Diff
From 26947b3096d22303635f386434624e373a26bef6 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
|
|
|