1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-03 21:37:28 +01:00

Update upstream B/CB/S

This commit is contained in:
Zach Brown 2016-09-02 22:44:52 -05:00
parent 2df56fa35b
commit e1423d87ba
4 changed files with 4 additions and 4 deletions

View file

@ -3365,7 +3365,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ 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
/**

@ -1 +1 @@
Subproject commit 89e4f83cd41117cc8a0264e70049f2f6e490740a
Subproject commit a25e56c4b6133c9e77d0c71fc0b1db1ace430197

@ -1 +1 @@
Subproject commit 43ab2669d768f1a2cfe32418cd275d110691af05
Subproject commit 4d87c3422c4f3d0576c63859e12e37c29031bbad

@ -1 +1 @@
Subproject commit 455072c24e822b3e6f9c50ec1d3712bcefbcc92c
Subproject commit f9671b84fbd5192fdbf13c0f9072f1d608f94f2e