OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-24 01:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-5264: Call event for experience orbs losing their target

Browse source
This commit is contained in:
md_5 2019-08-24 19:06:17 +10:00
parent 4914117237
commit 7055c93117
2 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
nms-patches/EntityExperienceOrb.patch
View file

@ -20,33 +20,31 @@
if (this.d > 0) {
--this.d;
}
@@ -73,6 +79,16 @@
@@ -72,7 +78,22 @@
this.targetPlayer = null;
}
if (this.targetPlayer != null) {
+ // CraftBukkit start
+ boolean cancelled = false;
+ if (this.targetPlayer != prevTarget) {
+ EntityTargetLivingEntityEvent event = CraftEventFactory.callEntityTargetLivingEvent(this, targetPlayer, EntityTargetEvent.TargetReason.CLOSEST_PLAYER);
+ EntityLiving target = event.getTarget() == null ? null : ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getTarget()).getHandle();
+ targetPlayer = target instanceof EntityHuman ? (EntityHuman) target : null;
+ cancelled = event.isCancelled();
+ }
- if (this.targetPlayer != null) {
+ // CraftBukkit start
+ boolean cancelled = false;
+ if (this.targetPlayer != prevTarget) {
+ EntityTargetLivingEntityEvent event = CraftEventFactory.callEntityTargetLivingEvent(this, targetPlayer, (targetPlayer != null) ? EntityTargetEvent.TargetReason.CLOSEST_PLAYER : EntityTargetEvent.TargetReason.FORGOT_TARGET);
+ EntityLiving target = (event.getTarget() == null) ? null : ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getTarget()).getHandle();
+ cancelled = event.isCancelled();
+
+ if (!cancelled && targetPlayer != null) {
+ if (cancelled) {
+ targetPlayer = prevTarget;
+ } else {
+ targetPlayer = (target instanceof EntityHuman) ? (EntityHuman) target : null;
+ }
+ }
+
+ if (this.targetPlayer != null && !cancelled) {
+ // CraftBukkit end
Vec3D vec3d = new Vec3D(this.targetPlayer.locX - this.locX, this.targetPlayer.locY + (double) this.targetPlayer.getHeadHeight() / 2.0D - this.locY, this.targetPlayer.locZ - this.locZ);
double d1 = vec3d.g();
@@ -81,6 +97,8 @@
this.setMot(this.getMot().e(vec3d.d().a(d2 * d2 * 0.1D)));
}
+ }
+ // CraftBukkit end
}
this.move(EnumMoveType.SELF, this.getMot());
@@ -113,7 +131,7 @@
@@ -113,7 +134,7 @@
protected void az() {}
@Override
@ -55,7 +53,7 @@
this.damageEntity(DamageSource.FIRE, (float) i);
}
@@ -160,13 +178,19 @@
@@ -160,13 +181,19 @@
if (!itemstack.isEmpty() && itemstack.f()) {
int i = Math.min(this.c(this.value), itemstack.getDamage());
@ -78,7 +76,7 @@
}
this.die();
@@ -188,6 +212,24 @@
@@ -188,6 +215,24 @@
}
public static int getOrbValue(int i) {

4
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View file

@ -1016,13 +1016,13 @@ public class CraftEventFactory {
}
public static EntityTargetEvent callEntityTargetEvent(Entity entity, Entity target, EntityTargetEvent.TargetReason reason) {
EntityTargetEvent event = new EntityTargetEvent(entity.getBukkitEntity(), target == null ? null : target.getBukkitEntity(), reason);
EntityTargetEvent event = new EntityTargetEvent(entity.getBukkitEntity(), (target == null) ? null : target.getBukkitEntity(), reason);
entity.getBukkitEntity().getServer().getPluginManager().callEvent(event);
return event;
}
public static EntityTargetLivingEntityEvent callEntityTargetLivingEvent(Entity entity, EntityLiving target, EntityTargetEvent.TargetReason reason) {
EntityTargetLivingEntityEvent event = new EntityTargetLivingEntityEvent(entity.getBukkitEntity(), (LivingEntity) target.getBukkitEntity(), reason);
EntityTargetLivingEntityEvent event = new EntityTargetLivingEntityEvent(entity.getBukkitEntity(), (target == null) ? null : (LivingEntity) target.getBukkitEntity(), reason);
entity.getBukkitEntity().getServer().getPluginManager().callEvent(event);
return event;
}