aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0190-EndermanEscapeEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0190-EndermanEscapeEvent.patch')
-rw-r--r--patches/server/0190-EndermanEscapeEvent.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/patches/server/0190-EndermanEscapeEvent.patch b/patches/server/0190-EndermanEscapeEvent.patch
new file mode 100644
index 0000000000..e9d52a5b2d
--- /dev/null
+++ b/patches/server/0190-EndermanEscapeEvent.patch
@@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+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/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+index 78c31a7191a5811732339e5bf8a7f07ef299a324..1decbe53207e25ee34f9948c4dcc79fa6f1138bc 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+@@ -113,6 +113,12 @@ public class EnderMan extends Monster implements NeutralMob {
+ this.setTarget(target, org.bukkit.event.entity.EntityTargetEvent.TargetReason.UNKNOWN, true);
+ }
+
++ // Paper start
++ private boolean tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason reason) {
++ return new com.destroystokyo.paper.event.entity.EndermanEscapeEvent((org.bukkit.craftbukkit.entity.CraftEnderman) this.getBukkitEntity(), reason).callEvent();
++ }
++ // Paper end
++
+ @Override
+ public boolean setTarget(LivingEntity entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason reason, boolean fireEvent) {
+ if (!super.setTarget(entityliving, reason, fireEvent)) {
+@@ -267,7 +273,7 @@ public class EnderMan extends Monster implements NeutralMob {
+ if (this.level.isDay() && this.tickCount >= this.targetChangeTime + 600) {
+ float f = this.getBrightness();
+
+- if (f > 0.5F && this.level.canSeeSky(this.blockPosition()) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) {
++ if (f > 0.5F && this.level.canSeeSky(this.blockPosition()) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper
+ this.setTarget((LivingEntity) null);
+ this.teleport();
+ }
+@@ -374,17 +380,19 @@ public class EnderMan extends Monster implements NeutralMob {
+ flag = false;
+ }
+
++ if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
+ for (int i = 0; i < 64; ++i) {
+ if (this.teleport()) {
+ return true;
+ }
+ }
++ } // Paper end
+
+ return flag;
+ } else {
+ boolean flag1 = super.hurt(source, amount);
+
+- if (!this.level.isClientSide() && !(source.getEntity() instanceof LivingEntity) && this.random.nextInt(10) != 0) {
++ if (!this.level.isClientSide() && !(source.getEntity() instanceof LivingEntity) && this.random.nextInt(10) != 0 && this.tryEscape(source == DamageSource.DROWN ? com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.DROWN : com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper - use to be critical hits as else, but mojang removed critical hits in 1.16.2 due to MC-185684
+ this.teleport();
+ }
+
+@@ -604,7 +612,7 @@ public class EnderMan extends Monster implements NeutralMob {
+ } else {
+ if (this.target != null && !this.enderman.isPassenger()) {
+ if (this.enderman.isLookingAtMe((Player) this.target)) {
+- if (this.target.distanceToSqr((Entity) this.enderman) < 16.0D) {
++ if (this.target.distanceToSqr((Entity) this.enderman) < 16.0D && this.enderman.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.STARE)) { // Paper
+ this.enderman.teleport();
+ }
+