Paper/nms-patches/EntityProjectile.patch

34 Zeilen
1.3 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityProjectile.java
+++ b/net/minecraft/server/EntityProjectile.java
2015-02-26 23:41:06 +01:00
@@ -11,8 +11,8 @@
private Block inBlockId;
protected boolean inGround;
public int shake;
- private EntityLiving shooter;
- private String shooterName;
+ public EntityLiving shooter; // CraftBukkit - public
+ public String shooterName; // CraftBukkit - public
private int i;
private int ar;
@@ -26,6 +26,7 @@
public EntityProjectile(World world, EntityLiving entityliving) {
super(world);
this.shooter = entityliving;
+ this.projectileSource = (org.bukkit.entity.LivingEntity) entityliving.getBukkitEntity(); // CraftBukkit
2015-02-26 23:41:06 +01:00
this.setSize(0.25F, 0.25F);
this.setPositionRotation(entityliving.locX, entityliving.locY + (double) entityliving.getHeadHeight(), entityliving.locZ, entityliving.yaw, entityliving.pitch);
this.locX -= (double) (MathHelper.cos(this.yaw / 180.0F * 3.1415927F) * 0.16F);
2015-02-26 23:41:06 +01:00
@@ -151,6 +152,11 @@
this.d(movingobjectposition.a());
} else {
this.a(movingobjectposition);
+ // CraftBukkit start
+ if (this.dead) {
+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this);
+ }
+ // CraftBukkit end
}
}