From 30bc4df0a98aaacdc829c35a1dd951807c56f5f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:16:42 -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. Resolves #1101 --- .../0098-EndermanEscapeEvent.patch | 90 +++++++++++++++++++ .../0292-EndermanEscapeEvent.patch | 81 +++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 Spigot-API-Patches/0098-EndermanEscapeEvent.patch create mode 100644 Spigot-Server-Patches/0292-EndermanEscapeEvent.patch diff --git a/Spigot-API-Patches/0098-EndermanEscapeEvent.patch b/Spigot-API-Patches/0098-EndermanEscapeEvent.patch new file mode 100644 index 000000000..1cb59804f --- /dev/null +++ b/Spigot-API-Patches/0098-EndermanEscapeEvent.patch @@ -0,0 +1,90 @@ +From 4132364cc9de1e0d531b6dc172ef62b87f3979b9 Mon Sep 17 00:00:00 2001 +From: Aikar +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 00000000..958c66b3 +--- /dev/null ++++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java +@@ -0,0 +1,72 @@ ++package com.destroystokyo.paper.event.entity; ++ ++import org.bukkit.entity.Enderman; ++import org.bukkit.event.Cancellable; ++import org.bukkit.event.Event; ++import org.bukkit.event.HandlerList; ++import org.bukkit.event.entity.EntityEvent; ++ ++public class EndermanEscapeEvent extends EntityEvent implements Cancellable { ++ private final Reason reason; ++ ++ public EndermanEscapeEvent(Enderman entity, Reason reason) { ++ super(entity); ++ this.reason = reason; ++ } ++ ++ /** ++ * @return The reason the enderman is trying to escape ++ */ ++ public Reason getReason() { ++ return reason; ++ } ++ ++ private static final HandlerList handlers = new HandlerList(); ++ ++ public HandlerList getHandlers() { ++ return handlers; ++ } ++ ++ 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 ++ } ++} +-- +2.17.0 + diff --git a/Spigot-Server-Patches/0292-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0292-EndermanEscapeEvent.patch new file mode 100644 index 000000000..c65d5909f --- /dev/null +++ b/Spigot-Server-Patches/0292-EndermanEscapeEvent.patch @@ -0,0 +1,81 @@ +From ba5ac2e872e3a9faec221e4d8bae4ee6c689dbbf Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Mon, 30 Apr 2018 13:15:55 -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/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java +index 2f59e7071..7b1fb6b7b 100644 +--- a/src/main/java/net/minecraft/server/EntityEnderman.java ++++ b/src/main/java/net/minecraft/server/EntityEnderman.java +@@ -1,5 +1,6 @@ + package net.minecraft.server; + ++import com.destroystokyo.paper.event.entity.EndermanEscapeEvent; + import com.google.common.base.Function; + import com.google.common.base.Optional; + import com.google.common.base.Predicate; +@@ -62,6 +63,12 @@ public class EntityEnderman extends EntityMonster { + setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true); + } + ++ // Paper start ++ private boolean tryEscape(EndermanEscapeEvent.Reason reason) { ++ return new EndermanEscapeEvent((org.bukkit.craftbukkit.entity.CraftEnderman) this.getBukkitEntity(), reason).callEvent(); ++ } ++ // Paper end ++ + @Override + public boolean setGoalTarget(EntityLiving entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason reason, boolean fireEvent) { + if (!super.setGoalTarget(entityliving, reason, fireEvent)) { +@@ -184,7 +191,7 @@ public class EntityEnderman extends EntityMonster { + + if (f > 0.5F && this.world.h(new BlockPosition(this)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) { + this.setGoalTarget((EntityLiving) null); +- this.dm(); ++ if (tryEscape(EndermanEscapeEvent.Reason.RUNAWAY)) this.dm(); // Paper + } + } + +@@ -264,7 +271,7 @@ public class EntityEnderman extends EntityMonster { + public boolean damageEntity(DamageSource damagesource, float f) { + if (this.isInvulnerable(damagesource)) { + return false; +- } else if (damagesource instanceof EntityDamageSourceIndirect) { ++ } else if (damagesource instanceof EntityDamageSourceIndirect && tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper + for (int i = 0; i < 64; ++i) { + if (this.dm()) { + return true; +@@ -275,7 +282,7 @@ public class EntityEnderman extends EntityMonster { + } else { + boolean flag = super.damageEntity(damagesource, f); + +- if (damagesource.ignoresArmor() && this.random.nextInt(10) != 0) { ++ if (damagesource.ignoresArmor() && this.random.nextInt(10) != 0 && tryEscape(EndermanEscapeEvent.Reason.CRITICAL_HIT)) { // Paper + this.dm(); + } + +@@ -382,7 +389,7 @@ public class EntityEnderman extends EntityMonster { + + static class PathfinderGoalPlayerWhoLookedAtTarget extends PathfinderGoalNearestAttackableTarget { + +- private final EntityEnderman i; ++ private final EntityEnderman i; public EntityEnderman getEnderman() { return i; } // Paper - OBFHELPER + private EntityHuman j; + private int k; + private int l; +@@ -440,7 +447,7 @@ public class EntityEnderman extends EntityMonster { + } else { + if (this.d != null) { + if (this.i.f((EntityHuman) this.d)) { +- if (((EntityHuman) this.d).h(this.i) < 16.0D) { ++ if (((EntityHuman) this.d).h(this.i) < 16.0D && this.getEnderman().tryEscape(EndermanEscapeEvent.Reason.STARE)) { // Paper + this.i.dm(); + } + +-- +2.17.0 +