mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB/S

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

10
Spigot-API-Patches/0003-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 3772e09053af9dd7d76f320160f2bd0cb38ea155 Mon Sep 17 00:00:00 2001
From e555f871d5cc6a7402bd59651f8e919302f4d9f1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2
@ -3351,7 +3351,7 @@ index 1056186..4ee123e 100644
}
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index a1d174f..6b159ed 100644
index 80c6a72..759c461 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -40,7 +40,6 @@ import org.bukkit.plugin.PluginLoader;
@ -3365,12 +3365,12 @@ index a1d174f..6b159ed 100644
@@ -51,7 +50,6 @@ public final class JavaPluginLoader implements PluginLoader {
private final Pattern[] fileFilters = new Pattern[] { Pattern.compile("\\.jar$"), };
private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
private final Map<String, PluginClassLoader> loaders = Collections.synchronizedMap(new LinkedHashMap<String, PluginClassLoader>());
private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>();
- public static final CustomTimingsHandler pluginParentTimer = new CustomTimingsHandler("** Plugins"); // Spigot
/**
* This class was not meant to be constructed explicitly
@@ -291,26 +289,20 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -289,26 +287,20 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
@ -3656,5 +3656,5 @@ index 8d98297..7e89b97 100644
- }
}
--
2.9.2.windows.1
2.9.3

8
Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch
View file

@ -1,14 +1,14 @@
From f57909e23aa879da0c747ea91b472cac307980d9 Mon Sep 17 00:00:00 2001
From aca5c5298ce7fca0a9b6d8c8240f94d1a09de085 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 19:45:21 -0600
Subject: [PATCH] Automatically disable plugins that fail to load
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 6b159ed..a0c98c7 100644
index 759c461..d8b9c24 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -330,6 +330,10 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -329,6 +329,10 @@ public final class JavaPluginLoader implements PluginLoader {
jPlugin.setEnabled(true);
} catch (Throwable ex) {
server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
@ -20,5 +20,5 @@ index 6b159ed..a0c98c7 100644
// Perhaps abort here, rather than continue going, but as it stands,
--
2.9.2.windows.1
2.9.3

8
Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
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