Paper/patches/server/0192-EndermanEscapeEvent.patch

66 lines
3.8 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 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/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
2021-11-23 16:04:41 +01:00
index 186054f529cb743e1407fca027792ddb06645d79..18dbf2ad08b835c6e2be9062c0833b440e872e46 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
2021-11-23 16:04:41 +01:00
@@ -114,6 +114,12 @@ public class EnderMan extends Monster implements NeutralMob {
this.setTarget(target, org.bukkit.event.entity.EntityTargetEvent.TargetReason.UNKNOWN, true);
2021-06-11 14:02:28 +02:00
}
+ // Paper start
2021-06-12 21:30:37 +02:00
+ 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();
2021-06-11 14:02:28 +02:00
+ }
+ // Paper end
+
@Override
2021-11-23 16:04:41 +01:00
public boolean setTarget(LivingEntity entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason reason, boolean fireEvent) {
if (!super.setTarget(entityliving, reason, fireEvent)) {
@@ -268,7 +274,7 @@ public class EnderMan extends Monster implements NeutralMob {
2021-06-11 14:02:28 +02:00
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) {
2021-06-12 21:30:37 +02:00
+ 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
2021-06-11 14:02:28 +02:00
this.setTarget((LivingEntity) null);
this.teleport();
}
2021-11-23 16:04:41 +01:00
@@ -375,17 +381,19 @@ public class EnderMan extends Monster implements NeutralMob {
flag = false;
}
2021-06-12 21:30:37 +02:00
+ if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
2021-06-11 14:02:28 +02:00
for (int i = 0; i < 64; ++i) {
if (this.teleport()) {
return true;
}
}
+ } // Paper end
2021-11-23 16:04:41 +01:00
return flag;
2021-06-11 14:02:28 +02:00
} else {
2021-11-23 16:04:41 +01:00
boolean flag1 = super.hurt(source, amount);
2021-06-11 14:02:28 +02:00
- if (!this.level.isClientSide() && !(source.getEntity() instanceof LivingEntity) && this.random.nextInt(10) != 0) {
2021-06-12 21:30:37 +02:00
+ 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
2021-06-11 14:02:28 +02:00
this.teleport();
}
2021-11-23 16:04:41 +01:00
@@ -605,7 +613,7 @@ public class EnderMan extends Monster implements NeutralMob {
2021-06-11 14:02:28 +02:00
} else {
if (this.target != null && !this.enderman.isPassenger()) {
if (this.enderman.isLookingAtMe((Player) this.target)) {
- if (this.target.distanceToSqr((Entity) this.enderman) < 16.0D) {
2021-06-17 21:37:37 +02:00
+ if (this.target.distanceToSqr((Entity) this.enderman) < 16.0D && this.enderman.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.STARE)) { // Paper
2021-06-11 14:02:28 +02:00
this.enderman.teleport();
}