mirror of https://github.com/PaperMC/Paper.git
59 lines
3.4 KiB
Diff
59 lines
3.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 7b6109348bbc44727ef7d0ef8fc08561f0dc328d..3e50f3dc5b9a45ee8f368f91fbd67b599d4435fb 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
|
|
@@ -119,6 +119,12 @@ public class EnderMan extends Monster implements NeutralMob {
|
|
this.setTarget(target, EntityTargetEvent.TargetReason.UNKNOWN, true);
|
|
}
|
|
|
|
+ // Paper start - EndermanEscapeEvent
|
|
+ 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 - EndermanEscapeEvent
|
|
+
|
|
@Override
|
|
public boolean setTarget(LivingEntity entityliving, EntityTargetEvent.TargetReason reason, boolean fireEvent) {
|
|
if (!super.setTarget(entityliving, reason, fireEvent)) {
|
|
@@ -268,7 +274,7 @@ public class EnderMan extends Monster implements NeutralMob {
|
|
if (this.level().isDay() && this.tickCount >= this.targetChangeTime + 600) {
|
|
float f = this.getLightLevelDependentMagicValue();
|
|
|
|
- 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 - EndermanEscapeEvent
|
|
this.setTarget((LivingEntity) null);
|
|
this.teleport();
|
|
}
|
|
@@ -394,11 +400,13 @@ public class EnderMan extends Monster implements NeutralMob {
|
|
} else {
|
|
flag1 = flag && this.hurtWithCleanWater(source, (ThrownPotion) source.getDirectEntity(), amount);
|
|
|
|
+ if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper - EndermanEscapeEvent
|
|
for (int i = 0; i < 64; ++i) {
|
|
if (this.teleport()) {
|
|
return true;
|
|
}
|
|
}
|
|
+ } // Paper - EndermanEscapeEvent
|
|
|
|
return flag1;
|
|
}
|
|
@@ -623,7 +631,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 - EndermanEscapeEvent
|
|
this.enderman.teleport();
|
|
}
|
|
|