From 9d6bb9d4c8c33f75ee9a8a70908e44c78d5f90b3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 26 May 2017 22:46:27 -0500 Subject: [PATCH] Bump outdated build notification back out to norm Merge outdated notification patch into existing branding patch --- ...ient-crashes-server-lists-and-Mojang.patch | 19 +++++++++++++++- ...dated-Build-Download-URL-to-Paper-CI.patch | 22 ------------------- ... 0191-PlayerTeleportEndGatewayEvent.patch} | 6 ++--- ... => 0192-ShulkerBox-Dupe-Prevention.patch} | 2 +- ...ovide-E-TE-Chunk-count-stat-methods.patch} | 2 +- ...h => 0194-Enforce-Sync-Player-Saves.patch} | 2 +- ... => 0195-Enforce-Sync-Chunk-Unloads.patch} | 2 +- ...low-entities-to-ride-themselves-572.patch} | 4 ++-- ...atch => 0197-Fix-block-break-desync.patch} | 2 +- ...ign-the-World-in-WorldGenStronghold.patch} | 2 +- ...-fromBottle-flag-to-Experience-Orbs.patch} | 2 +- ...-Remove-the-Vanilla-Method-Profiler.patch} | 2 +- ...patch => 0201-Cap-Entity-Collisions.patch} | 4 ++-- ...ow-a-zero-max-height-in-BiomeJungle.patch} | 2 +- ...-CraftScheduler-Async-Task-Debugger.patch} | 2 +- ...g.patch => 0204-Shame-on-you-Mojang.patch} | 2 +- ...ore-aggressive-in-the-chunk-unload-.patch} | 2 +- ...> 0206-Do-not-let-armorstands-drown.patch} | 2 +- ...-attempting-to-read-EMPTY-ItemStack.patch} | 2 +- ...e-async-calls-to-restart-the-server.patch} | 2 +- ...roperty-to-disable-book-size-limits.patch} | 2 +- ...e-parrots-stay-on-shoulders-despite.patch} | 2 +- ...rkaround-for-jansi-bug-with-Windows.patch} | 4 ++-- 23 files changed, 44 insertions(+), 49 deletions(-) delete mode 100644 Spigot-Server-Patches/0191-Change-Outdated-Build-Download-URL-to-Paper-CI.patch rename Spigot-Server-Patches/{0192-PlayerTeleportEndGatewayEvent.patch => 0191-PlayerTeleportEndGatewayEvent.patch} (91%) rename Spigot-Server-Patches/{0193-ShulkerBox-Dupe-Prevention.patch => 0192-ShulkerBox-Dupe-Prevention.patch} (94%) rename Spigot-Server-Patches/{0194-Provide-E-TE-Chunk-count-stat-methods.patch => 0193-Provide-E-TE-Chunk-count-stat-methods.patch} (96%) rename Spigot-Server-Patches/{0195-Enforce-Sync-Player-Saves.patch => 0194-Enforce-Sync-Player-Saves.patch} (94%) rename Spigot-Server-Patches/{0196-Enforce-Sync-Chunk-Unloads.patch => 0195-Enforce-Sync-Chunk-Unloads.patch} (95%) rename Spigot-Server-Patches/{0197-Don-t-allow-entities-to-ride-themselves-572.patch => 0196-Don-t-allow-entities-to-ride-themselves-572.patch} (89%) rename Spigot-Server-Patches/{0198-Fix-block-break-desync.patch => 0197-Fix-block-break-desync.patch} (93%) rename Spigot-Server-Patches/{0199-Assign-the-World-in-WorldGenStronghold.patch => 0198-Assign-the-World-in-WorldGenStronghold.patch} (92%) rename Spigot-Server-Patches/{0200-Add-fromBottle-flag-to-Experience-Orbs.patch => 0199-Add-fromBottle-flag-to-Experience-Orbs.patch} (97%) rename Spigot-Server-Patches/{0201-Remove-the-Vanilla-Method-Profiler.patch => 0200-Remove-the-Vanilla-Method-Profiler.patch} (98%) rename Spigot-Server-Patches/{0202-Cap-Entity-Collisions.patch => 0201-Cap-Entity-Collisions.patch} (96%) rename Spigot-Server-Patches/{0203-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch => 0202-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch} (96%) rename Spigot-Server-Patches/{0204-Remove-CraftScheduler-Async-Task-Debugger.patch => 0203-Remove-CraftScheduler-Async-Task-Debugger.patch} (98%) rename Spigot-Server-Patches/{0205-Shame-on-you-Mojang.patch => 0204-Shame-on-you-Mojang.patch} (97%) rename Spigot-Server-Patches/{0206-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0205-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (94%) rename Spigot-Server-Patches/{0207-Do-not-let-armorstands-drown.patch => 0206-Do-not-let-armorstands-drown.patch} (96%) rename Spigot-Server-Patches/{0208-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch => 0207-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch} (94%) rename Spigot-Server-Patches/{0209-Properly-handle-async-calls-to-restart-the-server.patch => 0208-Properly-handle-async-calls-to-restart-the-server.patch} (99%) rename Spigot-Server-Patches/{0210-Add-system-property-to-disable-book-size-limits.patch => 0209-Add-system-property-to-disable-book-size-limits.patch} (97%) rename Spigot-Server-Patches/{0211-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0210-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (97%) rename Spigot-Server-Patches/{0212-Workaround-for-jansi-bug-with-Windows.patch => 0211-Workaround-for-jansi-bug-with-Windows.patch} (93%) diff --git a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 92b55bb1cf..b6921c1ae0 100644 --- a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From df896d997abf49e32c42289b9d5d6c00be905703 Mon Sep 17 00:00:00 2001 +From 61715ac730b754353b7b65ad96ba42a2fcae59b7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -45,6 +45,23 @@ index 5c05ae407..bfc42b12f 100644 private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); +diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java +index 30b6f3477..22cb680df 100644 +--- a/src/main/java/org/bukkit/craftbukkit/Main.java ++++ b/src/main/java/org/bukkit/craftbukkit/Main.java +@@ -189,10 +189,10 @@ public class Main { + Date buildDate = new SimpleDateFormat("yyyyMMdd-HHmm").parse(Main.class.getPackage().getImplementationVendor()); + + Calendar deadline = Calendar.getInstance(); +- deadline.add(Calendar.DAY_OF_YEAR, -3); ++ deadline.add(Calendar.DAY_OF_YEAR, -14); // Paper - Bump back to 14 + if (buildDate.before(deadline.getTime())) { + System.err.println("*** Error, this build is outdated ***"); +- System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***"); ++ System.err.println("*** Please download a new build as per instructions from https://paperci.emc.gs/ ***"); // Paper + System.err.println("*** Server will start in 15 seconds ***"); + Thread.sleep(TimeUnit.SECONDS.toMillis(15)); + } diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java index 94a3d4237..3ed983cc0 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java diff --git a/Spigot-Server-Patches/0191-Change-Outdated-Build-Download-URL-to-Paper-CI.patch b/Spigot-Server-Patches/0191-Change-Outdated-Build-Download-URL-to-Paper-CI.patch deleted file mode 100644 index 7d00b7f40b..0000000000 --- a/Spigot-Server-Patches/0191-Change-Outdated-Build-Download-URL-to-Paper-CI.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2fb6c517d2ebeb3622759755b53c1e29712c4c93 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Thu, 29 Dec 2016 00:56:51 -0500 -Subject: [PATCH] Change Outdated Build Download URL to Paper CI - - -diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 507390c4b..dab983481 100644 ---- a/src/main/java/org/bukkit/craftbukkit/Main.java -+++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -200,7 +200,7 @@ public class Main { - deadline.add(Calendar.DAY_OF_YEAR, -3); - if (buildDate.before(deadline.getTime())) { - System.err.println("*** Error, this build is outdated ***"); -- System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***"); -+ System.err.println("*** Please download a new build as per instructions from https://paperci.emc.gs/ ***"); // Paper - System.err.println("*** Server will start in 15 seconds ***"); - Thread.sleep(TimeUnit.SECONDS.toMillis(15)); - } --- -2.13.0 - diff --git a/Spigot-Server-Patches/0192-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0191-PlayerTeleportEndGatewayEvent.patch similarity index 91% rename from Spigot-Server-Patches/0192-PlayerTeleportEndGatewayEvent.patch rename to Spigot-Server-Patches/0191-PlayerTeleportEndGatewayEvent.patch index ff4ca4f2cd..f3d2375300 100644 --- a/Spigot-Server-Patches/0192-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0191-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From dd60ddf86eb7eb05ebc0322131914a4639ab561b Mon Sep 17 00:00:00 2001 +From 21227676ed7dd02cb790a080a4ba8a245496bfde Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 21:44:50 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent Allows you to access the Gateway being used in a teleport event diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index f9590d4c4..82c1a37ed 100644 +index 9bde14d93..ab2cd1760 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -124,7 +124,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick @@ -19,5 +19,5 @@ index f9590d4c4..82c1a37ed 100644 if (teleEvent.isCancelled()) { return; -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0193-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0192-ShulkerBox-Dupe-Prevention.patch similarity index 94% rename from Spigot-Server-Patches/0193-ShulkerBox-Dupe-Prevention.patch rename to Spigot-Server-Patches/0192-ShulkerBox-Dupe-Prevention.patch index 5ad1e2ad15..11f8c578da 100644 --- a/Spigot-Server-Patches/0193-ShulkerBox-Dupe-Prevention.patch +++ b/Spigot-Server-Patches/0192-ShulkerBox-Dupe-Prevention.patch @@ -1,4 +1,4 @@ -From 42c899818ae3a9f16b7da90a314238d331221108 Mon Sep 17 00:00:00 2001 +From 172e9388f63868c2cc9a784b473694b52f1767a7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 2 Jan 2017 16:32:56 -0500 Subject: [PATCH] ShulkerBox Dupe Prevention diff --git a/Spigot-Server-Patches/0194-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0193-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 96% rename from Spigot-Server-Patches/0194-Provide-E-TE-Chunk-count-stat-methods.patch rename to Spigot-Server-Patches/0193-Provide-E-TE-Chunk-count-stat-methods.patch index a2787bf6be..5606361d9d 100644 --- a/Spigot-Server-Patches/0194-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-Server-Patches/0193-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From 4c9841741385aba32d83180b96b697c9a85fc3dd Mon Sep 17 00:00:00 2001 +From 6aea44509f9b2fe7b1e4523b532c6dfee332ce96 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:24:46 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods diff --git a/Spigot-Server-Patches/0195-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0194-Enforce-Sync-Player-Saves.patch similarity index 94% rename from Spigot-Server-Patches/0195-Enforce-Sync-Player-Saves.patch rename to Spigot-Server-Patches/0194-Enforce-Sync-Player-Saves.patch index 4cb8bf3379..8205a06ede 100644 --- a/Spigot-Server-Patches/0195-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0194-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From 6b831769e307980e82218b51269bb7771119107e Mon Sep 17 00:00:00 2001 +From 0f8bf6009a0dd243482ac7a590f3541232fb44db Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:41:58 -0500 Subject: [PATCH] Enforce Sync Player Saves diff --git a/Spigot-Server-Patches/0196-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0195-Enforce-Sync-Chunk-Unloads.patch similarity index 95% rename from Spigot-Server-Patches/0196-Enforce-Sync-Chunk-Unloads.patch rename to Spigot-Server-Patches/0195-Enforce-Sync-Chunk-Unloads.patch index 88780a2f9c..6c8ec6f466 100644 --- a/Spigot-Server-Patches/0196-Enforce-Sync-Chunk-Unloads.patch +++ b/Spigot-Server-Patches/0195-Enforce-Sync-Chunk-Unloads.patch @@ -1,4 +1,4 @@ -From 9cf1d9a3227e9da7475208a347a6fa6979ad57e8 Mon Sep 17 00:00:00 2001 +From a1e45d91d780d108a915f6d28133f7d230fd9b69 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 16:06:44 -0500 Subject: [PATCH] Enforce Sync Chunk Unloads diff --git a/Spigot-Server-Patches/0197-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0196-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 89% rename from Spigot-Server-Patches/0197-Don-t-allow-entities-to-ride-themselves-572.patch rename to Spigot-Server-Patches/0196-Don-t-allow-entities-to-ride-themselves-572.patch index 2655c48919..5b9692d382 100644 --- a/Spigot-Server-Patches/0197-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0196-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,11 +1,11 @@ -From dcc21b45d68b1a0a8f2e60f80db12401e5cb0c76 Mon Sep 17 00:00:00 2001 +From 1fbff2336b454ee0330c1cd5a380f3b4bf76b2cf Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Sun, 8 Jan 2017 04:31:36 +0000 Subject: [PATCH] Don't allow entities to ride themselves - #572 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 902df7ac6..7339e337b 100644 +index 0a3d1969a..127eaf1f6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1932,6 +1932,7 @@ public abstract class Entity implements ICommandListener { diff --git a/Spigot-Server-Patches/0198-Fix-block-break-desync.patch b/Spigot-Server-Patches/0197-Fix-block-break-desync.patch similarity index 93% rename from Spigot-Server-Patches/0198-Fix-block-break-desync.patch rename to Spigot-Server-Patches/0197-Fix-block-break-desync.patch index bab2fa8bfa..a6e02cc18d 100644 --- a/Spigot-Server-Patches/0198-Fix-block-break-desync.patch +++ b/Spigot-Server-Patches/0197-Fix-block-break-desync.patch @@ -1,4 +1,4 @@ -From be57fe91e17458a39a5363009979858e460acb8e Mon Sep 17 00:00:00 2001 +From c4c3457c08758c625450547b3101b2ddcc7425ac Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 8 Jan 2017 18:50:35 +1100 Subject: [PATCH] Fix block break desync diff --git a/Spigot-Server-Patches/0199-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0198-Assign-the-World-in-WorldGenStronghold.patch similarity index 92% rename from Spigot-Server-Patches/0199-Assign-the-World-in-WorldGenStronghold.patch rename to Spigot-Server-Patches/0198-Assign-the-World-in-WorldGenStronghold.patch index fc008207c5..b4db2dc628 100644 --- a/Spigot-Server-Patches/0199-Assign-the-World-in-WorldGenStronghold.patch +++ b/Spigot-Server-Patches/0198-Assign-the-World-in-WorldGenStronghold.patch @@ -1,4 +1,4 @@ -From bc489cba868db887dd685a83b37709c9ae4b4d7e Mon Sep 17 00:00:00 2001 +From 0e4da6acee7d0008d196ac64e1b03b95de26e4c2 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 14 Jan 2017 01:22:07 -0600 Subject: [PATCH] Assign the World in WorldGenStronghold diff --git a/Spigot-Server-Patches/0200-Add-fromBottle-flag-to-Experience-Orbs.patch b/Spigot-Server-Patches/0199-Add-fromBottle-flag-to-Experience-Orbs.patch similarity index 97% rename from Spigot-Server-Patches/0200-Add-fromBottle-flag-to-Experience-Orbs.patch rename to Spigot-Server-Patches/0199-Add-fromBottle-flag-to-Experience-Orbs.patch index b5ab00bcd2..1db189457a 100644 --- a/Spigot-Server-Patches/0200-Add-fromBottle-flag-to-Experience-Orbs.patch +++ b/Spigot-Server-Patches/0199-Add-fromBottle-flag-to-Experience-Orbs.patch @@ -1,4 +1,4 @@ -From a47f1a0fe6de4126bee3b618dea9a818eebf696d Mon Sep 17 00:00:00 2001 +From b807b19893a541dd43ac27daf2db8a1dd3b6f983 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 14 Jan 2017 16:15:26 -0600 Subject: [PATCH] Add fromBottle flag to Experience Orbs diff --git a/Spigot-Server-Patches/0201-Remove-the-Vanilla-Method-Profiler.patch b/Spigot-Server-Patches/0200-Remove-the-Vanilla-Method-Profiler.patch similarity index 98% rename from Spigot-Server-Patches/0201-Remove-the-Vanilla-Method-Profiler.patch rename to Spigot-Server-Patches/0200-Remove-the-Vanilla-Method-Profiler.patch index c520dad95e..0a9194465f 100644 --- a/Spigot-Server-Patches/0201-Remove-the-Vanilla-Method-Profiler.patch +++ b/Spigot-Server-Patches/0200-Remove-the-Vanilla-Method-Profiler.patch @@ -1,4 +1,4 @@ -From 422fc51628abbf451c35a053a7f790458231d0b6 Mon Sep 17 00:00:00 2001 +From cfd981e4a928dedef35db11dc229652d70412cda Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jan 2017 02:00:33 -0500 Subject: [PATCH] Remove the Vanilla Method Profiler diff --git a/Spigot-Server-Patches/0202-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0201-Cap-Entity-Collisions.patch similarity index 96% rename from Spigot-Server-Patches/0202-Cap-Entity-Collisions.patch rename to Spigot-Server-Patches/0201-Cap-Entity-Collisions.patch index bcc3e8f2e4..89df830f84 100644 --- a/Spigot-Server-Patches/0202-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0201-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 7068d505f0d0666e4ebdeab8cbf002d43aa8d934 Mon Sep 17 00:00:00 2001 +From ae5d4b6f956317f533c919332a138e4a38e8c70d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -27,7 +27,7 @@ index 70af657f5..af953dda4 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7339e337b..883777223 100644 +index 127eaf1f6..d54116be3 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -169,6 +169,7 @@ public abstract class Entity implements ICommandListener { diff --git a/Spigot-Server-Patches/0203-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0202-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch similarity index 96% rename from Spigot-Server-Patches/0203-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch rename to Spigot-Server-Patches/0202-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch index b5292ac1e0..c435f72a89 100644 --- a/Spigot-Server-Patches/0203-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch +++ b/Spigot-Server-Patches/0202-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch @@ -1,4 +1,4 @@ -From 8347022cb32d2db6581062434ad5b4027a6344a2 Mon Sep 17 00:00:00 2001 +From 53b33dabf7c456a0ee1f75cc4d9fe969aea5924a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 23 Jan 2017 15:10:25 -0600 Subject: [PATCH] Do not allow a zero max height in BiomeJungle diff --git a/Spigot-Server-Patches/0204-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0203-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 98% rename from Spigot-Server-Patches/0204-Remove-CraftScheduler-Async-Task-Debugger.patch rename to Spigot-Server-Patches/0203-Remove-CraftScheduler-Async-Task-Debugger.patch index 598542f8a9..e7a53bab85 100644 --- a/Spigot-Server-Patches/0204-Remove-CraftScheduler-Async-Task-Debugger.patch +++ b/Spigot-Server-Patches/0203-Remove-CraftScheduler-Async-Task-Debugger.patch @@ -1,4 +1,4 @@ -From e900c91cb908ebd1d4ea8e794a8eae011817b56d Mon Sep 17 00:00:00 2001 +From 4e9998b19a31e7b48e641f3db9d437d96b4d5790 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 00:04:04 -0500 Subject: [PATCH] Remove CraftScheduler Async Task Debugger diff --git a/Spigot-Server-Patches/0205-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0204-Shame-on-you-Mojang.patch similarity index 97% rename from Spigot-Server-Patches/0205-Shame-on-you-Mojang.patch rename to Spigot-Server-Patches/0204-Shame-on-you-Mojang.patch index 3fdc30858e..bb4f2f018b 100644 --- a/Spigot-Server-Patches/0205-Shame-on-you-Mojang.patch +++ b/Spigot-Server-Patches/0204-Shame-on-you-Mojang.patch @@ -1,4 +1,4 @@ -From 8977f9030e587bde981819fe3d98de12f20b9f52 Mon Sep 17 00:00:00 2001 +From 12d933a78e41845689f6b174868b277f58ec1deb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 19:17:28 -0500 Subject: [PATCH] Shame on you Mojang diff --git a/Spigot-Server-Patches/0206-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0205-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch similarity index 94% rename from Spigot-Server-Patches/0206-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch rename to Spigot-Server-Patches/0205-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index 1f88a5980a..b5c48418ed 100644 --- a/Spigot-Server-Patches/0206-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/Spigot-Server-Patches/0205-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -1,4 +1,4 @@ -From 44eb22893b71a17924d64f097e0f0017b700074e Mon Sep 17 00:00:00 2001 +From fd4e63f204d092cb7a0aa33a2581e5043616840e Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 7 Feb 2017 16:55:35 -0600 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue diff --git a/Spigot-Server-Patches/0207-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch similarity index 96% rename from Spigot-Server-Patches/0207-Do-not-let-armorstands-drown.patch rename to Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch index 266bc3a7a1..e1a142220f 100644 --- a/Spigot-Server-Patches/0207-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0206-Do-not-let-armorstands-drown.patch @@ -1,4 +1,4 @@ -From 73392ce2b1ba0373336cc35cdddf20dffd927980 Mon Sep 17 00:00:00 2001 +From 701918eb9d15623a39667ee33c4b10a2866d2a52 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 18 Feb 2017 19:29:58 -0600 Subject: [PATCH] Do not let armorstands drown diff --git a/Spigot-Server-Patches/0208-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/0207-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch similarity index 94% rename from Spigot-Server-Patches/0208-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch rename to Spigot-Server-Patches/0207-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch index 582dff3519..bfebba3363 100644 --- a/Spigot-Server-Patches/0208-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch +++ b/Spigot-Server-Patches/0207-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch @@ -1,4 +1,4 @@ -From 08133ff898c0aa88964c4b9584089cc9ab44c107 Mon Sep 17 00:00:00 2001 +From e5fe65473512356abeff12a7b80fd82a3aaa2f58 Mon Sep 17 00:00:00 2001 From: kashike Date: Sun, 9 Apr 2017 23:50:15 -0700 Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack diff --git a/Spigot-Server-Patches/0209-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0208-Properly-handle-async-calls-to-restart-the-server.patch similarity index 99% rename from Spigot-Server-Patches/0209-Properly-handle-async-calls-to-restart-the-server.patch rename to Spigot-Server-Patches/0208-Properly-handle-async-calls-to-restart-the-server.patch index 067ab82a35..e4cd25c2b9 100644 --- a/Spigot-Server-Patches/0209-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0208-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From b181211ad3bd0a7823863febec582c4f38cb219e Mon Sep 17 00:00:00 2001 +From 7b1933c71d02d89958060b7f42de0f5c7c7adf68 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 12 May 2017 23:34:11 -0500 Subject: [PATCH] Properly handle async calls to restart the server diff --git a/Spigot-Server-Patches/0210-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0209-Add-system-property-to-disable-book-size-limits.patch similarity index 97% rename from Spigot-Server-Patches/0210-Add-system-property-to-disable-book-size-limits.patch rename to Spigot-Server-Patches/0209-Add-system-property-to-disable-book-size-limits.patch index 7c433775ab..1339e6102b 100644 --- a/Spigot-Server-Patches/0210-Add-system-property-to-disable-book-size-limits.patch +++ b/Spigot-Server-Patches/0209-Add-system-property-to-disable-book-size-limits.patch @@ -1,4 +1,4 @@ -From e0c1617d10bbfc473598b7e10abaccd1a1cc3086 Mon Sep 17 00:00:00 2001 +From fdbecbb8c146704e666c20c2bc295377d0991e09 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 13 May 2017 20:11:21 -0500 Subject: [PATCH] Add system property to disable book size limits diff --git a/Spigot-Server-Patches/0211-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0210-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 97% rename from Spigot-Server-Patches/0211-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to Spigot-Server-Patches/0210-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index aea862a8dd..28456e6544 100644 --- a/Spigot-Server-Patches/0211-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/Spigot-Server-Patches/0210-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -1,4 +1,4 @@ -From efc2c4c5cf777c6d3586b5edbb388853de234d86 Mon Sep 17 00:00:00 2001 +From a7a6064230e51b4e3861257a0e3c6c5402f80c32 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 16 May 2017 21:29:08 -0500 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement diff --git a/Spigot-Server-Patches/0212-Workaround-for-jansi-bug-with-Windows.patch b/Spigot-Server-Patches/0211-Workaround-for-jansi-bug-with-Windows.patch similarity index 93% rename from Spigot-Server-Patches/0212-Workaround-for-jansi-bug-with-Windows.patch rename to Spigot-Server-Patches/0211-Workaround-for-jansi-bug-with-Windows.patch index 3495df721c..2fd2250eea 100644 --- a/Spigot-Server-Patches/0212-Workaround-for-jansi-bug-with-Windows.patch +++ b/Spigot-Server-Patches/0211-Workaround-for-jansi-bug-with-Windows.patch @@ -1,4 +1,4 @@ -From 949514e1e5cf558538e8676bcf8c858034539483 Mon Sep 17 00:00:00 2001 +From 6e358e579628685730d344c55695e30694525cc0 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 17 May 2017 17:45:19 -0500 Subject: [PATCH] Workaround for jansi bug with Windows @@ -13,7 +13,7 @@ still keep our versions the same as they were, we set the override property to t Paper. This version is only used when extracting the libraries to their temp folder. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index dab983481..20902dc38 100644 +index 1cbcc3dfa..98e27fa25 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -182,6 +182,7 @@ public class Main {