SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SPIGOT-946] Begin making use of access transforms to simplify patching.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2015-06-06 19:33:48 +10:00
parent ae714e4861
commit 58abe21c5a
47 changed files with 76 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
paper-server/nms-patches/EntityArmorStand.patch
View File

@@ -16,28 +16,7 @@
public class EntityArmorStand extends EntityLiving {
private static final Vector3f a = new Vector3f(0.0F, 0.0F, 0.0F);
@@ -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 @@
@@ -332,6 +341,22 @@
ItemStack itemstack1 = entityhuman.inventory.getItem(j);
ItemStack itemstack2;
@@ -60,7 +39,7 @@
if (entityhuman.abilities.canInstantlyBuild && (itemstack == null || itemstack.getItem() == Item.getItemOf(Blocks.AIR)) && itemstack1 != null) {
itemstack2 = itemstack1.cloneItemStack();
itemstack2.count = 1;
@@ -352,6 +379,11 @@
@@ -352,6 +377,11 @@
}
public boolean damageEntity(DamageSource damagesource, float f) {
@@ -72,46 +51,3 @@
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) {
@@ -568,7 +600,7 @@
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) {
@@ -578,13 +610,14 @@
}
this.datawatcher.watch(10, Byte.valueOf(b0));
+ this.noclip = flag; // CraftBukkit.
}
public boolean hasGravity() {
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 +633,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) {