diff --git a/Spigot-API-Patches/Add-ArmorStand-Marker-NBT-API.patch b/Spigot-API-Patches/Add-ArmorStand-Marker-NBT-API.patch deleted file mode 100644 index 9eec64c527..0000000000 --- a/Spigot-API-Patches/Add-ArmorStand-Marker-NBT-API.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Anonymoose -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); - } --- \ No newline at end of file diff --git a/Spigot-Server-Patches/Add-ArmorStand-Marker-NBT-API.patch b/Spigot-Server-Patches/Add-ArmorStand-Marker-NBT-API.patch deleted file mode 100644 index ae208ea4f9..0000000000 --- a/Spigot-Server-Patches/Add-ArmorStand-Marker-NBT-API.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Anonymoose -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 - } --- \ No newline at end of file diff --git a/Spigot-Server-Patches/Configurable-TNT-cannon-fix.patch b/Spigot-Server-Patches/Configurable-TNT-cannon-fix.patch index a6c7108cdb..16d3693fb7 100644 --- a/Spigot-Server-Patches/Configurable-TNT-cannon-fix.patch +++ b/Spigot-Server-Patches/Configurable-TNT-cannon-fix.patch @@ -345,6 +345,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + log( "Fix TNT cannons: " + fixCannons ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch b/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch index ee027d88c9..dd408c695f 100644 --- a/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch +++ b/Spigot-Server-Patches/Configurable-end-credits-when-leaving-the-end.patch @@ -88,6 +88,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + disableEndCredits = getBoolean( "game-mechanics.disable-end-credits", false ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch b/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch index 7875bf925a..7964a3ebb8 100644 --- a/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch +++ b/Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch @@ -41,6 +41,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Fix-jar-being-shaded-multiple-times.patch b/Spigot-Server-Patches/Fix-jar-being-shaded-multiple-times.patch index 9b77fda0b8..b9e147197a 100644 --- a/Spigot-Server-Patches/Fix-jar-being-shaded-multiple-times.patch +++ b/Spigot-Server-Patches/Fix-jar-being-shaded-multiple-times.patch @@ -16,6 +16,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 org.bukkit.craftbukkit.Main --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/Fix-lag-from-explosions-processing-dead-entities.patch index 3f2e2f1737..538f200dd2 100644 --- a/Spigot-Server-Patches/Fix-lag-from-explosions-processing-dead-entities.patch +++ b/Spigot-Server-Patches/Fix-lag-from-explosions-processing-dead-entities.patch @@ -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 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch b/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch index 4af83a3f1d..b6a0848217 100644 --- a/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch +++ b/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch @@ -168,6 +168,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 SpigotTimings.checkIfActiveTimer.stopTiming(); return true; } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Generator-Settings.patch b/Spigot-Server-Patches/Generator-Settings.patch index 866d13dfe3..838913f108 100644 --- a/Spigot-Server-Patches/Generator-Settings.patch +++ b/Spigot-Server-Patches/Generator-Settings.patch @@ -275,6 +275,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + generateFlatBedrock = getBoolean( "generator-settings.flat-bedrock", false ); + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Stackable-Buckets.patch b/Spigot-Server-Patches/Stackable-Buckets.patch index fdde7ea119..f92f01cd06 100644 --- a/Spigot-Server-Patches/Stackable-Buckets.patch +++ b/Spigot-Server-Patches/Stackable-Buckets.patch @@ -169,6 +169,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + } } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch b/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch index 65415251fe..7acce93ac1 100644 --- a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch +++ b/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch @@ -96,6 +96,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 return true; } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file