diff options
author | md_5 <git@md-5.net> | 2017-11-07 17:21:38 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2017-11-07 17:21:38 +1100 |
commit | 2fae23c2514026af765e1fcbb8002a60423305c6 (patch) | |
tree | f053d4cd9372e2af12c047351f02e1d36db14096 /nms-patches/EntityArmorStand.patch | |
parent | 53fccdf958fe3e10cb9bdb0f396a454e9ac6ead9 (diff) | |
download | craftbukkit-2fae23c2514026af765e1fcbb8002a60423305c6.tar craftbukkit-2fae23c2514026af765e1fcbb8002a60423305c6.tar.gz craftbukkit-2fae23c2514026af765e1fcbb8002a60423305c6.tar.lz craftbukkit-2fae23c2514026af765e1fcbb8002a60423305c6.tar.xz craftbukkit-2fae23c2514026af765e1fcbb8002a60423305c6.zip |
SPIGOT-3637: Adjust yaw yet again
Diffstat (limited to 'nms-patches/EntityArmorStand.patch')
-rw-r--r-- | nms-patches/EntityArmorStand.patch | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/nms-patches/EntityArmorStand.patch b/nms-patches/EntityArmorStand.patch index 60bfdee0..496a0925 100644 --- a/nms-patches/EntityArmorStand.patch +++ b/nms-patches/EntityArmorStand.patch @@ -16,7 +16,21 @@ public class EntityArmorStand extends EntityLiving { private static final Vector3f br = new Vector3f(0.0F, 0.0F, 0.0F); -@@ -364,6 +373,21 @@ +@@ -61,6 +70,13 @@ + this.setPosition(d0, d1, d2); + } + ++ // CraftBukkit start - SPIGOT-3607, SPIGOT-3637 ++ @Override ++ public float getBukkitYaw() { ++ return this.yaw; ++ } ++ // CraftBukkit end ++ + public final void setSize(float f, float f1) { + double d0 = this.locX; + double d1 = this.locY; +@@ -364,6 +380,21 @@ if (itemstack1.isEmpty() || (this.bB & 1 << enumitemslot.c() + 8) == 0) { if (!itemstack1.isEmpty() || (this.bB & 1 << enumitemslot.c() + 16) == 0) { ItemStack itemstack2; @@ -38,7 +52,7 @@ if (entityhuman.abilities.canInstantlyBuild && itemstack1.isEmpty() && !itemstack.isEmpty()) { itemstack2 = itemstack.cloneItemStack(); -@@ -385,14 +409,19 @@ +@@ -385,14 +416,19 @@ } public boolean damageEntity(DamageSource damagesource, float f) { @@ -60,7 +74,7 @@ return false; } else if (DamageSource.FIRE.equals(damagesource)) { if (this.isBurning()) { -@@ -421,7 +450,7 @@ +@@ -421,7 +457,7 @@ } else if (damagesource.u()) { this.H(); this.D(); @@ -69,7 +83,7 @@ return false; } else { long i = this.world.getTime(); -@@ -432,7 +461,7 @@ +@@ -432,7 +468,7 @@ } else { this.E(); this.D(); @@ -78,7 +92,7 @@ } return false; -@@ -460,7 +489,7 @@ +@@ -460,7 +496,7 @@ f1 -= f; if (f1 <= 0.5F) { this.F(); @@ -87,7 +101,7 @@ } else { this.setHealth(f1); } -@@ -468,7 +497,7 @@ +@@ -468,7 +504,7 @@ } private void E() { @@ -96,7 +110,7 @@ this.F(); } -@@ -481,7 +510,7 @@ +@@ -481,7 +517,7 @@ for (i = 0; i < this.by.size(); ++i) { itemstack = (ItemStack) this.by.get(i); if (!itemstack.isEmpty()) { @@ -105,7 +119,7 @@ this.by.set(i, ItemStack.a); } } -@@ -489,7 +518,7 @@ +@@ -489,7 +525,7 @@ for (i = 0; i < this.bz.size(); ++i) { itemstack = (ItemStack) this.bz.get(i); if (!itemstack.isEmpty()) { @@ -114,7 +128,7 @@ this.bz.set(i, ItemStack.a); } } -@@ -601,6 +630,7 @@ +@@ -601,6 +637,7 @@ } public void killEntity() { @@ -122,15 +136,3 @@ this.die(); } -@@ -733,4 +763,11 @@ - public boolean cS() { - return false; - } -+ -+ // CraftBukkit start - SPIGOT-3607 -+ @Override -+ public float getHeadRotation() { -+ return this.yaw; -+ } -+ // CraftBukkit end - } |