Paper/Spigot-Server-Patches/0222-EndermanEscapeEvent.patch

86 lines
3.9 KiB
Diff
Raw Normal View History

From 6b1dab7ac9e67f2f82456b264ad7f1fcb8d4bff9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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 9d7c16dbfc..93f66181bf 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
2019-04-29 05:14:31 +02:00
@@ -2,6 +2,7 @@ package net.minecraft.server;
2019-04-29 05:14:31 +02:00
import java.util.EnumSet;
import java.util.Optional;
+import com.destroystokyo.paper.event.entity.EndermanEscapeEvent; // Paper
import java.util.Random;
import java.util.UUID;
2019-04-29 05:14:31 +02:00
import java.util.function.Predicate;
@@ -55,6 +56,12 @@ public class EntityEnderman extends EntityMonster {
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)) {
2019-04-29 05:14:31 +02:00
@@ -174,7 +181,7 @@ public class EntityEnderman extends EntityMonster {
if (this.world.J() && this.ticksLived >= this.bC + 600) {
float f = this.aE();
2019-04-29 05:14:31 +02:00
- if (f > 0.5F && this.world.f(new BlockPosition(this)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) {
+ if (f > 0.5F && this.world.f(new BlockPosition(this)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.tryEscape(EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper
this.setGoalTarget((EntityLiving) null);
2019-04-29 05:14:31 +02:00
this.dW();
}
2019-05-14 04:20:58 +02:00
@@ -266,17 +273,19 @@ public class EntityEnderman extends EntityMonster {
2019-04-29 05:14:31 +02:00
} else if (!(damagesource instanceof EntityDamageSourceIndirect) && damagesource != DamageSource.FIREWORKS) {
boolean flag = super.damageEntity(damagesource, f);
- if (damagesource.ignoresArmor() && this.random.nextInt(10) != 0) {
2019-04-29 05:14:31 +02:00
+ if (damagesource.ignoresArmor() && this.random.nextInt(10) != 0 && this.tryEscape(damagesource == DamageSource.DROWN ? EndermanEscapeEvent.Reason.DROWN : EndermanEscapeEvent.Reason.CRITICAL_HIT)) { // Paper
this.dW();
}
return flag;
} else {
+ if (this.tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
for (int i = 0; i < 64; ++i) {
if (this.dW()) {
return true;
}
}
2019-04-29 05:14:31 +02:00
+ } // Paper end
2019-04-29 05:14:31 +02:00
return false;
}
2019-05-14 04:20:58 +02:00
@@ -398,7 +407,7 @@ public class EntityEnderman extends EntityMonster {
static class PathfinderGoalPlayerWhoLookedAtTarget extends PathfinderGoalNearestAttackableTarget<EntityHuman> {
- private final EntityEnderman i;
2019-04-29 05:14:31 +02:00
+ private final EntityEnderman i; public final EntityEnderman getEnderman() { return this.i; } // Paper - OBFHELPER
private EntityHuman j;
private int k;
private int l;
2019-05-14 04:20:58 +02:00
@@ -456,7 +465,7 @@ public class EntityEnderman extends EntityMonster {
} else {
2019-04-29 05:14:31 +02:00
if (this.c != null && !this.i.isPassenger()) {
if (this.i.f((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)) {
this.i.dW();
}
--
2.21.0