Files
CatServer/patches/net/minecraft/entity/projectile/EntityThrowable.java.patch
2018-09-08 17:51:33 +08:00

34 lines
1.3 KiB
Diff

--- ../src-base/minecraft/net/minecraft/entity/projectile/EntityThrowable.java
+++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityThrowable.java
@@ -31,8 +31,8 @@
private Block inTile;
protected boolean inGround;
public int throwableShake;
- private EntityLivingBase thrower;
- private String throwerName;
+ public EntityLivingBase thrower;
+ public String throwerName;
private int ticksInGround;
private int ticksInAir;
public Entity ignoreEntity;
@@ -57,6 +57,7 @@
{
this(worldIn, throwerIn.posX, throwerIn.posY + (double)throwerIn.getEyeHeight() - 0.10000000149011612D, throwerIn.posZ);
this.thrower = throwerIn;
+ this.projectileSource = (org.bukkit.entity.LivingEntity) throwerIn.getBukkitEntity(); // CraftBukkit
}
protected void entityInit()
@@ -248,6 +249,11 @@
{
if(!net.minecraftforge.common.ForgeHooks.onThrowableImpact(this, raytraceresult))
this.onImpact(raytraceresult);
+ // CraftBukkit start
+ if (this.isDead) {
+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this);
+ }
+ // CraftBukkit end
}
}