Paper/nms-patches/PathfinderGoalTempt.patch

44 lines
1.7 KiB
Diff
Raw Normal View History

--- a/net/minecraft/server/PathfinderGoalTempt.java
+++ b/net/minecraft/server/PathfinderGoalTempt.java
2016-11-17 02:41:03 +01:00
@@ -2,6 +2,12 @@
import com.google.common.collect.Sets;
import java.util.Set;
+// CraftBukkit start
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
+// CraftBukkit end
public class PathfinderGoalTempt extends PathfinderGoal {
2016-11-17 02:41:03 +01:00
@@ -12,7 +18,7 @@
private double e;
private double f;
private double g;
2017-05-14 04:00:00 +02:00
- private EntityHuman target;
+ private EntityLiving target; // CraftBukkit
private int i;
private boolean j;
private final Set<Item> k;
2017-05-14 04:00:00 +02:00
@@ -39,7 +45,17 @@
return false;
} else {
2017-05-14 04:00:00 +02:00
this.target = this.a.world.findNearbyPlayer(this.a, 10.0D);
- return this.target == null ? false : this.a(this.target.getItemInMainHand()) || this.a(this.target.getItemInOffHand());
+ // CraftBukkit start
2017-05-14 04:00:00 +02:00
+ boolean tempt = this.target == null ? false : this.a(this.target.getItemInMainHand()) || this.a(this.target.getItemInOffHand());
+ if (tempt) {
2017-05-14 04:00:00 +02:00
+ EntityTargetLivingEntityEvent event = CraftEventFactory.callEntityTargetLivingEvent(this.a, this.target, EntityTargetEvent.TargetReason.TEMPT);
+ if (event.isCancelled()) {
+ return false;
+ }
+ this.target = (event.getTarget() == null) ? null : ((CraftLivingEntity) event.getTarget()).getHandle();
+ }
+ return tempt;
+ // CraftBukkit end
}
}