Update upstream B/CB/S

This commit is contained in:
Zach Brown 2016-09-02 22:44:52 -05:00
parent 8eb7f073d6
commit f9f96ea3a5
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
8 changed files with 26 additions and 26 deletions

View file

@ -1,4 +1,4 @@
From ed654de7f9903c5b96b87a9a9227151a48eaf21e Mon Sep 17 00:00:00 2001
From 10a4791de112ae58095cfc6027dc367edd1097a0 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.
@ -369,10 +369,10 @@ index 3b2c99e..f9316d6 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index a0c98c7..b2c4ba8 100644
index d8b9c24..40fd71d 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -289,20 +289,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -287,20 +287,7 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
@ -395,5 +395,5 @@ index a0c98c7..b2c4ba8 100644
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
} else {
--
2.9.2.windows.1
2.9.3