diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch index 03743c9f0f..c0df2d837c 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0003-Timings-v2.patch @@ -1,4 +1,4 @@ -From 3772e09053af9dd7d76f320160f2bd0cb38ea155 Mon Sep 17 00:00:00 2001 +From e555f871d5cc6a7402bd59651f8e919302f4d9f1 Mon Sep 17 00:00:00 2001 From: Aikar 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> classes = new java.util.concurrent.ConcurrentHashMap>(); // Spigot - private final Map loaders = Collections.synchronizedMap(new LinkedHashMap()); + private final List loaders = new CopyOnWriteArrayList(); - 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 diff --git a/Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch b/Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch index e2ad6bdae7..f76fbefcc5 100644 --- a/Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch +++ b/Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch @@ -1,14 +1,14 @@ -From f57909e23aa879da0c747ea91b472cac307980d9 Mon Sep 17 00:00:00 2001 +From aca5c5298ce7fca0a9b6d8c8240f94d1a09de085 Mon Sep 17 00:00:00 2001 From: Aikar 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 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 d8dac0aa33..bd9e5f299f 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 ed654de7f9903c5b96b87a9a9227151a48eaf21e Mon Sep 17 00:00:00 2001 +From 10a4791de112ae58095cfc6027dc367edd1097a0 Mon Sep 17 00:00:00 2001 From: Techcable 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 diff --git a/Spigot-Server-Patches/0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch index b6d8678991..3a10153288 100644 --- a/Spigot-Server-Patches/0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0116-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 19e01440cce4627ca287b60b5b40870897a8f804 Mon Sep 17 00:00:00 2001 +From 4498a7300a12e6a21c216f0ee001a9b2e9d7ae76 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -21,7 +21,7 @@ index bc3515c..84694b2 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ac8dd76..1a7a0ee 100644 +index 35a8602..8e364de 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -349,8 +349,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -65,10 +65,10 @@ index 703aff1..100142e 100644 for (int j = -short1; j <= short1; j += 16) { for (int k = -short1; k <= short1; k += 16) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0c54005..cf76fd3 100644 +index 9ef8fc1..e85a0a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1196,8 +1196,9 @@ public class CraftWorld implements World { +@@ -1199,8 +1199,9 @@ public class CraftWorld implements World { int chunkCoordX = chunkcoordinates.getX() >> 4; int chunkCoordZ = chunkcoordinates.getZ() >> 4; // Cycle through the 25x25 Chunks around it to load/unload the chunks. @@ -81,5 +81,5 @@ index 0c54005..cf76fd3 100644 loadChunk(chunkCoordX + x, chunkCoordZ + z); } else { -- -2.9.2.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch index 73398b49bc..fddeb2b351 100644 --- a/Spigot-Server-Patches/0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0158-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From a5052e1ae9abb91e411a2caccd519f36a6af68da Mon Sep 17 00:00:00 2001 +From bd2c221318693b3106af24c0c577ee785e8e5fb5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement @@ -35,7 +35,7 @@ index 85f9481..b4d76e5 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index a9f6efa..6bad7eb 100644 +index b0453ca..683a6dd 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -30,6 +30,7 @@ public class Chunk { @@ -127,10 +127,10 @@ index c9d48ac..8e0b66d 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index cf76fd3..af2f24a 100644 +index e85a0a0..c28c505 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1480,7 +1480,7 @@ public class CraftWorld implements World { +@@ -1483,7 +1483,7 @@ public class CraftWorld implements World { ChunkProviderServer cps = world.getChunkProviderServer(); for (net.minecraft.server.Chunk chunk : cps.chunks.values()) { // If in use, skip it @@ -140,5 +140,5 @@ index cf76fd3..af2f24a 100644 } -- -2.9.2.windows.1 +2.9.3 diff --git a/work/Bukkit b/work/Bukkit index 89e4f83cd4..a25e56c4b6 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 89e4f83cd41117cc8a0264e70049f2f6e490740a +Subproject commit a25e56c4b6133c9e77d0c71fc0b1db1ace430197 diff --git a/work/CraftBukkit b/work/CraftBukkit index 43ab2669d7..4d87c3422c 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 43ab2669d768f1a2cfe32418cd275d110691af05 +Subproject commit 4d87c3422c4f3d0576c63859e12e37c29031bbad diff --git a/work/Spigot b/work/Spigot index 455072c24e..f9671b84fb 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 455072c24e822b3e6f9c50ec1d3712bcefbcc92c +Subproject commit f9671b84fbd5192fdbf13c0f9072f1d608f94f2e