Update upstream and rebuild

This commit is contained in:
Zach Brown
2016-03-27 01:38:58 -05:00
parent 8c448684ad
commit 1109dc8d70
5 changed files with 10 additions and 10 deletions

2
Bukkit

Submodule Bukkit updated: 67851e79b6...67b9a6f66b

2
Spigot

Submodule Spigot updated: 129f87a2c0...53e65c99d2

View File

@@ -9,14 +9,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
* @return true if the entity has AI, otherwise false.
*/
public void setGliding(boolean gliding);
boolean hasAI();
+
+ // Paper start
+
+ /**
+ * Get the number of arrows stuck in this entity
+ *
+ * @return Number of arrows stuck
+ * * @return Number of arrows stuck
+ */
+ int getArrowsStuck();
+
@@ -27,6 +28,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ */
+ void setArrowsStuck(int arrows);
+ // Paper end
+
}
--

View File

@@ -26,8 +26,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public AttributeInstance getAttribute(Attribute attribute) {
return getHandle().craftAttributes.getAttribute(attribute);
public boolean hasAI() {
return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).cR() : false; // PAIL: rename
}
+
+ // Paper start