summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityArmorStand.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/EntityArmorStand.patch')
-rw-r--r--nms-patches/EntityArmorStand.patch76
1 files changed, 66 insertions, 10 deletions
diff --git a/nms-patches/EntityArmorStand.patch b/nms-patches/EntityArmorStand.patch
index 44c63adc..e912eb7f 100644
--- a/nms-patches/EntityArmorStand.patch
+++ b/nms-patches/EntityArmorStand.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde/net/minecraft/server/EntityArmorStand.java 2015-02-15 12:48:44.653310353 +1100
-+++ src/main/java/net/minecraft/server/EntityArmorStand.java 2015-02-15 12:48:44.653310353 +1100
+--- /home/matt/mc-dev-private//net/minecraft/server/EntityArmorStand.java 2015-02-26 22:40:22.475608141 +0000
++++ src/main/java/net/minecraft/server/EntityArmorStand.java 2015-02-26 22:40:22.475608141 +0000
@@ -2,6 +2,15 @@
import java.util.List;
@@ -16,7 +16,28 @@
public class EntityArmorStand extends EntityLiving {
private static final Vector3f a = new Vector3f(0.0F, 0.0F, 0.0F);
-@@ -323,6 +332,22 @@
+@@ -15,12 +24,14 @@
+ private long i;
+ private int bi;
+ private boolean bj;
+- private Vector3f headPose;
+- private Vector3f bodyPose;
+- private Vector3f leftArmPose;
+- private Vector3f rightArmPose;
+- private Vector3f leftLegPose;
+- private Vector3f rightLegPose;
++ // CraftBukkit start - public all the things!
++ public Vector3f headPose;
++ public Vector3f bodyPose;
++ public Vector3f leftArmPose;
++ public Vector3f rightArmPose;
++ public Vector3f leftLegPose;
++ public Vector3f rightLegPose;
++ // CraftBukkit end
+
+ public EntityArmorStand(World world) {
+ super(world);
+@@ -332,6 +343,22 @@
ItemStack itemstack1 = entityhuman.inventory.getItem(j);
ItemStack itemstack2;
@@ -39,7 +60,7 @@
if (entityhuman.abilities.canInstantlyBuild && (itemstack == null || itemstack.getItem() == Item.getItemOf(Blocks.AIR)) && itemstack1 != null) {
itemstack2 = itemstack1.cloneItemStack();
itemstack2.count = 1;
-@@ -343,6 +368,11 @@
+@@ -352,6 +379,11 @@
}
public boolean damageEntity(DamageSource damagesource, float f) {
@@ -48,15 +69,50 @@
+ return false;
+ }
+ // CraftBukkit end
- if (!this.world.isStatic && !this.h) {
- if (DamageSource.OUT_OF_WORLD.equals(damagesource)) {
- this.die();
-@@ -542,6 +572,8 @@
+ if (this.world.isClientSide) {
+ return false;
+ } else if (DamageSource.OUT_OF_WORLD.equals(damagesource)) {
+@@ -552,7 +584,7 @@
+ return this.isInvisible();
+ }
+
+- private void setSmall(boolean flag) {
++ public void setSmall(boolean flag) { // CraftBukkit - public
+ byte b0 = this.datawatcher.getByte(10);
+
+ if (flag) {
+@@ -562,13 +594,15 @@
}
this.datawatcher.watch(10, Byte.valueOf(b0));
+
-+ this.T = flag; // CraftBukkit. // PAIL: Rename (noclip)
++ this.noclip = flag; // CraftBukkit.
}
- public boolean hasGravity() {
+ public boolean isSmall() {
+ return (this.datawatcher.getByte(10) & 1) != 0;
+ }
+
+- private void setGravity(boolean flag) {
++ public void setGravity(boolean flag) { // CraftBukkit - public
+ byte b0 = this.datawatcher.getByte(10);
+
+ if (flag) {
+@@ -584,7 +618,7 @@
+ return (this.datawatcher.getByte(10) & 2) != 0;
+ }
+
+- private void setArms(boolean flag) {
++ public void setArms(boolean flag) { // CraftBukkit - public
+ byte b0 = this.datawatcher.getByte(10);
+
+ if (flag) {
+@@ -600,7 +634,7 @@
+ return (this.datawatcher.getByte(10) & 4) != 0;
+ }
+
+- private void setBasePlate(boolean flag) {
++ public void setBasePlate(boolean flag) { // CraftBukkit - public
+ byte b0 = this.datawatcher.getByte(10);
+
+ if (flag) {