Rebuild some patches

This commit is contained in:
Zach Brown 2016-03-12 00:40:16 -06:00
parent 386693ee50
commit 244196f8cb
2 changed files with 7 additions and 19 deletions

View file

@ -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