Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-31 20:51:47 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream and rebuild

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit 67851e79b65efb980c2bd44a3560cff39540d370
Subproject commit 67b9a6f66b74a8df1977067ef2bbf45274da1bdf

2
CraftBukkit

@ -1 +1 @@
Subproject commit 6bf25cde7ecbaeb89bdfe18e7971669cec668646
Subproject commit 1ea1adc10f3f068f3d67f472469443fd732d8d2c

2
Spigot

@ -1 +1 @@
Subproject commit 129f87a2c0ca73bea240b952d62e98ec59a1dc66
Subproject commit 53e65c99d236cba48e641458aca98993fd11d7bd

10
Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
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
+
}
--

4
Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
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