From 244196f8cbafac2a820e3a6f1a7aff18fcff63a9 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 12 Mar 2016 00:40:16 -0600
Subject: [PATCH] Rebuild some patches

---
 .../0023-Use-ASM-for-event-executors.patch        | 11 ++++++-----
 .../0046-Add-BeaconEffectEvent.patch              | 15 +--------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
index 1535049cd6..adc11f9176 100644
--- a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
@@ -1,4 +1,4 @@
-From 72795f24992711b90de1db3fa337de1ffbbe06d8 Mon Sep 17 00:00:00 2001
+From 7e35c9c03a1fe023e8da7de1718f60e00298c6b5 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -20,7 +20,7 @@ index 0b615b4..1ad108e 100644
 +            <version>5.0.4</version>
 +        </dependency>
      </dependencies>
-
+ 
      <build>
 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 3b2c99e..7b92ce0 100644
 @@ -4,9 +4,53 @@ 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 93a43dd..7229b25 100644
 @@ -291,20 +291,7 @@ 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 {
@@ -347,5 +347,6 @@ index 93a43dd..7229b25 100644
              if (false) { // Spigot - RL handles useTimings check now
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
---
+-- 
 2.7.2
+
diff --git a/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch
index a39967042e..4632e7e35a 100644
--- a/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch
@@ -1,22 +1,9 @@
-From e517ad6d7b004bfea02ba11c3e32ff28ba42acdc Mon Sep 17 00:00:00 2001
+From f4793135ffe14e9f962bd15dc4f60ce61eb2aca3 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 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 24ae8e2..a5cbda5 100644
---- a/src/main/java/net/minecraft/server/MobEffectList.java
-+++ b/src/main/java/net/minecraft/server/MobEffectList.java
-@@ -17,7 +17,7 @@ public class MobEffectList {
-     private final Map<IAttribute, AttributeModifier> 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 ed5b374..f490dca 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java