From 85ee80938ba4ad05add0190d14082672ede0af38 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 27 Mar 2016 01:38:58 -0500 Subject: [PATCH] Update upstream and rebuild --- Bukkit | 2 +- CraftBukkit | 2 +- Spigot | 2 +- .../0006-Entity-Origin-API.patch | 8 ++++---- ...-working-with-arrows-stuck-in-living-.patch | 18 +++++++++--------- .../0012-Player-Exhaustion-Multipliers.patch | 8 ++++---- .../0025-Entity-Origin-API.patch | 10 +++++----- ...-working-with-arrows-stuck-in-living-.patch | 10 +++++----- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Bukkit b/Bukkit index 67851e79b..67b9a6f66 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit 67851e79b65efb980c2bd44a3560cff39540d370 +Subproject commit 67b9a6f66b74a8df1977067ef2bbf45274da1bdf diff --git a/CraftBukkit b/CraftBukkit index 6bf25cde7..1ea1adc10 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 6bf25cde7ecbaeb89bdfe18e7971669cec668646 +Subproject commit 1ea1adc10f3f068f3d67f472469443fd732d8d2c diff --git a/Spigot b/Spigot index 129f87a2c..53e65c99d 160000 --- a/Spigot +++ b/Spigot @@ -1 +1 @@ -Subproject commit 129f87a2c0ca73bea240b952d62e98ec59a1dc66 +Subproject commit 53e65c99d236cba48e641458aca98993fd11d7bd diff --git a/Spigot-API-Patches/0006-Entity-Origin-API.patch b/Spigot-API-Patches/0006-Entity-Origin-API.patch index c1eaa2e85..706216082 100644 --- a/Spigot-API-Patches/0006-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0006-Entity-Origin-API.patch @@ -1,14 +1,14 @@ -From b63b68858570e7fa3b29c47c4124fcc69bd87098 Mon Sep 17 00:00:00 2001 +From fc936348f326dc7f042c1791eb98627a7fa97008 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 17:50:31 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 9f4d48b..b82d112 100644 +index e5fc22a..ef6d467 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -374,4 +374,15 @@ public interface Entity extends Metadatable, CommandSender { +@@ -391,4 +391,15 @@ public interface Entity extends Metadatable, CommandSender { Spigot spigot(); // Spigot End @@ -61,5 +61,5 @@ index 3ce322d..69df487 100644 + public org.bukkit.Location getSourceLoc(); } -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 7cef667d6..234173c7a 100644 --- a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,22 +1,23 @@ -From ca4d78a633276a1f29f24fda9e851d2b1f8a77df Mon Sep 17 00:00:00 2001 +From 4a940f6fb654c6297cb3aa11127d0ed03027c578 Mon Sep 17 00:00:00 2001 From: mrapple 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 3582d2f..aacad19 100644 +index 8827c6c..9d25133 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -381,4 +381,20 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti +@@ -394,4 +394,20 @@ 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,8 +28,7 @@ index 3582d2f..aacad19 100644 + */ + void setArrowsStuck(int arrows); + // Paper end -+ } -- -2.7.2 +2.7.4 diff --git a/Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch index 73a3cb71e..c4cc8e9b4 100644 --- a/Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch +++ b/Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch @@ -1,4 +1,4 @@ -From fb0f70f496cee0ac192bc815cbf5f37130791971 Mon Sep 17 00:00:00 2001 +From 2dd4146d10140fbee261290a58dbfd30171659ff Mon Sep 17 00:00:00 2001 From: gsand Date: Tue, 1 Mar 2016 13:43:16 -0600 Subject: [PATCH] Player Exhaustion Multipliers @@ -36,10 +36,10 @@ index 88e1e98..0f71013 100644 ItemStack itemstack1 = this.u(iblockdata); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 697f145..83f84ea 100644 +index 0e6c7c7..c599b6a 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1448,13 +1448,13 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1450,13 +1450,13 @@ public abstract class EntityHuman extends EntityLiving { i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F); if (i > 0) { this.a(StatisticList.q, i); @@ -56,5 +56,5 @@ index 697f145..83f84ea 100644 } else if (this.n_()) { if (d1 > 0.0D) { -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch index f192a2521..ed11ad1d1 100644 --- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch @@ -1,11 +1,11 @@ -From 5302de064828c10daf04722e7f64d61cd46f24ca Mon Sep 17 00:00:00 2001 +From 9c492d248b8874afb059dab31a72ea0a0a88d2b5 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index f4b9481..cf1278d 100644 +index 146223a..7152182 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -142,6 +142,7 @@ public abstract class Entity implements ICommandListener { @@ -98,10 +98,10 @@ index 9124558..18d0bd8 100644 flag = true; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 3b29578..968a0e5 100644 +index 908dcee..f4168c4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -593,4 +593,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -603,4 +603,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return spigot; } // Spigot end @@ -147,5 +147,5 @@ index c493c9c..93843aa 100644 + // Paper end } -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 2964c12cf..f6e00ddf5 100644 --- a/Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,4 +1,4 @@ -From f01590c12f2fe5689ab5f98c42d8cf608237201c Mon Sep 17 00:00:00 2001 +From ea1fa24b9dba982cd21c482ccb91a2e870d7de54 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities @@ -22,12 +22,12 @@ index 0891ff1..8be17ae 100644 this.datawatcher.set(EntityLiving.h, Integer.valueOf(i)); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 6f25d18..693d5cb 100644 +index 85c88b5..55bdd06 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -531,4 +531,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { - public AttributeInstance getAttribute(Attribute attribute) { - return getHandle().craftAttributes.getAttribute(attribute); +@@ -543,4 +543,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { + public boolean hasAI() { + return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).cR() : false; // PAIL: rename } + + // Paper start