From fc911a20f5305d9348f1279ff4c483b739ac0c0b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 4 Jan 2018 02:04:31 -0600 Subject: [PATCH] Update upstream B/CB/S --- ...und-for-plugins-modifying-the-parent-of-t.patch | 8 ++++---- ...gurable-Keep-Spawn-Loaded-range-per-world.patch | 14 +++++++------- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch index aff5c583e3..6f3e836dc6 100644 --- a/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch +++ b/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch @@ -1,4 +1,4 @@ -From 9465160fd187615d638bf31423d3ad78ab1e30ca Mon Sep 17 00:00:00 2001 +From 26b7c3d6ac64b033578ae2d9a5bf30af408f1418 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 19:41:20 +0200 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin @@ -77,7 +77,7 @@ index 0abad9ad..14dda205 100644 /** diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 2a1974ec..c9805bb9 100644 +index ca9c7796..a7d87d2d 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -36,6 +36,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -97,7 +97,7 @@ index 2a1974ec..c9805bb9 100644 try { Class jarClass; try { -@@ -181,6 +184,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot +@@ -187,6 +190,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot pluginState = new IllegalStateException("Initial initialization"); this.pluginInit = javaPlugin; @@ -106,5 +106,5 @@ index 2a1974ec..c9805bb9 100644 } } -- -2.15.1 +2.15.1.windows.2 diff --git a/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 7b52cb148c..837ec855bb 100644 --- a/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 5a6f8c98aead231b52d1c8e65a10b7c4ac722261 Mon Sep 17 00:00:00 2001 +From 3ab35b757a837b4b28a3418167eae80c64cebd2a 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world This lets you disable it for some worlds and lower it for others. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 74a49a5f..3a942c76 100644 +index 74a49a5fb..3a942c763 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -284,4 +284,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 74a49a5f..3a942c76 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4e8ce79f..2300ee10 100644 +index 4e8ce79ff..2300ee10b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -357,8 +357,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -39,7 +39,7 @@ index 4e8ce79f..2300ee10 100644 if (i1 - j > 1000L) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 279f0a26..a0b36b6b 100644 +index 279f0a261..a0b36b6ba 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -3200,8 +3200,9 @@ public abstract class World implements IBlockAccess { @@ -54,11 +54,11 @@ index 279f0a26..a0b36b6b 100644 public void a(Packet packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 728d0ff8..c1588879 100644 +index 5d15d5846..bc048f292 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -961,7 +961,7 @@ public final class CraftServer implements Server { - System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")"); + System.out.println("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")"); if (internal.getWorld().getKeepSpawnInMemory()) { - short short1 = 196; @@ -67,7 +67,7 @@ index 728d0ff8..c1588879 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 01fc193d..69dc11e2 100644 +index 01fc193db..69dc11e2b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1283,8 +1283,9 @@ public class CraftWorld implements World { diff --git a/work/Bukkit b/work/Bukkit index 07afa3d58b..8707a3a572 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 07afa3d58b1869147b5e6b44e1227001512a68d1 +Subproject commit 8707a3a572bcd4168e2548d06b050b10d5dc5582 diff --git a/work/CraftBukkit b/work/CraftBukkit index 360629ec5a..dc7d31b00d 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 360629ec5a02f32a56aa0d82ff99d87b68fa45f7 +Subproject commit dc7d31b00d121c486660fafc9d6b4eb38e9db76d diff --git a/work/Spigot b/work/Spigot index bb614f8414..325fbc7f16 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit bb614f841467a4bfa110bbed2c9fbc638bc68369 +Subproject commit 325fbc7f164aeab1f169e47374a9bdd0d67cc8ba