From f6782d5738e0826b11018439a69d7ec664525fee Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 3 Apr 2016 05:06:48 -0500
Subject: [PATCH] Rebuild
---
.../0013-Player-Exhaustion-Multipliers.patch | 6 +++---
Spigot-Server-Patches/0026-Entity-Origin-API.patch | 8 ++++----
...t.patch => 0123-Add-PlayerUseUnknownEntityEvent.patch} | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
rename Spigot-Server-Patches/{0124-Add-PlayerUseUnknownEntityEvent.patch => 0123-Add-PlayerUseUnknownEntityEvent.patch} (96%)
diff --git a/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch
index e92a4df7ec..40d4113e32 100644
--- a/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch
+++ b/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch
@@ -1,4 +1,4 @@
-From cde3b788b4a629944ca36ec406ab7a384b4c273b Mon Sep 17 00:00:00 2001
+From 284c8d203857ff23b9b0484880cd760ebb7afe65 Mon Sep 17 00:00:00 2001
From: gsand <gsandowns@gmail.com>
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 ad57082..46c826c 100644
+index e1bb5c5..11388ab 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 {
+@@ -1451,13 +1451,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);
diff --git a/Spigot-Server-Patches/0026-Entity-Origin-API.patch b/Spigot-Server-Patches/0026-Entity-Origin-API.patch
index 550d978dcd..05b6e9eb1d 100644
--- a/Spigot-Server-Patches/0026-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0026-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From 2b9bf67504d0f896fddad31118b8d6d0e55045f2 Mon Sep 17 00:00:00 2001
+From 25b0aac196ce95c319b3886df553f581a0c05ab0 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 23:45:08 -0600
Subject: [PATCH] Entity Origin API
@@ -81,7 +81,7 @@ index 564ea37..1113b1c 100644
public EntityLiving getSource() {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0460dc5..87236e8 100644
+index 72d0f5c..3f4bc0f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -948,6 +948,12 @@ public abstract class World implements IBlockAccess {
@@ -98,10 +98,10 @@ index 0460dc5..87236e8 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 908dcee..f4168c4 100644
+index 8a1df54..f61f6cd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -603,4 +603,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -604,4 +604,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return spigot;
}
// Spigot end
diff --git a/Spigot-Server-Patches/0124-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0123-Add-PlayerUseUnknownEntityEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0124-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0123-Add-PlayerUseUnknownEntityEvent.patch
index f9e1f18444..47ef45556f 100644
--- a/Spigot-Server-Patches/0124-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0123-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From 702c81ef81451505a29dc4e69823911c21a965b9 Mon Sep 17 00:00:00 2001
+From fc164410c3896a0f0cbd3383781c11ef6b98f498 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 05:09:16 -0400
Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -39,5 +39,5 @@ index ff64891..b60b134 100644
}
--
-2.7.4
+2.8.0