diff options
Diffstat (limited to 'nms-patches/EntityFireball.patch')
| -rw-r--r-- | nms-patches/EntityFireball.patch | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/nms-patches/EntityFireball.patch b/nms-patches/EntityFireball.patch index baa9bf9c..574080a2 100644 --- a/nms-patches/EntityFireball.patch +++ b/nms-patches/EntityFireball.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/EntityFireball.java 2014-12-13 12:33:58.972937612 +0000 -+++ src/main/java/net/minecraft/server/EntityFireball.java 2014-12-13 12:33:51.392937694 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/EntityFireball.java 2015-02-26 22:40:22.535608140 +0000 ++++ src/main/java/net/minecraft/server/EntityFireball.java 2015-02-26 22:40:22.535608140 +0000 @@ -2,6 +2,8 @@ import java.util.List; @@ -23,7 +23,7 @@ super(world); this.shooter = entityliving; + this.projectileSource = (org.bukkit.entity.LivingEntity) entityliving.getBukkitEntity(); // CraftBukkit - this.a(1.0F, 1.0F); + this.setSize(1.0F, 1.0F); this.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch); this.setPosition(this.locX, this.locY, this.locZ); this.motX = this.motY = this.motZ = 0.0D; @@ -36,15 +36,6 @@ d0 += this.random.nextGaussian() * 0.4D; d1 += this.random.nextGaussian() * 0.4D; d2 += this.random.nextGaussian() * 0.4D; -@@ -101,7 +112,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; @@ -117,6 +128,12 @@ if (movingobjectposition != null) { @@ -79,7 +70,7 @@ + this.dirX = nbttaglist.d(0); + this.dirY = nbttaglist.d(1); + this.dirZ = nbttaglist.d(2); -+ } else if (nbttagcompound.hasKeyOfType("direction", 9)) { ++ } else if (nbttagcompound.hasKeyOfType("direction", 9)) { NBTTagList nbttaglist = nbttagcompound.getList("direction", 6); this.motX = nbttaglist.d(0); |