From 38d2939ff19f6dd564d94da2f1540138eba026dd Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 8 Apr 2016 17:24:26 -0500
Subject: [PATCH] Update upstreams and rebuild
---
Spigot-Server-Patches/0005-Timings-v2.patch | 22 +++++++++----------
.../0041-Disable-explosion-knockback.patch | 10 ++++-----
...working-with-arrows-stuck-in-living-.patch | 6 ++---
...3-Custom-replacement-for-eaten-items.patch | 6 ++---
...th-absorb-values-and-repair-bad-data.patch | 10 ++++-----
work/Bukkit | 2 +-
work/CraftBukkit | 2 +-
7 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index cde2128a5b..276620c4ee 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 3e3f584f5efc675f1377eb018d25862e66a4b5fb Mon Sep 17 00:00:00 2001
+From 4fba15a4a8ff469ce922547d70461c08448ca608 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@@ -345,10 +345,10 @@ index 2983756..9e84616 100644
public void recalcPosition() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2a2d235..151162e 100644
+index bdfbf56..e6f59da 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -24,7 +24,7 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
+@@ -25,7 +25,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
import org.bukkit.event.player.PlayerItemConsumeEvent;
// CraftBukkit end
@@ -357,7 +357,7 @@ index 2a2d235..151162e 100644
public abstract class EntityLiving extends Entity {
-@@ -1697,7 +1697,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1698,7 +1698,6 @@ public abstract class EntityLiving extends Entity {
}
public void m() {
@@ -365,7 +365,7 @@ index 2a2d235..151162e 100644
super.m();
this.cu();
if (!this.world.isClientSide) {
-@@ -1770,9 +1769,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1771,9 +1770,7 @@ public abstract class EntityLiving extends Entity {
}
}
@@ -375,7 +375,7 @@ index 2a2d235..151162e 100644
double d0 = this.locX - this.lastX;
double d1 = this.locZ - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
-@@ -1841,8 +1838,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1842,8 +1839,6 @@ public abstract class EntityLiving extends Entity {
} else {
this.bo = 0;
}
@@ -384,7 +384,7 @@ index 2a2d235..151162e 100644
}
protected float h(float f, float f1) {
-@@ -1907,7 +1902,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1908,7 +1903,6 @@ public abstract class EntityLiving extends Entity {
}
this.world.methodProfiler.a("ai");
@@ -392,7 +392,7 @@ index 2a2d235..151162e 100644
if (this.cf()) {
this.bc = false;
this.bd = 0.0F;
-@@ -1918,7 +1912,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1919,7 +1913,6 @@ public abstract class EntityLiving extends Entity {
this.doTick();
this.world.methodProfiler.b();
}
@@ -400,7 +400,7 @@ index 2a2d235..151162e 100644
this.world.methodProfiler.b();
this.world.methodProfiler.a("jump");
-@@ -1941,14 +1934,10 @@ public abstract class EntityLiving extends Entity {
+@@ -1942,14 +1935,10 @@ public abstract class EntityLiving extends Entity {
this.be *= 0.98F;
this.bf *= 0.9F;
this.r();
@@ -477,7 +477,7 @@ index 0caa3f9..a5fea4a 100644
// Run tasks that are waiting on processing
SpigotTimings.processQueueTimer.startTiming(); // Spigot
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3409a53..dfd6067 100644
+index eb39362..085bb83 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -545,7 +545,7 @@ index e6524e9..4193f20 100644
private static Map<String, Class<? extends TileEntity>> f = Maps.newHashMap();
private static Map<Class<? extends TileEntity>, String> g = Maps.newHashMap();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 18993be..fab56f7 100644
+index f38b256..9c67687 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
diff --git a/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch
index a8f490c8b9..3644bb81f1 100644
--- a/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch
@@ -1,4 +1,4 @@
-From 8027ea5b51f888ad7ae33e72e87c47f2cc1ffde4 Mon Sep 17 00:00:00 2001
+From 3581a2e5e5939c6c04e3fc2d933c69bc9b80913b Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 14:48:03 -0600
Subject: [PATCH] Disable explosion knockback
@@ -19,10 +19,10 @@ index ba7184f..2626f81 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 151162e..3b9b112 100644
+index e6f59da..017377e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -860,12 +860,14 @@ public abstract class EntityLiving extends Entity {
+@@ -861,12 +861,14 @@ public abstract class EntityLiving extends Entity {
}
}
@@ -37,7 +37,7 @@ index 151162e..3b9b112 100644
this.world.broadcastEntityEffect(this, (byte) 2);
}
-@@ -889,6 +891,8 @@ public abstract class EntityLiving extends Entity {
+@@ -890,6 +892,8 @@ public abstract class EntityLiving extends Entity {
}
}
@@ -69,5 +69,5 @@ index 7e99b7d..91540c7 100644
}
}
--
-2.7.4
+2.8.0
diff --git a/Spigot-Server-Patches/0077-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0077-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index f8f57ee50f..a5757cf3cd 100644
--- a/Spigot-Server-Patches/0077-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0077-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,14 +1,14 @@
-From b80588d1857fc4e9c086c1f7ba8b45639f9819e9 Mon Sep 17 00:00:00 2001
+From 0fddc1a09c703603800f97ab99b4c2ccc566782d Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:43:39 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3b9b112..54a0808 100644
+index 017377e..22d5fe6 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1278,10 +1278,12 @@ public abstract class EntityLiving extends Entity {
+@@ -1279,10 +1279,12 @@ public abstract class EntityLiving extends Entity {
return (float) this.getAttributeInstance(GenericAttributes.maxHealth).getValue();
}
diff --git a/Spigot-Server-Patches/0093-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0093-Custom-replacement-for-eaten-items.patch
index cd748b6942..1c7c02cacf 100644
--- a/Spigot-Server-Patches/0093-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0093-Custom-replacement-for-eaten-items.patch
@@ -1,14 +1,14 @@
-From f0f2dc3bddcddafe88517f3d615380b059c4f1c6 Mon Sep 17 00:00:00 2001
+From aadeb2d70ff7f53406caf5b8299dbdb1cc59d011 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 21 Jun 2015 15:07:20 -0400
Subject: [PATCH] Custom replacement for eaten items
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 54a0808..4b9e65b 100644
+index 22d5fe6..e6fb045 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2222,12 +2222,25 @@ public abstract class EntityLiving extends Entity {
+@@ -2223,12 +2223,25 @@ public abstract class EntityLiving extends Entity {
ItemStack itemstack = (craftItem.equals(event.getItem())) ? this.bm.a(this.world, this) : CraftItemStack.asNMSCopy(event.getItem()).a(world, this);
// CraftBukkit end
diff --git a/Spigot-Server-Patches/0095-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0095-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 98843e095d..fb16dd9c6d 100644
--- a/Spigot-Server-Patches/0095-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0095-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,14 +1,14 @@
-From 3b613790bf18ce99fdf7dbd6d69930cb025b4e20 Mon Sep 17 00:00:00 2001
+From 0b5910fe3ae06fd674899d2dd5a1f6b5f3aba692 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400
Subject: [PATCH] handle NaN health/absorb values and repair bad data
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4b9e65b..ebd0475 100644
+index e6fb045..5ec4cd8 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -463,7 +463,13 @@ public abstract class EntityLiving extends Entity {
+@@ -464,7 +464,13 @@ public abstract class EntityLiving extends Entity {
}
public void a(NBTTagCompound nbttagcompound) {
@@ -23,7 +23,7 @@ index 4b9e65b..ebd0475 100644
if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isClientSide) {
GenericAttributes.a(this.getAttributeMap(), nbttagcompound.getList("Attributes", 10));
}
-@@ -748,6 +754,10 @@ public abstract class EntityLiving extends Entity {
+@@ -749,6 +755,10 @@ public abstract class EntityLiving extends Entity {
}
public void setHealth(float f) {
@@ -34,7 +34,7 @@ index 4b9e65b..ebd0475 100644
// CraftBukkit start - Handle scaled health
if (this instanceof EntityPlayer) {
org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
-@@ -2092,7 +2102,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2093,7 +2103,7 @@ public abstract class EntityLiving extends Entity {
}
public void setAbsorptionHearts(float f) {
diff --git a/work/Bukkit b/work/Bukkit
index a579a159a0..a70e44d68b 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit a579a159a073406cf1a06d273c6ff8f95b188abe
+Subproject commit a70e44d68bc815051d965cdedc7fc18555f7d73d
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 8d16fc08f1..11e8c6d338 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 8d16fc08f131b9bfacf3140f984fc7dd63ffa8f1
+Subproject commit 11e8c6d3388dc9d6cad52c742be0faebfc6e4511