twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-05 06:32:17 -07:00
Code Issues Packages 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
Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

Submodule Bukkit updated: 67b9a6f66b...21df80186f

2
CraftBukkit

Submodule CraftBukkit updated: 1ea1adc10f...15222c84b4

2
Spigot

Submodule Spigot updated: 53e65c99d2...2038f4a1ee

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 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/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 @@ -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 + // Paper start
+
+ /** + /**
+ * Get the number of arrows stuck in this entity + * Get the number of arrows stuck in this entity
+ * * @return Number of arrows stuck + * @return Number of arrows stuck
+ */ + */
+ int getArrowsStuck(); + 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/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 { @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public boolean hasAI() { public boolean isCollidable() {
return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).cR() : false; // PAIL: rename return getHandle().collides;
} }
+ +
+ // Paper start + // Paper start