From a138c77da110feb66a206c9fc883e7d80d70935d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:35:35 -0500 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent --- .../java/net/minecraft/server/PathfinderGoalHorseTrap.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java index 37626f925f..f8fd2d99cc 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java @@ -2,7 +2,8 @@ package net.minecraft.server; public class PathfinderGoalHorseTrap extends PathfinderGoal { - private final EntityHorseSkeleton a; + private final EntityHorseSkeleton a; public EntityHorseSkeleton getHorse() { return a; } // Purpur - OBFHELPER + private EntityHuman player; // Purpur public PathfinderGoalHorseTrap(EntityHorseSkeleton entityhorseskeleton) { this.a = entityhorseskeleton; @@ -10,12 +11,12 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal { @Override public boolean a() { - return this.a.world.isPlayerNearby(this.a.locX(), this.a.locY(), this.a.locZ(), 10.0D); + return (player = getHorse().world.findNearbyPlayer(getHorse(), 10.0D)) != null; // Purpur } @Override public void e() { - if (!new com.destroystokyo.paper.event.entity.SkeletonHorseTrapEvent((org.bukkit.entity.SkeletonHorse) this.a.getBukkitEntity()).callEvent()) return; // Paper + if (!new com.destroystokyo.paper.event.entity.SkeletonHorseTrapEvent((org.bukkit.entity.SkeletonHorse) this.a.getBukkitEntity(), (org.bukkit.entity.Player) player.getBukkitEntity()).callEvent()) return; // Paper // Purpur DifficultyDamageScaler difficultydamagescaler = this.a.world.getDamageScaler(new BlockPosition(this.a)); this.a.r(false); -- 2.24.0.rc1