From a9f44f22409436cba19b3015f282a0cf7dfa9cae Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 12 Mar 2016 00:40:16 -0600
Subject: [PATCH] Rebuild some patches
---
.../Use-ASM-for-event-executors.patch | 6 +++---
Spigot-Server-Patches/Add-BeaconEffectEvent.patch | 13 -------------
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/Spigot-API-Patches/Use-ASM-for-event-executors.patch b/Spigot-API-Patches/Use-ASM-for-event-executors.patch
index fc78c0ecf5..e7e96bd01b 100644
--- a/Spigot-API-Patches/Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/Use-ASM-for-event-executors.patch
@@ -20,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ 5.0.4
+
-
+
diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
new file mode 100644
@@ -270,7 +270,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ import org.bukkit.event.Event;
import org.bukkit.event.EventException;
import org.bukkit.event.Listener;
-
+
+// Paper start
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
@@ -328,7 +328,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
-
+
- EventExecutor executor = new co.aikar.timings.TimedEventExecutor(new EventExecutor() { // Spigot
- public void execute(Listener listener, Event event) throws EventException {
- try {
diff --git a/Spigot-Server-Patches/Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/Add-BeaconEffectEvent.patch
index 26ac0b8096..34d9fd54be 100644
--- a/Spigot-Server-Patches/Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/Add-BeaconEffectEvent.patch
@@ -4,19 +4,6 @@ Date: Wed, 2 Mar 2016 23:30:53 -0600
Subject: [PATCH] Add BeaconEffectEvent
-diff --git a/src/main/java/net/minecraft/server/MobEffectList.java b/src/main/java/net/minecraft/server/MobEffectList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/MobEffectList.java
-+++ b/src/main/java/net/minecraft/server/MobEffectList.java
-@@ -0,0 +0,0 @@ public class MobEffectList {
- private final Map a = Maps.newHashMap();
- private final boolean c;
- private final int d;
-- private String e = "";
-+ public String e = ""; // Paper - private -> public
- private int f = -1;
- public double durationModifier;
- private boolean h;
diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/TileEntityBeacon.java