Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 03:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Added EntityTargetEvent for Experience Orbs, happens when it starts moving towards a human entity! Addresses BUKKIT-820

Browse Source
This commit is contained in:
ZNickq 2012-02-25 14:58:21 +02:00 committed by EvilSeph
parent cd90cec48c
commit bf01e93ab6
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/net/minecraft/server/EntityExperienceOrb.java
View File

@ -56,17 +56,23 @@ public class EntityExperienceOrb extends Entity {
EntityHuman entityhuman = this.world.findNearbyPlayer(this, d0);
if (entityhuman != null) {
double d1 = (entityhuman.locX - this.locX) / d0;
double d2 = (entityhuman.locY + (double) entityhuman.y() - this.locY) / d0;
double d3 = (entityhuman.locZ - this.locZ) / d0;
double d4 = Math.sqrt(d1 * d1 + d2 * d2 + d3 * d3);
double d5 = 1.0D - d4;
// CraftBukkit start
org.bukkit.event.entity.EntityTargetEvent event = CraftEventFactory.callEntityTargetEvent(this, entityhuman, org.bukkit.event.entity.EntityTargetEvent.TargetReason.CLOSEST_PLAYER);
Entity target = event.getTarget() == null ? null : ((org.bukkit.craftbukkit.entity.CraftEntity) event.getTarget()).getHandle();
if (d5 > 0.0D) {
d5 *= d5;
this.motX += d1 / d4 * d5 * 0.1D;
this.motY += d2 / d4 * d5 * 0.1D;
this.motZ += d3 / d4 * d5 * 0.1D;
if (!event.isCancelled() && target != null) {
double d1 = (target.locX - this.locX) / d0;
double d2 = (target.locY + (double) target.y() - this.locY) / d0;
double d3 = (target.locZ - this.locZ) / d0;
double d4 = Math.sqrt(d1 * d1 + d2 * d2 + d3 * d3);
double d5 = 1.0D - d4;
if (d5 > 0.0D) {
d5 *= d5;
this.motX += d1 / d4 * d5 * 0.1D;
this.motY += d2 / d4 * d5 * 0.1D;
this.motZ += d3 / d4 * d5 * 0.1D;
}
// CraftBukkit end
}
}

6
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -407,4 +407,10 @@ public class CraftEventFactory {
creeper.getBukkitEntity().getServer().getPluginManager().callEvent(event);
return event;
}
public static EntityTargetEvent callEntityTargetEvent(Entity entity, Entity target, EntityTargetEvent.TargetReason reason) {
EntityTargetEvent event = new EntityTargetEvent(entity.getBukkitEntity(), target.getBukkitEntity(), reason);
entity.getBukkitEntity().getServer().getPluginManager().callEvent(event);
return event;
}
}