diff options
Diffstat (limited to 'Spigot-Server-Patches-Unmapped/0210-EndermanEscapeEvent.patch')
-rw-r--r-- | Spigot-Server-Patches-Unmapped/0210-EndermanEscapeEvent.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/Spigot-Server-Patches-Unmapped/0210-EndermanEscapeEvent.patch b/Spigot-Server-Patches-Unmapped/0210-EndermanEscapeEvent.patch new file mode 100644 index 0000000000..428f29678a --- /dev/null +++ b/Spigot-Server-Patches-Unmapped/0210-EndermanEscapeEvent.patch @@ -0,0 +1,82 @@ +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/EntityEnderman.java b/src/main/java/net/minecraft/world/entity/monster/EntityEnderman.java +index 2de3210bd8988b156b756723d0f781fd92bc151a..b889c1954df39b6180351c418393f5c772702589 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/EntityEnderman.java ++++ b/src/main/java/net/minecraft/world/entity/monster/EntityEnderman.java +@@ -2,6 +2,7 @@ package net.minecraft.world.entity.monster; + + import java.util.EnumSet; + import java.util.Optional; ++import com.destroystokyo.paper.event.entity.EndermanEscapeEvent; // Paper + import java.util.Random; + import java.util.UUID; + import java.util.function.Predicate; +@@ -109,6 +110,12 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { + setGoalTarget(entityliving, org.bukkit.event.entity.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)) { +@@ -262,7 +269,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { + if (this.world.isDay() && this.ticksLived >= this.bs + 600) { + float f = this.aR(); + +- if (f > 0.5F && this.world.e(this.getChunkCoordinates()) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) { ++ if (f > 0.5F && this.world.e(this.getChunkCoordinates()) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.tryEscape(EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper + this.setGoalTarget((EntityLiving) null); + this.eL(); + } +@@ -360,17 +367,19 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { + if (this.isInvulnerable(damagesource)) { + return false; + } else if (damagesource instanceof EntityDamageSourceIndirect) { ++ if (this.tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start + for (int i = 0; i < 64; ++i) { + if (this.eL()) { + return true; + } + } ++ } // Paper end + + return false; + } else { + boolean flag = super.damageEntity(damagesource, f); + +- if (!this.world.s_() && !(damagesource.getEntity() instanceof EntityLiving) && this.random.nextInt(10) != 0) { ++ if (!this.world.s_() && !(damagesource.getEntity() instanceof EntityLiving) && this.random.nextInt(10) != 0 && this.tryEscape(damagesource == DamageSource.DROWN ? EndermanEscapeEvent.Reason.DROWN : 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.eL(); + } + +@@ -515,7 +524,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { + + static class PathfinderGoalPlayerWhoLookedAtTarget extends PathfinderGoalNearestAttackableTarget<EntityHuman> { + +- private final EntityEnderman i; ++ private final EntityEnderman i; public final EntityEnderman getEnderman() { return this.i; } // Paper - OBFHELPER + private EntityHuman j; + private int k; + private int l; +@@ -578,7 +587,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { + } else { + if (this.c != null && !this.i.isPassenger()) { + if (this.i.g((EntityHuman) this.c)) { +- if (this.c.h((Entity) this.i) < 16.0D) { ++ if (this.c.h((Entity) this.i) < 16.0D && this.getEnderman().tryEscape(EndermanEscapeEvent.Reason.STARE)) { // Paper + this.i.eL(); + } + |