Rebuild patches for upstream API addition
Removes ArmorStand Marker API as that was added to Bukkit
This commit is contained in:
@@ -1,50 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Anonymoose <MrAnonHimself@anon.life>
|
||||
Date: Sun, 3 May 2015 17:44:20 -0500
|
||||
Subject: [PATCH] Add ArmorStand Marker NBT API
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
@@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
|
||||
return (this.datawatcher.getByte(10) & 8) != 0;
|
||||
}
|
||||
|
||||
- private void n(boolean flag) {
|
||||
+ public void n(boolean flag) { // PaperSpigot - private -> public, setSmallBoundingBox (Marker) NBT
|
||||
byte b0 = this.datawatcher.getByte(10);
|
||||
|
||||
if (flag) {
|
||||
@@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
|
||||
this.datawatcher.watch(10, Byte.valueOf(b0));
|
||||
}
|
||||
|
||||
- public boolean s() {
|
||||
+ public boolean s() { // PaperSpigot - isSmallBoundingBox
|
||||
return (this.datawatcher.getByte(10) & 16) != 0;
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||||
@@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
|
||||
(float) Math.toDegrees(old.getZ())
|
||||
);
|
||||
}
|
||||
+
|
||||
+ // PaperSpigot start - Implement bounding box (Marker) API
|
||||
+ @Override
|
||||
+ public boolean isSmallBoundingBox() {
|
||||
+ return getHandle().s();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setSmallBoundingBox(boolean small) {
|
||||
+ getHandle().n(small);
|
||||
+ }
|
||||
+ // PaperSpigot end
|
||||
}
|
||||
--
|
||||
@@ -345,6 +345,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ log( "Fix TNT cannons: " + fixCannons );
|
||||
+ }
|
||||
}
|
||||
--
|
||||
1.9.5.msysgit.1
|
||||
|
||||
--
|
||||
@@ -88,6 +88,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ disableEndCredits = getBoolean( "game-mechanics.disable-end-credits", false );
|
||||
+ }
|
||||
}
|
||||
--
|
||||
1.9.5.msysgit.1
|
||||
|
||||
--
|
||||
@@ -41,6 +41,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false );
|
||||
+ }
|
||||
}
|
||||
--
|
||||
1.9.5.msysgit.1
|
||||
|
||||
--
|
||||
@@ -16,6 +16,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
<archive>
|
||||
<manifestEntries>
|
||||
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
|
||||
--
|
||||
1.9.5.msysgit.1
|
||||
|
||||
--
|
||||
@@ -24,6 +24,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
Vec3D vec3d = new Vec3D(this.posX, this.posY, this.posZ);
|
||||
|
||||
for (int l1 = 0; l1 < list.size(); ++l1) {
|
||||
--
|
||||
1.9.5.msysgit.1
|
||||
|
||||
--
|
||||
@@ -168,6 +168,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
SpigotTimings.checkIfActiveTimer.stopTiming();
|
||||
return true;
|
||||
}
|
||||
--
|
||||
1.9.5.msysgit.1
|
||||
|
||||
--
|
||||
@@ -275,6 +275,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ generateFlatBedrock = getBoolean( "generator-settings.flat-bedrock", false );
|
||||
+ }
|
||||
}
|
||||
--
|
||||
1.9.5.msysgit.1
|
||||
|
||||
--
|
||||
@@ -169,6 +169,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
--
|
||||
1.9.5.msysgit.1
|
||||
|
||||
--
|
||||
@@ -96,6 +96,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
return true;
|
||||
}
|
||||
|
||||
--
|
||||
1.9.5.msysgit.1
|
||||
|
||||
--
|
||||
Reference in New Issue
Block a user