Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream B/CB/Spigot and rebuild

Browse Source
This commit is contained in:
Zach Brown 2016-03-27 20:48:50 -05:00
parent 4634458d72
commit 587aaefcc4
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit 67b9a6f66b74a8df1977067ef2bbf45274da1bdf
Subproject commit 21df80186f60e6f13ac9191c9f604a76b1b0b9d5

2
CraftBukkit

@ -1 +1 @@
Subproject commit 1ea1adc10f3f068f3d67f472469443fd732d8d2c
Subproject commit 15222c84b49f572175787202ac82cb8efe640477

2
Spigot

@ -1 +1 @@
Subproject commit 53e65c99d236cba48e641458aca98993fd11d7bd
Subproject commit 2038f4a1ee03c4152ac216589a008bcdd099cd67

7
Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch
View File

@ -9,15 +9,14 @@ 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.
* @return collision status
*/
boolean hasAI();
boolean isCollidable();
+
+ // Paper start
+
+ /**
+ * Get the number of arrows stuck in this entity
+ * * @return Number of arrows stuck
+ * @return Number of arrows stuck
+ */
+ int getArrowsStuck();
+

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 boolean hasAI() {
return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).cR() : false; // PAIL: rename
public boolean isCollidable() {
return getHandle().collides;
}
+
+ // Paper start