diff options
Diffstat (limited to 'nms-patches/EntityProjectile.patch')
| -rw-r--r-- | nms-patches/EntityProjectile.patch | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/nms-patches/EntityProjectile.patch b/nms-patches/EntityProjectile.patch index 2a7c41f7..b81796ef 100644 --- a/nms-patches/EntityProjectile.patch +++ b/nms-patches/EntityProjectile.patch @@ -1,24 +1,26 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/EntityProjectile.java 2014-11-28 17:43:43.153707434 +0000 -+++ src/main/java/net/minecraft/server/EntityProjectile.java 2014-11-28 17:38:23.000000000 +0000 -@@ -25,6 +25,7 @@ +--- /home/matt/mc-dev-private//net/minecraft/server/EntityProjectile.java 2015-02-26 22:40:22.667608139 +0000 ++++ src/main/java/net/minecraft/server/EntityProjectile.java 2015-02-26 22:40:22.667608139 +0000 +@@ -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 - this.a(0.25F, 0.25F); + 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); -@@ -130,7 +131,7 @@ - MovingObjectPosition movingobjectposition1 = axisalignedbb.a(vec3d, vec3d1); - - if (movingobjectposition1 != null) { -- double d1 = vec3d.f(movingobjectposition1.pos); -+ double d1 = vec3d.distanceSquared(movingobjectposition1.pos); // CraftBukkit - distance efficiency - - if (d1 < d0 || d0 == 0.0D) { - entity = entity1; -@@ -150,6 +151,11 @@ - this.aq(); +@@ -151,6 +152,11 @@ + this.d(movingobjectposition.a()); } else { this.a(movingobjectposition); + // CraftBukkit start |