83 lines
4.4 KiB
Diff
83 lines
4.4 KiB
Diff
|
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
|
||
|
|
index 1c2998c89fd660d6b26b7ff48cddd1862b9b1828..1b9c77666204765a3ed5648b0f8eaa820f578e58 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.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 EnderMan extends Monster implements NeutralMob {
|
||
|
|
setGoalTarget(target, 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(LivingEntity entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason reason, boolean fireEvent) {
|
||
|
|
if (!super.setGoalTarget(entityliving, reason, fireEvent)) {
|
||
|
|
@@ -262,7 +269,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(EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper
|
||
|
|
this.setTarget((LivingEntity) null);
|
||
|
|
this.teleport();
|
||
|
|
}
|
||
|
|
@@ -360,17 +367,19 @@ public class EnderMan extends Monster implements NeutralMob {
|
||
|
|
if (this.isInvulnerableTo(source)) {
|
||
|
|
return false;
|
||
|
|
} else if (source instanceof IndirectEntityDamageSource) {
|
||
|
|
+ if (this.tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
|
||
|
|
for (int i = 0; i < 64; ++i) {
|
||
|
|
if (this.teleport()) {
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+ } // Paper end
|
||
|
|
|
||
|
|
return false;
|
||
|
|
} else {
|
||
|
|
boolean flag = 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 ? 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.teleport();
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -515,7 +524,7 @@ public class EnderMan extends Monster implements NeutralMob {
|
||
|
|
|
||
|
|
static class EndermanLookForPlayerGoal extends NearestAttackableTargetGoal<Player> {
|
||
|
|
|
||
|
|
- private final EnderMan enderman;
|
||
|
|
+ private final EnderMan enderman; public final EnderMan getEnderman() { return this.enderman; } // Paper - OBFHELPER
|
||
|
|
private Player pendingTarget;
|
||
|
|
private int aggroTime;
|
||
|
|
private int teleportTime;
|
||
|
|
@@ -578,7 +587,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.getEnderman().tryEscape(EndermanEscapeEvent.Reason.STARE)) { // Paper
|
||
|
|
this.enderman.teleport();
|
||
|
|
}
|
||
|
|
|