Rebuild patches for upstream API addition

Removes ArmorStand Marker API as that was added to Bukkit
This commit is contained in:
Zach Brown 2015-06-10 22:35:26 -05:00
parent b59cf404af
commit 6b6eb8f7f7
15 changed files with 47 additions and 133 deletions

View file

@ -1,14 +1,14 @@
From 3194361c9d0363a1b1e1385fd5ccf0d66aeec37c Mon Sep 17 00:00:00 2001
From 6d1840fc74641a4aec920b5be691d14efaa8df6d Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 8 Aug 2014 22:51:26 -0500
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b86b85d..323051f 100644
index 83cc008..5c5e818 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1120,6 +1120,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1131,6 +1131,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -38,5 +38,5 @@ index b86b85d..323051f 100644
Spigot spigot();
--
2.4.1.windows.1
2.4.2.windows.1

View file

@ -1,34 +0,0 @@
From 6271c78a73f37bbbbacb527db1f4b772ebddae01 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 b323e73..5b6623c 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -258,4 +258,20 @@ 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.9.1