mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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 bf877b9a72
commit b210aa7dfe
19 changed files with 88 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0002-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 115a69756eb8f99a16be4b602e75edce84128684 Mon Sep 17 00:00:00 2001
From ffc094f33f81e73c7067ef740dc22183e4553369 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2
@ -3160,10 +3160,10 @@ index fc59aa3..0000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 649cd45..3242c69 100644
index 8e38006..19f7ae7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1356,6 +1356,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1360,6 +1360,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -3538,5 +3538,5 @@ index 8d98297..7e89b97 100644
- }
}
--
2.7.1.windows.2
2.7.4

13
Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
View file

@ -1,23 +1,22 @@
From 4a940f6fb654c6297cb3aa11127d0ed03027c578 Mon Sep 17 00:00:00 2001
From ed0f87d97dc3b1e85e2ef56ba8d6ec1e871df32d Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:47:27 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 8827c6c..9d25133 100644
index 22de9f7..570da41 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -394,4 +394,20 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
* @return true if the entity has AI, otherwise false.
@@ -416,4 +416,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
* @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();
+