mirror of
https://github.com/PaperMC/Paper.git
synced 2025-03-22 06:55:36 +01:00
Rebuild patches for upstream API addition
Removes ArmorStand Marker API as that was added to Bukkit
This commit is contained in:
parent
49a8cf4716
commit
b2aaf31f9e
11 changed files with 9 additions and 109 deletions
|
@ -1,32 +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/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
|
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
||||||
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
|
|
||||||
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
|
|
||||||
@@ -0,0 +0,0 @@ public interface ArmorStand extends LivingEntity {
|
|
||||||
* @param small whether this is scaled down
|
|
||||||
*/
|
|
||||||
void setSmall(boolean small);
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Returns whether this armor stand has a small
|
|
||||||
+ * bounding box. This gets the NBT Marker tag
|
|
||||||
+ *
|
|
||||||
+ * @return whether the bounding box is small or not
|
|
||||||
+ */
|
|
||||||
+ boolean isSmallBoundingBox();
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Sets whether this armor stand should have a small
|
|
||||||
+ * bounding box. This sets the NBT Marker tag
|
|
||||||
+ *
|
|
||||||
+ * @param small whether the bounding box is small or not
|
|
||||||
+ */
|
|
||||||
+ void setSmallBoundingBox(boolean small);
|
|
||||||
}
|
|
||||||
--
|
|
|
@ -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 );
|
+ 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 );
|
+ 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 );
|
+ fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false );
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
1.9.5.msysgit.1
|
|
||||||
|
|
|
@ -16,6 +16,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
|
<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);
|
Vec3D vec3d = new Vec3D(this.posX, this.posY, this.posZ);
|
||||||
|
|
||||||
for (int l1 = 0; l1 < list.size(); ++l1) {
|
for (int l1 = 0; l1 < list.size(); ++l1) {
|
||||||
--
|
--
|
||||||
1.9.5.msysgit.1
|
|
||||||
|
|
|
@ -168,6 +168,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
SpigotTimings.checkIfActiveTimer.stopTiming();
|
SpigotTimings.checkIfActiveTimer.stopTiming();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
1.9.5.msysgit.1
|
|
||||||
|
|
|
@ -275,6 +275,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ generateFlatBedrock = getBoolean( "generator-settings.flat-bedrock", false );
|
+ 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;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
1.9.5.msysgit.1
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue