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

2
Bukkit

Submodule Bukkit updated: 67851e79b6...67b9a6f66b

2
CraftBukkit

Submodule CraftBukkit updated: 6bf25cde7e...1ea1adc10f

2
Spigot

Submodule Spigot updated: 129f87a2c0...53e65c99d2

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 --- 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.
*/ */
public void setGliding(boolean gliding); boolean hasAI();
+
+ // 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();
+ +
@@ -27,6 +28,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ */ + */
+ void setArrowsStuck(int arrows); + void setArrowsStuck(int arrows);
+ // Paper end + // 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 --- 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 AttributeInstance getAttribute(Attribute attribute) { public boolean hasAI() {
return getHandle().craftAttributes.getAttribute(attribute); return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).cR() : false; // PAIL: rename
} }
+ +
+ // Paper start + // Paper start