mirror of
https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git
synced 2025-02-16 21:35:59 +00:00
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
--- a/net/minecraft/world/entity/ai/goal/PathfinderGoalTempt.java
|
|
+++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalTempt.java
|
|
@@ -11,6 +11,13 @@
|
|
import net.minecraft.world.entity.player.EntityHuman;
|
|
import net.minecraft.world.item.ItemStack;
|
|
|
|
+// 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 {
|
|
|
|
private static final PathfinderTargetCondition TEMPT_TARGETING = PathfinderTargetCondition.forNonCombat().ignoreLineOfSight();
|
|
@@ -23,7 +30,7 @@
|
|
private double pRotX;
|
|
private double pRotY;
|
|
@Nullable
|
|
- protected EntityHuman player;
|
|
+ protected EntityLiving player; // CraftBukkit
|
|
private int calmDown;
|
|
private boolean isRunning;
|
|
private final Predicate<ItemStack> items;
|
|
@@ -47,6 +54,15 @@
|
|
return false;
|
|
} else {
|
|
this.player = getServerLevel((Entity) this.mob).getNearestPlayer(this.targetingConditions.range(this.mob.getAttributeValue(GenericAttributes.TEMPT_RANGE)), this.mob);
|
|
+ // CraftBukkit start
|
|
+ if (this.player != null) {
|
|
+ EntityTargetLivingEntityEvent event = CraftEventFactory.callEntityTargetLivingEvent(this.mob, this.player, EntityTargetEvent.TargetReason.TEMPT);
|
|
+ if (event.isCancelled()) {
|
|
+ return false;
|
|
+ }
|
|
+ this.player = (event.getTarget() == null) ? null : ((CraftLivingEntity) event.getTarget()).getHandle();
|
|
+ }
|
|
+ // CraftBukkit end
|
|
return this.player != null;
|
|
}
|
|
}
|