diff --git a/Spigot-Server-Patches/0047-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch similarity index 84% rename from Spigot-Server-Patches/0047-Expose-server-CommandMap.patch rename to Spigot-Server-Patches/0046-Expose-server-CommandMap.patch index 3cc344db41..158af0ac92 100644 --- a/Spigot-Server-Patches/0047-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From ca40b8f0e7782f5420e2b34e547198bc47ce6438 Mon Sep 17 00:00:00 2001 +From 7b1c27b9b534e8a68fb8a302f8bcb1488c990875 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:15:57 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6c595a4c84..28decd9e75 100644 +index 7f1620906c..5a745c76ad 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1582,6 +1582,7 @@ public final class CraftServer implements Server { @@ -17,5 +17,5 @@ index 6c595a4c84..28decd9e75 100644 return commandMap; } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch deleted file mode 100644 index 34fe2ba8ab..0000000000 --- a/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2df54f8c27684d8dd223458fe8beb207489b9aa4 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Thu, 3 Mar 2016 02:02:07 -0600 -Subject: [PATCH] Optimize Pathfinding - -Prevents pathfinding from spamming failures for things such as -arrow attacks. - -diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 49b27c4310..75e01c2420 100644 ---- a/src/main/java/net/minecraft/server/NavigationAbstract.java -+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java -@@ -118,10 +118,26 @@ public abstract class NavigationAbstract { - } - - public boolean a(Entity entity, double d0) { -+ // Paper start - Pathfinding optimizations -+ if (this.pathfindFailures > 10 && this.c == null && MinecraftServer.currentTick < this.lastFailure + 40) { -+ return false; -+ } -+ - PathEntity pathentity = this.a(entity); - -- return pathentity != null && this.a(pathentity, d0); -+ if (pathentity != null && this.a(pathentity, d0)) { -+ this.lastFailure = 0; -+ this.pathfindFailures = 0; -+ return true; -+ } else { -+ this.pathfindFailures++; -+ this.lastFailure = MinecraftServer.currentTick; -+ return false; -+ } - } -+ private int lastFailure = 0; -+ private int pathfindFailures = 0; -+ // Paper end - - public boolean a(@Nullable PathEntity pathentity, double d0) { - if (pathentity == null) { -@@ -233,6 +249,7 @@ public abstract class NavigationAbstract { - } - - public void o() { -+ this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations - this.c = null; - } - --- -2.21.0 - diff --git a/Spigot-Server-Patches/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 94% rename from Spigot-Server-Patches/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch rename to Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch index 04f14a60f3..56d04d05dd 100644 --- a/Spigot-Server-Patches/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -1,4 +1,4 @@ -From 0584b5fc1984c1b5d3bde9f0de6ce437514138d3 Mon Sep 17 00:00:00 2001 +From f9531fb0b9e20cc195b415bf63ba04f5f7c29ed3 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:18:39 -0600 Subject: [PATCH] Be a bit more informative in maxHealth exception @@ -21,5 +21,5 @@ index 2e007d4ffc..82b3c0a7de 100644 getHandle().setHealth((float) health); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0049-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch similarity index 99% rename from Spigot-Server-Patches/0049-Player-Tab-List-and-Title-APIs.patch rename to Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch index 947382eafc..f59bc6e6cb 100644 --- a/Spigot-Server-Patches/0049-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From d17dab532a462b6b3b0e9d27c213e61b4df54141 Mon Sep 17 00:00:00 2001 +From e3b7c7b79f0a486813a8d148e919771c456bb9f9 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 02:32:10 -0600 Subject: [PATCH] Player Tab List and Title APIs diff --git a/Spigot-Server-Patches/0050-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch similarity index 93% rename from Spigot-Server-Patches/0050-Ensure-inv-drag-is-in-bounds.patch rename to Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch index 4a31afa485..47a02c5f1a 100644 --- a/Spigot-Server-Patches/0050-Ensure-inv-drag-is-in-bounds.patch +++ b/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch @@ -1,4 +1,4 @@ -From c639bec16cc54169797c3fd06597324b71792c9b Mon Sep 17 00:00:00 2001 +From 7faee6b12019d2729f6714e3c97c8e5baa2aef99 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:33:53 -0600 Subject: [PATCH] Ensure inv drag is in bounds @@ -18,5 +18,5 @@ index 5cebc7506f..b4fcab4f08 100644 itemstack1 = playerinventory.getCarried(); if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.i.size()) && this.b(slot)) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0051-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch similarity index 90% rename from Spigot-Server-Patches/0051-Change-implementation-of-tile-entity-removal-list.patch rename to Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch index 036b248809..0ceeda706c 100644 --- a/Spigot-Server-Patches/0051-Change-implementation-of-tile-entity-removal-list.patch +++ b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch @@ -1,4 +1,4 @@ -From 55a8e5f7496f9d7819f01fbd2488b3c09ff32a15 Mon Sep 17 00:00:00 2001 +From 9b645dc69e99bc1f83333143abae570679e5b032 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:39:54 -0600 Subject: [PATCH] Change implementation of (tile)entity removal list @@ -6,7 +6,7 @@ Subject: [PATCH] Change implementation of (tile)entity removal list use sets for faster removal diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8d72146760..c4d476eb61 100644 +index 59c4fdbd9d..17d1dc93bc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -40,7 +40,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -19,5 +19,5 @@ index 8d72146760..c4d476eb61 100644 private final Thread serverThread; private int d; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0052-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch similarity index 96% rename from Spigot-Server-Patches/0052-Add-configurable-portal-search-radius.patch rename to Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch index 48e301bc14..368a89fc06 100644 --- a/Spigot-Server-Patches/0052-Add-configurable-portal-search-radius.patch +++ b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch @@ -1,4 +1,4 @@ -From b326377146ce4e61238d89e035cb52c8c7a5367e Mon Sep 17 00:00:00 2001 +From a09b0acbefadc0c24ef240451bee1984098a61f9 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:46:17 -0600 Subject: [PATCH] Add configurable portal search radius @@ -37,5 +37,5 @@ index 6552f9e25e..2f0a8e4bb6 100644 blockposition2 = blockposition3.down(); if (this.world.getType(blockposition3).getBlock() == PortalTravelAgent.b) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0053-Add-velocity-warnings.patch b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch similarity index 97% rename from Spigot-Server-Patches/0053-Add-velocity-warnings.patch rename to Spigot-Server-Patches/0052-Add-velocity-warnings.patch index a85a432300..b91be51df3 100644 --- a/Spigot-Server-Patches/0053-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch @@ -1,11 +1,11 @@ -From 4bf0a00095183386eafb31351d2a8fa6329fb22c Mon Sep 17 00:00:00 2001 +From 619562839dbcb3131940757679dc4ad75150b99f Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:48:12 -0600 Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 28decd9e75..6820c5a2c7 100644 +index 5a745c76ad..3b50a66bf6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -230,6 +230,7 @@ public final class CraftServer implements Server { @@ -88,5 +88,5 @@ index 70b187190f..56f5f54bd1 100644 log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log ); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0054-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch similarity index 97% rename from Spigot-Server-Patches/0054-Configurable-inter-world-teleportation-safety.patch rename to Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch index 17f2866d0a..2463b1f472 100644 --- a/Spigot-Server-Patches/0054-Configurable-inter-world-teleportation-safety.patch +++ b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch @@ -1,4 +1,4 @@ -From 68f778350062b11e8bc9c8ed3d28dc510d10f129 Mon Sep 17 00:00:00 2001 +From 6980d0f2a62012045490bdcba0fbbdd9d5e2978b Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Configurable inter-world teleportation safety diff --git a/Spigot-Server-Patches/0055-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch similarity index 99% rename from Spigot-Server-Patches/0055-Add-exception-reporting-event.patch rename to Spigot-Server-Patches/0054-Add-exception-reporting-event.patch index 49ed7a865b..ee31d362bf 100644 --- a/Spigot-Server-Patches/0055-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 3d3ad0b026a88bc8cb8403058596eeb4d9c482fe Mon Sep 17 00:00:00 2001 +From 2e9da15e3005f8d0b5628a9a60efd967505c0c03 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event diff --git a/Spigot-Server-Patches/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch similarity index 95% rename from Spigot-Server-Patches/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch rename to Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch index b2a7450fa5..f0d730a200 100644 --- a/Spigot-Server-Patches/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch +++ b/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch @@ -1,4 +1,4 @@ -From 3f93b7182493efb3ed6519d3ddd76458a175ccf5 Mon Sep 17 00:00:00 2001 +From e85e153d9c12b2d68bc3b5005a015cc0c4392305 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 18:28:43 -0800 Subject: [PATCH] Don't nest if we don't need to when cerealising text @@ -26,5 +26,5 @@ index fa4eab5b0b..0ab611564e 100644 packetdataserializer.a(this.a); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0057-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch similarity index 97% rename from Spigot-Server-Patches/0057-Disable-Scoreboards-for-non-players-by-default.patch rename to Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch index 8cc4fc7834..9261e23dbe 100644 --- a/Spigot-Server-Patches/0057-Disable-Scoreboards-for-non-players-by-default.patch +++ b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch @@ -1,4 +1,4 @@ -From dde42087398f92114c7ae967d6caf403e0e0649a Mon Sep 17 00:00:00 2001 +From bf39f6cb0640074c94979d20d689f918d54010d7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 8 Mar 2016 23:25:45 -0500 Subject: [PATCH] Disable Scoreboards for non players by default diff --git a/Spigot-Server-Patches/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 93% rename from Spigot-Server-Patches/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 7c845e656b..dd1e6aec16 100644 --- a/Spigot-Server-Patches/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,4 +1,4 @@ -From bcffc3889aaa4ea4fdaa2cad209edec37900fdf0 Mon Sep 17 00:00:00 2001 +From e17fd478da771d89e0b77adb036d3152650f0827 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities @@ -26,5 +26,5 @@ index 82b3c0a7de..aa50435bec 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0059-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch similarity index 98% rename from Spigot-Server-Patches/0059-Complete-resource-pack-API.patch rename to Spigot-Server-Patches/0058-Complete-resource-pack-API.patch index ef0cab5262..c7c7b52a82 100644 --- a/Spigot-Server-Patches/0059-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch @@ -1,4 +1,4 @@ -From 1d52cfde6af6ca1ad7481a70c38ef816cffedd8e Mon Sep 17 00:00:00 2001 +From 3429ac03afa9b65b7903b944b3bb4789abd980aa Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 23:17:52 -0400 Subject: [PATCH] Complete resource pack API diff --git a/Spigot-Server-Patches/0060-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch similarity index 97% rename from Spigot-Server-Patches/0060-Chunk-Save-Reattempt.patch rename to Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch index 7b774204b4..a3e2f94318 100644 --- a/Spigot-Server-Patches/0060-Chunk-Save-Reattempt.patch +++ b/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch @@ -1,4 +1,4 @@ -From 1eeb11e8a032025ea4bf2cd1e9b2b977138cc33f Mon Sep 17 00:00:00 2001 +From 73bc13803b289003e2a94fdc929696f601d6bd33 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Mar 2013 23:46:10 -0500 Subject: [PATCH] Chunk Save Reattempt @@ -51,5 +51,5 @@ index 84fe9ee3bf..1ea9e5bb43 100644 public void close() throws IOException { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch similarity index 96% rename from Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch rename to Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch index 9b4fbf6a7d..aca8559463 100644 --- a/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From 74454c98522a757f1b147b78a0183d6a5d237262 Mon Sep 17 00:00:00 2001 +From da0f17fb2714ce06e8911f004def7869fcb9b729 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:17:38 -0400 Subject: [PATCH] Default loading permissions.yml before plugins @@ -30,7 +30,7 @@ index 0c65afccfd..6cc99ffe43 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6820c5a2c7..b58c7c8e8f 100644 +index 3b50a66bf6..29a4b1da54 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -364,6 +364,7 @@ public final class CraftServer implements Server { @@ -51,5 +51,5 @@ index 6820c5a2c7..b58c7c8e8f 100644 syncCommands(); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch similarity index 93% rename from Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch rename to Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch index c3d4bd51b8..f306bd5283 100644 --- a/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From da88089bc0051a99ee9fac02d96b1c73a4c4c217 Mon Sep 17 00:00:00 2001 +From ac93c40a3941e664e02a4418a5de8f7e9f3cebfe Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:30:17 -0400 Subject: [PATCH] Allow Reloading of Custom Permissions @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0bdee28ce..707313a29 100644 +index 29a4b1da54..12dd89df53 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2042,5 +2042,23 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch similarity index 91% rename from Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch rename to Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch index 53eb582fae..4abe19cffb 100644 --- a/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From 287ac1f2fdcbcaa146decc4f3942fe2fddf43945 Mon Sep 17 00:00:00 2001 +From e112cf694da0e15b006292f4bef3d565ecb51ca8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:50:14 -0400 Subject: [PATCH] Remove Metadata on reload @@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 68a40c12a9..86aa2ad322 100644 +index 12dd89df53..2bd50c24b9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -795,8 +795,18 @@ public final class CraftServer implements Server { @@ -30,5 +30,5 @@ index 68a40c12a9..86aa2ad322 100644 reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0064-Undead-horse-leashing.patch b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch similarity index 93% rename from Spigot-Server-Patches/0064-Undead-horse-leashing.patch rename to Spigot-Server-Patches/0063-Undead-horse-leashing.patch index 34d77e7574..d377ad7cc6 100644 --- a/Spigot-Server-Patches/0064-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From fa9ee768fe0053f8efd4c56a0602257b9cb6e6b8 Mon Sep 17 00:00:00 2001 +From 1124538dbf20a006fbefe28d8b32c01c922f1f0c Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing @@ -20,7 +20,7 @@ index 30f0dcfd51..89556dc94a 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index e9f34c9307..8ce2fca806 100644 +index cb77d6bd21..b06bbc45cf 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -107,7 +107,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -33,5 +33,5 @@ index e9f34c9307..8ce2fca806 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0065-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch similarity index 99% rename from Spigot-Server-Patches/0065-Handle-Item-Meta-Inconsistencies.patch rename to Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch index d0efc6166f..83dddaac4e 100644 --- a/Spigot-Server-Patches/0065-Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch @@ -1,4 +1,4 @@ -From aba2d029dbaec1d8e11c61da99edb1071ad5789b Mon Sep 17 00:00:00 2001 +From 540bb9cd246f495c0379159c356ac08a06d804eb Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies @@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the ItemMeta API equivalents, and should deprecate the old API's. diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index aa6a58dd88..b643a41235 100644 +index 7bcc723998..5bc078d314 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader; @@ -78,7 +78,7 @@ index aa6a58dd88..b643a41235 100644 public boolean hasEnchantments() { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 5d71addb0c..00497350a3 100644 +index 4eb7438f25..f2f4c8d3c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -178,28 +178,11 @@ public final class CraftItemStack extends ItemStack { @@ -330,5 +330,5 @@ index 7c8b515bc2..bf7b226a4f 100644 private final Spigot spigot = new Spigot() { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 95% rename from Spigot-Server-Patches/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch index effc25bdf9..efe348fec8 100644 --- a/Spigot-Server-Patches/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 86ee99f8cce0c5291cc0508e3cba1a6bd873f574 Mon Sep 17 00:00:00 2001 +From a687e853d07ababb34e545ed49d5148d70209cbe Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 15:12:22 -0400 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate @@ -30,7 +30,7 @@ index 89556dc94a..98049567f4 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 5c516021e4..28fc512bab 100644 +index 2c0034cf76..44ea39e3d1 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -263,7 +263,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -43,5 +43,5 @@ index 5c516021e4..28fc512bab 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0067-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch similarity index 96% rename from Spigot-Server-Patches/0067-Add-World-Util-Methods.patch rename to Spigot-Server-Patches/0066-Add-World-Util-Methods.patch index a860c801fa..78d699e536 100644 --- a/Spigot-Server-Patches/0067-Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From ecf07402a6cf461d882e54488f70b7c58546d395 Mon Sep 17 00:00:00 2001 +From 157c060e8b929f22ff86400308741af965a75ddc Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 20:16:03 -0400 Subject: [PATCH] Add World Util Methods @@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 9b65972569..fba176745f 100644 +index ec64391a4a..4aaf20dfcb 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -371,6 +371,7 @@ public class Chunk implements IChunkAccess { @@ -18,7 +18,7 @@ index 9b65972569..fba176745f 100644 return this.a(blockposition, i, this.world.getWorldProvider().g()); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b4ed1e4435..f06b7047a0 100644 +index f3f10ca60e..769d59271a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -46,7 +46,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -86,7 +86,7 @@ index b4ed1e4435..f06b7047a0 100644 return this.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4); } diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index 94d1c2be11..77b805f3ae 100644 +index 4cf31207e0..1388610a7b 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -19,6 +19,7 @@ public class WorldBorder { @@ -98,5 +98,5 @@ index 94d1c2be11..77b805f3ae 100644 return (double) (blockposition.getX() + 1) > this.c() && (double) blockposition.getX() < this.e() && (double) (blockposition.getZ() + 1) > this.d() && (double) blockposition.getZ() < this.f(); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch similarity index 97% rename from Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch rename to Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch index c55d02f22a..697bb2eded 100644 --- a/Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch @@ -1,4 +1,4 @@ -From d5041d93476ed1f9f670c659ded86491a9527d7b Mon Sep 17 00:00:00 2001 +From 8f8be849cf05bfb4adbb69d9946489c33b770ffc Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:07:20 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/Spigot-Server-Patches/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 97% rename from Spigot-Server-Patches/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 722e43ad68..7debaef390 100644 --- a/Spigot-Server-Patches/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,4 +1,4 @@ -From 981ffa42e50a7095946db729a10e3245920bc903 Mon Sep 17 00:00:00 2001 +From 37a4d63b60bde00f515935ca5b79e9fb60c4527f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/Spigot-Server-Patches/0070-Waving-banner-workaround.patch b/Spigot-Server-Patches/0069-Waving-banner-workaround.patch similarity index 94% rename from Spigot-Server-Patches/0070-Waving-banner-workaround.patch rename to Spigot-Server-Patches/0069-Waving-banner-workaround.patch index 89e1da64e5..742d3e3a85 100644 --- a/Spigot-Server-Patches/0070-Waving-banner-workaround.patch +++ b/Spigot-Server-Patches/0069-Waving-banner-workaround.patch @@ -1,4 +1,4 @@ -From f63f2f065b74e3496736bb7744f98c9c4760e85d Mon Sep 17 00:00:00 2001 +From a66d2f0673a55577a9b59460106869d3de2409f3 Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 19 Mar 2016 22:25:11 +0100 Subject: [PATCH] Waving banner workaround @@ -34,5 +34,5 @@ index 88c3d7efaf..15af5927f3 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0071-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch similarity index 94% rename from Spigot-Server-Patches/0071-Use-a-Shared-Random-for-Entities.patch rename to Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch index 3cc281b36a..70b51a050c 100644 --- a/Spigot-Server-Patches/0071-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From 5fecba3db5c27e2e84a44844d31925520b6c2e2e Mon Sep 17 00:00:00 2001 +From 5bb81d3a9a3dcc78fc00d4c1b487d6b827df3578 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:33:47 -0400 Subject: [PATCH] Use a Shared Random for Entities @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3d739c4316..ec57b0ad8f 100644 +index 39ca7d5870..865dfa2b05 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -54,6 +54,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -40,5 +40,5 @@ index 3d739c4316..ec57b0ad8f 100644 this.justCreated = true; this.uniqueID = MathHelper.a(this.random); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0072-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 95% rename from Spigot-Server-Patches/0072-Configurable-spawn-chances-for-skeleton-horses.patch rename to Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch index 766a21d784..7bee04780a 100644 --- a/Spigot-Server-Patches/0072-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,4 +1,4 @@ -From 246374c9fd3be8f68807b6de904eb12e31ad53ee Mon Sep 17 00:00:00 2001 +From 317afc73fa8b1b25148f5a5743024957fb3ceb0f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses @@ -22,7 +22,7 @@ index 98049567f4..2a71381dae 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2ed2cb8935..cefe8340d4 100644 +index 2895b50915..b5ff34443c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -388,7 +388,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0073-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch similarity index 95% rename from Spigot-Server-Patches/0073-Optimize-isValidLocation-getType-and-getBlockData-fo.patch rename to Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 57d5bb9662..0a0a24b04c 100644 --- a/Spigot-Server-Patches/0073-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -1,4 +1,4 @@ -From 1e467dc2623f673dff4cf5fe4849bdef81bc2ac4 Mon Sep 17 00:00:00 2001 +From de45b3395d8c937c9c5a38717db7edda3f800c6a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:07:55 -0600 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling @@ -31,7 +31,7 @@ index 2852a17f23..7cb46d7a9c 100644 public BaseBlockPosition(int i, int j, int k) { this.a = i; diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index b56a044b3a..edd60a3d7f 100644 +index 2613de6624..2eabaaeba2 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -52,7 +52,7 @@ index b56a044b3a..edd60a3d7f 100644 public MutableBlockPosition() { this(0, 0, 0); diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index fba176745f..d06e8dbc11 100644 +index 4aaf20dfcb..591c823b39 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -203,12 +203,24 @@ public class Chunk implements IChunkAccess { @@ -85,7 +85,7 @@ index fba176745f..d06e8dbc11 100644 IBlockData iblockdata = null; diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 30701fd7f3..43f75fc837 100644 +index f4605e3937..c4c181c1d5 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -9,7 +9,7 @@ public class ChunkSection { @@ -98,7 +98,7 @@ index 30701fd7f3..43f75fc837 100644 public ChunkSection(int i) { this(i, (short) 0, (short) 0, (short) 0); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f06b7047a0..4ec6a860d5 100644 +index 769d59271a..822db5d4c0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -197,11 +197,11 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -116,5 +116,5 @@ index f06b7047a0..4ec6a860d5 100644 public static boolean b(int i) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0074-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch similarity index 96% rename from Spigot-Server-Patches/0074-Access-items-by-EquipmentSlot.patch rename to Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch index 1ce2a084a3..f431b1357a 100644 --- a/Spigot-Server-Patches/0074-Access-items-by-EquipmentSlot.patch +++ b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch @@ -1,4 +1,4 @@ -From 1b2a490f9d808c712e3e9d4f77e8e343a7272a85 Mon Sep 17 00:00:00 2001 +From 5074a41f7e90ce1a86a80067537d44d94eb76017 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:45:01 -0400 Subject: [PATCH] Access items by EquipmentSlot @@ -64,5 +64,5 @@ index 5873b76236..ef4cd7a7b6 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 98% rename from Spigot-Server-Patches/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index 5a6613160c..ebece3e3e0 100644 --- a/Spigot-Server-Patches/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -1,4 +1,4 @@ -From 70f9f02b2648c15e8a214e5ac8d0647bfd9afc25 Mon Sep 17 00:00:00 2001 +From 9c9058dddd0f28532ee7dd70b53b47f330ac8a6d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener diff --git a/Spigot-Server-Patches/0076-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 95% rename from Spigot-Server-Patches/0076-Entity-AddTo-RemoveFrom-World-Events.patch rename to Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch index 1aca0d8be7..5d552f54d0 100644 --- a/Spigot-Server-Patches/0076-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,4 +1,4 @@ -From 6d05403d0e84f2b76bc5a0824f0a7c05890d08be Mon Sep 17 00:00:00 2001 +From 0a45d9187c646b7b0fa332fcd3e9385cfe607950 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:32:58 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/Spigot-Server-Patches/0077-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch similarity index 95% rename from Spigot-Server-Patches/0077-Configurable-Chunk-Inhabited-Time.patch rename to Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch index 123ec9cf02..cab7df6603 100644 --- a/Spigot-Server-Patches/0077-Configurable-Chunk-Inhabited-Time.patch +++ b/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch @@ -1,4 +1,4 @@ -From e0f769ea12c51efaaabab602dd595c0d16b922c0 Mon Sep 17 00:00:00 2001 +From 99d5651836848cb09b7cce734a3b374a8990faa6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Time @@ -35,7 +35,7 @@ index 2a71381dae..e43866991c 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index d06e8dbc11..f9b6970ae6 100644 +index 591c823b39..3d366ddeb2 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -839,7 +839,7 @@ public class Chunk implements IChunkAccess { @@ -48,5 +48,5 @@ index d06e8dbc11..f9b6970ae6 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0078-EntityPathfindEvent.patch b/Spigot-Server-Patches/0077-EntityPathfindEvent.patch similarity index 97% rename from Spigot-Server-Patches/0078-EntityPathfindEvent.patch rename to Spigot-Server-Patches/0077-EntityPathfindEvent.patch index 28770134b4..40f5770470 100644 --- a/Spigot-Server-Patches/0078-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0077-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From 3f79320ddf65e87431feaf8e92b1bb636425c970 Mon Sep 17 00:00:00 2001 +From 59ebe95337d3e98711219afb2c04a22a213cd3f0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:22:26 -0400 Subject: [PATCH] EntityPathfindEvent @@ -19,7 +19,7 @@ index 04ccf141ce..e15728668e 100644 private int t() { diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 81dd8e4e89..130367099b 100644 +index 4a03bd9800..a9f17b0318 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -4,7 +4,7 @@ import javax.annotation.Nullable; diff --git a/Spigot-Server-Patches/0079-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0078-Reduce-IO-ops-opening-a-new-region-file.patch similarity index 96% rename from Spigot-Server-Patches/0079-Reduce-IO-ops-opening-a-new-region-file.patch rename to Spigot-Server-Patches/0078-Reduce-IO-ops-opening-a-new-region-file.patch index 013b7461f1..34c8a89cf7 100644 --- a/Spigot-Server-Patches/0079-Reduce-IO-ops-opening-a-new-region-file.patch +++ b/Spigot-Server-Patches/0078-Reduce-IO-ops-opening-a-new-region-file.patch @@ -1,4 +1,4 @@ -From acd3e26def5fdb90fad703740cd0c0a13ebe01cc Mon Sep 17 00:00:00 2001 +From 4ead0796d388d19e14fc45a702d0570797808c03 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 06:56:23 +0300 Subject: [PATCH] Reduce IO ops opening a new region file. @@ -48,5 +48,5 @@ index b062a31c49..4e6288e8bb 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0080-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0079-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 96% rename from Spigot-Server-Patches/0080-Sanitise-RegionFileCache-and-make-configurable.patch rename to Spigot-Server-Patches/0079-Sanitise-RegionFileCache-and-make-configurable.patch index 999522c753..630d13c5d0 100644 --- a/Spigot-Server-Patches/0080-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/Spigot-Server-Patches/0079-Sanitise-RegionFileCache-and-make-configurable.patch @@ -1,4 +1,4 @@ -From b32630a53238ec990917332b269e5e15d870be5a Mon Sep 17 00:00:00 2001 +From 2b336ee13e884d9e79c97336dc94df744ba71abe Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 08:22:55 +0300 Subject: [PATCH] Sanitise RegionFileCache and make configurable. @@ -46,5 +46,5 @@ index 1ea9e5bb43..21b3b06f53 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0081-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0080-Use-Optimized-Collections.patch similarity index 96% rename from Spigot-Server-Patches/0081-Use-Optimized-Collections.patch rename to Spigot-Server-Patches/0080-Use-Optimized-Collections.patch index 61cd064aaa..d65145b7bd 100644 --- a/Spigot-Server-Patches/0081-Use-Optimized-Collections.patch +++ b/Spigot-Server-Patches/0080-Use-Optimized-Collections.patch @@ -1,4 +1,4 @@ -From fe0cfb0c3d84367a65cc2282c8ed790440752c85 Mon Sep 17 00:00:00 2001 +From 7d21779eafcbb18471dbd1ac5e8c16ca633be01c Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 02:13:24 -0400 Subject: [PATCH] Use Optimized Collections @@ -34,5 +34,5 @@ index 79a240cd1d..f224043d8e 100644 private boolean f = true; private boolean g; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0082-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0081-Do-not-load-chunks-for-Pathfinding.patch similarity index 97% rename from Spigot-Server-Patches/0082-Do-not-load-chunks-for-Pathfinding.patch rename to Spigot-Server-Patches/0081-Do-not-load-chunks-for-Pathfinding.patch index 207ae0c387..9669d97a99 100644 --- a/Spigot-Server-Patches/0082-Do-not-load-chunks-for-Pathfinding.patch +++ b/Spigot-Server-Patches/0081-Do-not-load-chunks-for-Pathfinding.patch @@ -1,4 +1,4 @@ -From 0561a9cc504b319165917e673bab35c082d38675 Mon Sep 17 00:00:00 2001 +From ccce787782826e77e8f33819ff36465866a59e67 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for Pathfinding @@ -27,7 +27,7 @@ index ccbc1dde09..34e743716b 100644 @Override diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index d04eb1bbfe..ed69eaa176 100644 +index a9f17b0318..8b05b8acd8 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -22,7 +22,7 @@ public abstract class NavigationAbstract { @@ -53,7 +53,7 @@ index 359d9a11c0..262fa55850 100644 public Pathfinder(PathfinderAbstract pathfinderabstract, int i) { this.e = pathfinderabstract; diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index d97166f8f0..0cea9db8f5 100644 +index 593f13af49..80fcb66e3e 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -355,7 +355,8 @@ public class PathfinderNormal extends PathfinderAbstract { @@ -90,5 +90,5 @@ index d97166f8f0..0cea9db8f5 100644 Material material = iblockdata.getMaterial(); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0083-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0082-Do-not-load-chunks-for-light-checks.patch similarity index 90% rename from Spigot-Server-Patches/0083-Do-not-load-chunks-for-light-checks.patch rename to Spigot-Server-Patches/0082-Do-not-load-chunks-for-light-checks.patch index 86ea3f500d..e98fb8ef66 100644 --- a/Spigot-Server-Patches/0083-Do-not-load-chunks-for-light-checks.patch +++ b/Spigot-Server-Patches/0082-Do-not-load-chunks-for-light-checks.patch @@ -1,4 +1,4 @@ -From 5b1559f6ef3ec33496ce0dbed539a3b0e2ef39f2 Mon Sep 17 00:00:00 2001 +From 32de69162e7f552d0a6f307b2152ebe10cd7b1db Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for light checks @@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c8a859d7ba..6f9c35cd18 100644 +index 93a061b6b2..2878370b02 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -592,6 +592,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -19,5 +19,5 @@ index c8a859d7ba..6f9c35cd18 100644 return this.getChunkAtWorldCoords(blockposition).a(blockposition, i); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0084-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0083-Add-PlayerUseUnknownEntityEvent.patch similarity index 94% rename from Spigot-Server-Patches/0084-Add-PlayerUseUnknownEntityEvent.patch rename to Spigot-Server-Patches/0083-Add-PlayerUseUnknownEntityEvent.patch index 4080164f87..b9b4c81562 100644 --- a/Spigot-Server-Patches/0084-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0083-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From 20a7f6b9e421002521fdd59fbb2a9f7d6e989fa5 Mon Sep 17 00:00:00 2001 +From 4b155f15b82fed071c998c7a7f94cc626a48473f Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:09:16 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent @@ -18,7 +18,7 @@ index 680adbdeb0..3f7697b39c 100644 private Vec3D c; private EnumHand d; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f8aa8b1405..545e18b8f3 100644 +index e4a273dbe2..41a6204022 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1926,6 +1926,16 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -39,5 +39,5 @@ index f8aa8b1405..545e18b8f3 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0085-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0084-Fix-reducedDebugInfo-not-initialized-on-client.patch similarity index 94% rename from Spigot-Server-Patches/0085-Fix-reducedDebugInfo-not-initialized-on-client.patch rename to Spigot-Server-Patches/0084-Fix-reducedDebugInfo-not-initialized-on-client.patch index 9cee8dd44f..02665fa3b8 100644 --- a/Spigot-Server-Patches/0085-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0084-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,4 +1,4 @@ -From 95ca52c5dcfff825afa02b18d9216d0db8ff4837 Mon Sep 17 00:00:00 2001 +From 7b48935e8080f1a2ecc44b302019c446f1d386a0 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 20:37:03 -0400 Subject: [PATCH] Fix reducedDebugInfo not initialized on client diff --git a/Spigot-Server-Patches/0086-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0085-Configurable-Grass-Spread-Tick-Rate.patch similarity index 96% rename from Spigot-Server-Patches/0086-Configurable-Grass-Spread-Tick-Rate.patch rename to Spigot-Server-Patches/0085-Configurable-Grass-Spread-Tick-Rate.patch index 7ee19bc076..344053962d 100644 --- a/Spigot-Server-Patches/0086-Configurable-Grass-Spread-Tick-Rate.patch +++ b/Spigot-Server-Patches/0085-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,4 +1,4 @@ -From 167e5b20a7031271608150dbc2fa98f443b68828 Mon Sep 17 00:00:00 2001 +From eed0be3ec997ddf96892c2eaca81e22a47e21135 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 16:28:17 -0400 Subject: [PATCH] Configurable Grass Spread Tick Rate @@ -32,5 +32,5 @@ index ddca19b46b..377a57c89a 100644 if (!b(iblockdata, (IWorldReader) world, blockposition)) { // CraftBukkit start -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 88% rename from Spigot-Server-Patches/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to Spigot-Server-Patches/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index 77c4e28bb2..a440dd4259 100644 --- a/Spigot-Server-Patches/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,11 +1,11 @@ -From 43528bb410958a6df8a745ee9478b533d7fd6b7f Mon Sep 17 00:00:00 2001 +From ba156592cd5a6108470ade8575dfa3197fd14969 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 17:48:50 -0400 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6f9c35cd18..40757fc7a2 100644 +index 2878370b02..cde463c5a5 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -510,6 +510,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -17,5 +17,5 @@ index 6f9c35cd18..40757fc7a2 100644 this.a(blockposition.east(), block, blockposition); this.a(blockposition.down(), block, blockposition); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0088-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0087-Remove-Debug-checks-from-DataBits.patch similarity index 96% rename from Spigot-Server-Patches/0088-Remove-Debug-checks-from-DataBits.patch rename to Spigot-Server-Patches/0087-Remove-Debug-checks-from-DataBits.patch index e323f5718b..96c2bf9a7c 100644 --- a/Spigot-Server-Patches/0088-Remove-Debug-checks-from-DataBits.patch +++ b/Spigot-Server-Patches/0087-Remove-Debug-checks-from-DataBits.patch @@ -1,4 +1,4 @@ -From 65fb379ec37d63e7411e9bc0ec15a257ae1d940b Mon Sep 17 00:00:00 2001 +From db48c9962e15f3db9990a7c37086dd5329bc013e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 21:38:58 -0400 Subject: [PATCH] Remove Debug checks from DataBits @@ -53,5 +53,5 @@ index 409dc837c6..4194acc8b9 100644 int k = j >> 6; int l = (i + 1) * this.b - 1 >> 6; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 96% rename from Spigot-Server-Patches/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to Spigot-Server-Patches/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index 2b9c5dca9f..c843dad0a9 100644 --- a/Spigot-Server-Patches/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -1,4 +1,4 @@ -From e395de729b0e3ffe6f736f52ce0f2a342c0065c4 Mon Sep 17 00:00:00 2001 +From 8efc844d4ce68b3300fdc8f67a64e94f222fe277 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 6 Apr 2016 01:04:23 -0500 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names @@ -26,7 +26,7 @@ index 59d11e68c9..1da7ffab5d 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 545e18b8f3..e88abe1d05 100644 +index 41a6204022..bbc5acd7fe 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1660,7 +1660,16 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -48,7 +48,7 @@ index 545e18b8f3..e88abe1d05 100644 if (((LazyPlayerSet) event.getRecipients()).isLazy()) { for (Object recipient : minecraftServer.getPlayerList().players) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 66f4691918..779117b5db 100644 +index cce5305fbe..d368b39751 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -177,7 +177,7 @@ public abstract class PlayerList { @@ -61,5 +61,5 @@ index 66f4691918..779117b5db 100644 playerconnection.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch); this.players.add(entityplayer); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0090-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0089-Workaround-for-setting-passengers-on-players.patch similarity index 94% rename from Spigot-Server-Patches/0090-Workaround-for-setting-passengers-on-players.patch rename to Spigot-Server-Patches/0089-Workaround-for-setting-passengers-on-players.patch index e6315ccdb6..c3eb35f862 100644 --- a/Spigot-Server-Patches/0090-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0089-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From f21f5724ba148e88b8e363592282ac48d8bdf0a0 Mon Sep 17 00:00:00 2001 +From 9a32c010911a6ffe57cb6d8c3a2e9f5c0c05a855 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players diff --git a/Spigot-Server-Patches/0091-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0090-Remove-unused-World-Tile-Entity-List.patch similarity index 97% rename from Spigot-Server-Patches/0091-Remove-unused-World-Tile-Entity-List.patch rename to Spigot-Server-Patches/0090-Remove-unused-World-Tile-Entity-List.patch index c6f3105f5c..bfedbb52f1 100644 --- a/Spigot-Server-Patches/0091-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0090-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From 37f98342c94d77f35e3f46f6effe40755cd36c53 Mon Sep 17 00:00:00 2001 +From fed3d57aa296361eb8c18936c92dfaf460b47240 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:25:28 -0400 Subject: [PATCH] Remove unused World Tile Entity List @@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List Massive hit to performance and it is completely unnecessary. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 40757fc7a2..ce710c730d 100644 +index cde463c5a5..f6cb4d45eb 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -40,7 +40,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -67,5 +67,5 @@ index 40757fc7a2..ce710c730d 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0092-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0091-Don-t-tick-Skulls-unused-code.patch similarity index 93% rename from Spigot-Server-Patches/0092-Don-t-tick-Skulls-unused-code.patch rename to Spigot-Server-Patches/0091-Don-t-tick-Skulls-unused-code.patch index 37a9f4b36d..16a82db5db 100644 --- a/Spigot-Server-Patches/0092-Don-t-tick-Skulls-unused-code.patch +++ b/Spigot-Server-Patches/0091-Don-t-tick-Skulls-unused-code.patch @@ -1,4 +1,4 @@ -From 401b647fb3a5dfb26cb51e184881fbefbcc68166 Mon Sep 17 00:00:00 2001 +From 0025a3bfd3735ff7afba0a6cad766d6cc7f63853 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:30:10 -0400 Subject: [PATCH] Don't tick Skulls - unused code @@ -27,5 +27,5 @@ index 99442bb130..177cceb77f 100644 Block block = this.getBlock().getBlock(); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0093-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0092-Configurable-Player-Collision.patch similarity index 98% rename from Spigot-Server-Patches/0093-Configurable-Player-Collision.patch rename to Spigot-Server-Patches/0092-Configurable-Player-Collision.patch index 3f6b3b58fd..90e9c994d6 100644 --- a/Spigot-Server-Patches/0093-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0092-Configurable-Player-Collision.patch @@ -1,4 +1,4 @@ -From e74d304c76e68157f46252480a0f8fe71fbf2831 Mon Sep 17 00:00:00 2001 +From effe1e7b1ad8af4be3337ade2fcb8f16949a5463 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision @@ -19,7 +19,7 @@ index 0cef1853f5..dc3438890b 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4e1c03a78c..f88e42423d 100644 +index a87df2b6fb..ccfe1b4c3e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -436,6 +436,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 13 Apr 2016 20:21:38 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -45,5 +45,5 @@ index 756330a6ca..66dda900b6 100644 if ( split.length == 3 || split.length == 4 ) { packethandshakinginsetprotocol.hostname = split[0]; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0095-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0094-Configurable-RCON-IP-address.patch similarity index 97% rename from Spigot-Server-Patches/0095-Configurable-RCON-IP-address.patch rename to Spigot-Server-Patches/0094-Configurable-RCON-IP-address.patch index 2d6efb578e..456949892e 100644 --- a/Spigot-Server-Patches/0095-Configurable-RCON-IP-address.patch +++ b/Spigot-Server-Patches/0094-Configurable-RCON-IP-address.patch @@ -1,4 +1,4 @@ -From c6160c0127f6f9c500436f60fb870912b979635a Mon Sep 17 00:00:00 2001 +From dac290fc1064262ef182ff4588e2785ac711b11c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Apr 2016 00:39:33 -0400 Subject: [PATCH] Configurable RCON IP address @@ -58,5 +58,5 @@ index e48d6dcd74..2ce490be00 100644 this.i = "0.0.0.0"; } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0096-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0095-Prevent-Fire-from-loading-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0096-Prevent-Fire-from-loading-chunks.patch rename to Spigot-Server-Patches/0095-Prevent-Fire-from-loading-chunks.patch index 6ce1a00680..b94446646e 100644 --- a/Spigot-Server-Patches/0096-Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0095-Prevent-Fire-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From b2ffa4ad258408e863f989014361e286f3679fcf Mon Sep 17 00:00:00 2001 +From 4780e1505f743eb1526bbcec50fe2335e97f03a9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Apr 2016 17:27:09 -0400 Subject: [PATCH] Prevent Fire from loading chunks @@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall bad behavior. diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index 8645a0ebd0..f769df41a6 100644 +index 81e9717ae5..49e3d7284b 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -163,6 +163,7 @@ public class BlockFire extends Block { @@ -53,5 +53,5 @@ index 8645a0ebd0..f769df41a6 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0096-Implement-PlayerLocaleChangeEvent.patch similarity index 98% rename from Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch rename to Spigot-Server-Patches/0096-Implement-PlayerLocaleChangeEvent.patch index 5a11417eda..eb0f32b5b5 100644 --- a/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0096-Implement-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From f614a869a397b63bc5321e076ab70267ef518974 Mon Sep 17 00:00:00 2001 +From ce568e38db92b01e6d6d0ebbc36065948e7dd780 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/Spigot-Server-Patches/0098-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0097-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 93% rename from Spigot-Server-Patches/0098-EntityRegainHealthEvent-isFastRegen-API.patch rename to Spigot-Server-Patches/0097-EntityRegainHealthEvent-isFastRegen-API.patch index bd5ec5847c..087c54695c 100644 --- a/Spigot-Server-Patches/0098-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0097-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From 9f684fa2b4e5cc51d181450346102dcf8ce452d7 Mon Sep 17 00:00:00 2001 +From e8835e988373b740a16bfb2a83ba9318a2f531b7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API Don't even get me started diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index d202d3d65f..5622c08f19 100644 +index 18e152b8fb..45c024ca24 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -969,10 +969,16 @@ public abstract class EntityLiving extends Entity { @@ -28,7 +28,7 @@ index d202d3d65f..5622c08f19 100644 if (this.valid) { this.world.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java -index da07530d99..d184422fbe 100644 +index 739b8fd189..28b04f35e6 100644 --- a/src/main/java/net/minecraft/server/FoodMetaData.java +++ b/src/main/java/net/minecraft/server/FoodMetaData.java @@ -69,7 +69,7 @@ public class FoodMetaData { @@ -41,5 +41,5 @@ index da07530d99..d184422fbe 100644 this.foodTickTimer = 0; } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0099-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0098-Add-ability-to-configure-frosted_ice-properties.patch similarity index 97% rename from Spigot-Server-Patches/0099-Add-ability-to-configure-frosted_ice-properties.patch rename to Spigot-Server-Patches/0098-Add-ability-to-configure-frosted_ice-properties.patch index 27b31e323f..b70656aa08 100644 --- a/Spigot-Server-Patches/0099-Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/0098-Add-ability-to-configure-frosted_ice-properties.patch @@ -1,4 +1,4 @@ -From 123c88bf469c008338966df77f5a729e8b68d26c Mon Sep 17 00:00:00 2001 +From 8f972d58363549dd92afa7f5235a050ae00b65c1 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 21 Apr 2016 23:51:55 -0700 Subject: [PATCH] Add ability to configure frosted_ice properties @@ -54,5 +54,5 @@ index 1a0c2eeaa4..39c3bbc9cf 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0099-remove-null-possibility-for-getServer-singleton.patch similarity index 97% rename from Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch rename to Spigot-Server-Patches/0099-remove-null-possibility-for-getServer-singleton.patch index 734219b37b..62f31fb016 100644 --- a/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0099-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From c075027493e979bc49c932fb993f717f573dc2d1 Mon Sep 17 00:00:00 2001 +From 961fbdba0788ff2d563f2cdc35159670061a1ab4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton diff --git a/Spigot-Server-Patches/0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0100-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 99% rename from Spigot-Server-Patches/0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to Spigot-Server-Patches/0100-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 34e9b7c664..13d99450fb 100644 --- a/Spigot-Server-Patches/0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0100-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From 4f0a8caec86ab2d551f790fcaa79ffee9a428351 Mon Sep 17 00:00:00 2001 +From a0d1cba8b421d1536b09fb97f3e089d64aeb3c26 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Apr 2016 20:02:00 -0400 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes diff --git a/Spigot-Server-Patches/0102-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0101-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 99% rename from Spigot-Server-Patches/0102-LootTable-API-Replenishable-Lootables-Feature.patch rename to Spigot-Server-Patches/0101-LootTable-API-Replenishable-Lootables-Feature.patch index 97cb9d1034..9d5582fa9e 100644 --- a/Spigot-Server-Patches/0102-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0101-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From 1e45357006686819d5452e13ee351e671ef954bd Mon Sep 17 00:00:00 2001 +From 9530d1108b28a11ca02b7c70caa8963318cff90a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 21:19:14 -0400 Subject: [PATCH] LootTable API & Replenishable Lootables Feature @@ -520,7 +520,7 @@ index 0000000000..d50410532c + } +} diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ec57b0ad8f..1cc7b9f60e 100644 +index 865dfa2b05..b91eaebc0e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -532,7 +532,7 @@ index ec57b0ad8f..1cc7b9f60e 100644 public CraftEntity getBukkitEntity() { diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java -index 66826da450..b84a70edb4 100644 +index c223e18125..cf1c5d754c 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java @@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp @@ -591,7 +591,7 @@ index 66826da450..b84a70edb4 100644 if (entityhuman != null) { diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java -index 56c7f9b4e3..a12d49fc4d 100644 +index 39ebc7218c..a346eba52b 100644 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java @@ -6,8 +6,9 @@ import javax.annotation.Nullable; @@ -756,5 +756,5 @@ index 334bd5bb3f..f5b31237fc 100644 public CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0103-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0102-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 93% rename from Spigot-Server-Patches/0103-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to Spigot-Server-Patches/0102-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index 836782b4f5..1d566883f1 100644 --- a/Spigot-Server-Patches/0103-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/0102-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,11 +1,11 @@ -From 45acb4c5daea64d899ce433dee3e349909d876ac Mon Sep 17 00:00:00 2001 +From 634403cc9477224cb29aec45f4851368c85cccb3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 May 2016 23:33:08 -0400 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 69bfe62416..20b04e120f 100644 +index dc3438890b..cbfe12734d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -228,4 +228,9 @@ public class PaperConfig { @@ -31,5 +31,5 @@ index fab5962e2a..de7ac6c205 100644 nbttagcompound.setString("Name", scoreboardteam.getName()); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0104-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0103-System-property-for-disabling-watchdoge.patch similarity index 92% rename from Spigot-Server-Patches/0104-System-property-for-disabling-watchdoge.patch rename to Spigot-Server-Patches/0103-System-property-for-disabling-watchdoge.patch index 871f2fe1ba..d39e5ee641 100644 --- a/Spigot-Server-Patches/0104-System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/0103-System-property-for-disabling-watchdoge.patch @@ -1,4 +1,4 @@ -From 1162b3163b9e8214ec7ff82d6d5d1ec50e3f7b93 Mon Sep 17 00:00:00 2001 +From ec896ab8fe94d7c7070fe71aa32c8f42e28d91bb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 12 May 2016 23:02:58 -0500 Subject: [PATCH] System property for disabling watchdoge @@ -18,5 +18,5 @@ index 56f5f54bd1..9532aada82 100644 Logger log = Bukkit.getServer().getLogger(); log.log( Level.SEVERE, "------------------------------" ); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0104-Optimize-UserCache-Thread-Safe.patch similarity index 98% rename from Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch rename to Spigot-Server-Patches/0104-Optimize-UserCache-Thread-Safe.patch index 8127a32972..75e01d5def 100644 --- a/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0104-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From 2e5a1a3634a10dcdc74ea8769675d9103b2071f6 Mon Sep 17 00:00:00 2001 +From a9721e0704e80f7086fde3be20241a9f138bdb6b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 20:47:41 -0400 Subject: [PATCH] Optimize UserCache / Thread Safe diff --git a/Spigot-Server-Patches/0106-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0105-Avoid-blocking-on-Network-Manager-creation.patch similarity index 97% rename from Spigot-Server-Patches/0106-Avoid-blocking-on-Network-Manager-creation.patch rename to Spigot-Server-Patches/0105-Avoid-blocking-on-Network-Manager-creation.patch index 8353238e47..a80a78e2e8 100644 --- a/Spigot-Server-Patches/0106-Avoid-blocking-on-Network-Manager-creation.patch +++ b/Spigot-Server-Patches/0105-Avoid-blocking-on-Network-Manager-creation.patch @@ -1,4 +1,4 @@ -From 087a75360c608130b4ae7605212b1ea28c9d2a62 Mon Sep 17 00:00:00 2001 +From 270adc7982223bfce1adc8bfc952132e8473f6a8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 23:19:16 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation @@ -43,5 +43,5 @@ index 42c654a1da..e7ed6af9cb 100644 if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 ) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0107-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0106-Optional-TNT-doesn-t-move-in-water.patch similarity index 98% rename from Spigot-Server-Patches/0107-Optional-TNT-doesn-t-move-in-water.patch rename to Spigot-Server-Patches/0106-Optional-TNT-doesn-t-move-in-water.patch index 8986a8fffe..a50147510e 100644 --- a/Spigot-Server-Patches/0107-Optional-TNT-doesn-t-move-in-water.patch +++ b/Spigot-Server-Patches/0106-Optional-TNT-doesn-t-move-in-water.patch @@ -1,4 +1,4 @@ -From 9098716df661037fb74460e7b22722ef5443d970 Mon Sep 17 00:00:00 2001 +From ad12912df3204334e006aa4d5a73bcf41331fe08 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional TNT doesn't move in water diff --git a/Spigot-Server-Patches/0108-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0107-Faster-redstone-torch-rapid-clock-removal.patch similarity index 97% rename from Spigot-Server-Patches/0108-Faster-redstone-torch-rapid-clock-removal.patch rename to Spigot-Server-Patches/0107-Faster-redstone-torch-rapid-clock-removal.patch index e515fb0793..c8a12f74e3 100644 --- a/Spigot-Server-Patches/0108-Faster-redstone-torch-rapid-clock-removal.patch +++ b/Spigot-Server-Patches/0107-Faster-redstone-torch-rapid-clock-removal.patch @@ -1,4 +1,4 @@ -From 6d4f20ebd127d136f26deea0a6cd2868bb67d488 Mon Sep 17 00:00:00 2001 +From 59e9d3e9052037b0cb8707da5818135844cd8c2c Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Mon, 23 May 2016 12:12:37 +0200 Subject: [PATCH] Faster redstone torch rapid clock removal @@ -77,7 +77,7 @@ index a99f979eff..919ba8a14d 100644 public RedstoneUpdateInfo(BlockPosition blockposition, long i) { this.a = blockposition; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ce710c730d..c6048d3d4a 100644 +index f6cb4d45eb..ec69c25394 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -99,6 +99,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -89,5 +89,5 @@ index ce710c730d..c6048d3d4a 100644 public CraftWorld getWorld() { return this.world; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0109-Add-server-name-parameter.patch b/Spigot-Server-Patches/0108-Add-server-name-parameter.patch similarity index 92% rename from Spigot-Server-Patches/0109-Add-server-name-parameter.patch rename to Spigot-Server-Patches/0108-Add-server-name-parameter.patch index 8776d6fd13..478997c2a8 100644 --- a/Spigot-Server-Patches/0109-Add-server-name-parameter.patch +++ b/Spigot-Server-Patches/0108-Add-server-name-parameter.patch @@ -1,4 +1,4 @@ -From 46a4efe99372dd5565bf2c45b4acecae192f90b6 Mon Sep 17 00:00:00 2001 +From 4d858c9be7f60c1edfd18695e09e3b9bb1191046 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Sat, 28 May 2016 16:54:03 +0200 Subject: [PATCH] Add server-name parameter @@ -24,5 +24,5 @@ index 7f5ea764d7..c5d5121fd9 100644 }; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0110-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0109-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch similarity index 95% rename from Spigot-Server-Patches/0110-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch rename to Spigot-Server-Patches/0109-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index 5fa758b3fa..7aeebe0f93 100644 --- a/Spigot-Server-Patches/0110-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/Spigot-Server-Patches/0109-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From 820774e628420387a7df04ac381e31bfbbe7fa7f Mon Sep 17 00:00:00 2001 +From bf98b78eaa30cea4b0790456ae8abcf32081d9d9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 May 2016 22:53:50 -0400 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world @@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world Also fix view distance lookup diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 015918e3b3..6ac0546029 100644 +index 9ecbc8e3e6..0421052d21 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -563,8 +563,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -24,7 +24,7 @@ index 015918e3b3..6ac0546029 100644 double deltaZ = this.locZ - player.locZ; double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index de6c70e3e7..e3feb39ad0 100644 +index 92acd504ad..ee1b0a8846 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -207,8 +207,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -42,5 +42,5 @@ index de6c70e3e7..e3feb39ad0 100644 double deltaZ = this.locZ - player.locZ; double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0110-Fix-Double-World-Add-issues.patch similarity index 94% rename from Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch rename to Spigot-Server-Patches/0110-Fix-Double-World-Add-issues.patch index 587eb82ff3..7400f93899 100644 --- a/Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch +++ b/Spigot-Server-Patches/0110-Fix-Double-World-Add-issues.patch @@ -1,4 +1,4 @@ -From 3191991ea7c7d2a7e12b03cad3bee921b8f2c97f Mon Sep 17 00:00:00 2001 +From 417e09c01cdadc732b5c9ea0ba14c591af101d2b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 21 Jun 2016 22:54:34 -0400 Subject: [PATCH] Fix Double World Add issues diff --git a/Spigot-Server-Patches/0112-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0111-Fix-Old-Sign-Conversion.patch similarity index 96% rename from Spigot-Server-Patches/0112-Fix-Old-Sign-Conversion.patch rename to Spigot-Server-Patches/0111-Fix-Old-Sign-Conversion.patch index d3268c6bdc..6ca8c0be00 100644 --- a/Spigot-Server-Patches/0112-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0111-Fix-Old-Sign-Conversion.patch @@ -1,4 +1,4 @@ -From f24a7c8a5f0f943f7e35d0090fb465d75eeb95b3 Mon Sep 17 00:00:00 2001 +From cd69e9e378344e8dc74dbc6c16193fb4bed87c7b Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 17 Jun 2016 20:50:11 -0400 Subject: [PATCH] Fix Old Sign Conversion @@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java -index dff181f1c2..9868677f67 100644 +index 7bcd9786a2..775ec63890 100644 --- a/src/main/java/net/minecraft/server/DefinedStructure.java +++ b/src/main/java/net/minecraft/server/DefinedStructure.java @@ -203,9 +203,11 @@ public class DefinedStructure { @@ -25,7 +25,7 @@ index dff181f1c2..9868677f67 100644 } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 1307152997..35574a5ef3 100644 +index e79e256138..5e495a4b8c 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -20,6 +20,7 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -58,5 +58,5 @@ index a8f0aae9ea..2c6ce5bae0 100644 if (this.world instanceof WorldServer) { try { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0113-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0112-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 92% rename from Spigot-Server-Patches/0113-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to Spigot-Server-Patches/0112-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index 589e3b6267..20beabc5f1 100644 --- a/Spigot-Server-Patches/0113-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/Spigot-Server-Patches/0112-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -1,4 +1,4 @@ -From 5436e83fb221bed58113f08c09a7d7d19cff748d Mon Sep 17 00:00:00 2001 +From 4ac81c1e86b4f273d6a420bee1d3f6d199c78c43 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 16 Jul 2016 19:11:17 -0500 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name @@ -18,5 +18,5 @@ index ea02567554..b0d883d493 100644 GameProfile gameprofile = new GameProfile(uuid, s); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0114-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0113-More-informative-vehicle-moved-wrongly-message.patch similarity index 90% rename from Spigot-Server-Patches/0114-More-informative-vehicle-moved-wrongly-message.patch rename to Spigot-Server-Patches/0113-More-informative-vehicle-moved-wrongly-message.patch index 9cf798e55f..4fafa8ad66 100644 --- a/Spigot-Server-Patches/0114-More-informative-vehicle-moved-wrongly-message.patch +++ b/Spigot-Server-Patches/0113-More-informative-vehicle-moved-wrongly-message.patch @@ -1,11 +1,11 @@ -From a076039aba3c69b9a1ce81454e1f3da132e6a3ee Mon Sep 17 00:00:00 2001 +From ad2ef25c9755f2a4327d11762dc61d0bb21b247e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Jul 2016 17:58:53 -0500 Subject: [PATCH] More informative vehicle moved wrongly message diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e88abe1d05..630059246f 100644 +index bbc5acd7fe..7c0d487d79 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -361,7 +361,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -18,5 +18,5 @@ index e88abe1d05..630059246f 100644 Location curPos = this.getPlayer().getLocation(); // Spigot -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0114-Re-track-players-that-dismount-from-other-players.patch similarity index 94% rename from Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch rename to Spigot-Server-Patches/0114-Re-track-players-that-dismount-from-other-players.patch index 3196bd68ba..1156eefe99 100644 --- a/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch +++ b/Spigot-Server-Patches/0114-Re-track-players-that-dismount-from-other-players.patch @@ -1,4 +1,4 @@ -From 711bddf91f2f0f5faa884ddee9c23fc82c932cad Mon Sep 17 00:00:00 2001 +From 78742615c480b6d54afdd2fa44545208a1fcfd39 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 31 Jul 2016 16:33:03 -0500 Subject: [PATCH] Re-track players that dismount from other players diff --git a/Spigot-Server-Patches/0116-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0115-Add-setting-for-proxy-online-mode-status.patch similarity index 95% rename from Spigot-Server-Patches/0116-Add-setting-for-proxy-online-mode-status.patch rename to Spigot-Server-Patches/0115-Add-setting-for-proxy-online-mode-status.patch index 778050b2cb..118ce609f6 100644 --- a/Spigot-Server-Patches/0116-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0115-Add-setting-for-proxy-online-mode-status.patch @@ -1,11 +1,11 @@ -From 52368ff2375c884b524f0412d1e3a9cc6b26f345 Mon Sep 17 00:00:00 2001 +From f9b2e14ab8d59acfe5808b30a40bd4615b0ab740 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 5 Aug 2016 01:03:08 +0200 Subject: [PATCH] Add setting for proxy online mode status diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 20b04e120f..3d9dba7696 100644 +index cbfe12734d..1daa2e4535 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -22,6 +22,7 @@ import org.bukkit.configuration.InvalidConfigurationException; @@ -45,7 +45,7 @@ index 21a8ed3231..0794aff5b7 100644 } else { String[] astring1 = astring; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 86aa2ad322..d1c09b4513 100644 +index 2bd50c24b9..064969774b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1352,7 +1352,8 @@ public final class CraftServer implements Server { @@ -59,5 +59,5 @@ index 86aa2ad322..d1c09b4513 100644 profile = console.getUserCache().getProfile( name ); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0117-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0116-Optimise-BlockState-s-hashCode-equals.patch similarity index 98% rename from Spigot-Server-Patches/0117-Optimise-BlockState-s-hashCode-equals.patch rename to Spigot-Server-Patches/0116-Optimise-BlockState-s-hashCode-equals.patch index 62c0b93ba3..0c0e36549e 100644 --- a/Spigot-Server-Patches/0117-Optimise-BlockState-s-hashCode-equals.patch +++ b/Spigot-Server-Patches/0116-Optimise-BlockState-s-hashCode-equals.patch @@ -1,4 +1,4 @@ -From c8f85f355c26cefcb326e4f7f01dafaa3a24be26 Mon Sep 17 00:00:00 2001 +From 01c9e8a7af6982d935d845f14ccf21a561d72c14 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 19 Aug 2016 01:52:56 +0100 Subject: [PATCH] Optimise BlockState's hashCode/equals @@ -83,5 +83,5 @@ index 6861c2b058..74ef699520 100644 return true; } else if (object instanceof BlockStateInteger && super.equals(object)) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0118-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0117-Configurable-packet-in-spam-threshold.patch similarity index 93% rename from Spigot-Server-Patches/0118-Configurable-packet-in-spam-threshold.patch rename to Spigot-Server-Patches/0117-Configurable-packet-in-spam-threshold.patch index cc5acfb24c..a596387217 100644 --- a/Spigot-Server-Patches/0118-Configurable-packet-in-spam-threshold.patch +++ b/Spigot-Server-Patches/0117-Configurable-packet-in-spam-threshold.patch @@ -1,11 +1,11 @@ -From 5eed28327251de415c39d6379b6d50a67df81810 Mon Sep 17 00:00:00 2001 +From 138c139b0ac064487751809cf99976ea857e2a81 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 11 Sep 2016 14:30:57 -0500 Subject: [PATCH] Configurable packet in spam threshold diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 3d9dba7696..5c7f170907 100644 +index 1daa2e4535..5d0645c829 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -243,4 +243,13 @@ public class PaperConfig { @@ -23,7 +23,7 @@ index 3d9dba7696..5c7f170907 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 630059246f..fd990e703c 100644 +index 7c0d487d79..31b8524c40 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1220,13 +1220,14 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -44,5 +44,5 @@ index 630059246f..fd990e703c 100644 limitedPackets = 0; return true; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0119-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0118-Configurable-flying-kick-messages.patch similarity index 94% rename from Spigot-Server-Patches/0119-Configurable-flying-kick-messages.patch rename to Spigot-Server-Patches/0118-Configurable-flying-kick-messages.patch index baa2a23b8f..8f34e8db38 100644 --- a/Spigot-Server-Patches/0119-Configurable-flying-kick-messages.patch +++ b/Spigot-Server-Patches/0118-Configurable-flying-kick-messages.patch @@ -1,11 +1,11 @@ -From 93fd80f450c951685ef7121cea5c81b7e1df40bd Mon Sep 17 00:00:00 2001 +From 2d4dff0ea534d2b92e7c2699f8532d830219e053 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 20 Sep 2016 00:58:01 +0000 Subject: [PATCH] Configurable flying kick messages diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 5c7f170907..503e137750 100644 +index 5d0645c829..b5a50afd24 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -252,4 +252,11 @@ public class PaperConfig { @@ -21,7 +21,7 @@ index 5c7f170907..503e137750 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index fd990e703c..d2c178429d 100644 +index 31b8524c40..49d2299eff 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -144,7 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -43,5 +43,5 @@ index fd990e703c..d2c178429d 100644 } } else { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0120-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0119-Chunk-registration-fixes.patch similarity index 90% rename from Spigot-Server-Patches/0120-Chunk-registration-fixes.patch rename to Spigot-Server-Patches/0119-Chunk-registration-fixes.patch index 541391db0a..92d8e66d83 100644 --- a/Spigot-Server-Patches/0120-Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/0119-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From 781ea70b4f2e52de52366fe9341c3504e44eaf7f Mon Sep 17 00:00:00 2001 +From 13accd53a25699c460e044a5b1c5825016fd7e16 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 22:54:28 -0400 Subject: [PATCH] Chunk registration fixes @@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr Keep them consistent diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f03804bfbb..ebd1ff1d50 100644 +index 8fd4478f2b..6bd60ce46c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -624,7 +624,7 @@ public class WorldServer extends World { @@ -21,5 +21,5 @@ index f03804bfbb..ebd1ff1d50 100644 if (!entity.inChunk || entity.chunkX != i || entity.chunkY != j || entity.chunkZ != k) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0120-Remove-FishingHook-reference-on-Craft-Entity-removal.patch similarity index 92% rename from Spigot-Server-Patches/0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch rename to Spigot-Server-Patches/0120-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index 9d2f7c6e4d..a961f0819a 100644 --- a/Spigot-Server-Patches/0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/Spigot-Server-Patches/0120-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -1,4 +1,4 @@ -From b6a854c8e2853cf5329ae7a0e67a05e7cf6be01e Mon Sep 17 00:00:00 2001 +From 984cd1145835040e82bfcfe67a83a4976cb2ab4b Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 16 Jun 2016 00:17:23 -0400 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal @@ -25,5 +25,5 @@ index 1ed9a4e32e..9eb9801376 100644 + } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0122-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0121-Auto-fix-bad-Y-levels-on-player-login.patch similarity index 94% rename from Spigot-Server-Patches/0122-Auto-fix-bad-Y-levels-on-player-login.patch rename to Spigot-Server-Patches/0121-Auto-fix-bad-Y-levels-on-player-login.patch index ca1c72e0b1..610743955b 100644 --- a/Spigot-Server-Patches/0122-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0121-Auto-fix-bad-Y-levels-on-player-login.patch @@ -1,4 +1,4 @@ -From 806c5048a46d06f9448db8d45fe6be4eabe4f911 Mon Sep 17 00:00:00 2001 +From 170a97e6bab63ff70fa39bc14cd51375fdb6b74d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 23:48:39 -0400 Subject: [PATCH] Auto fix bad Y levels on player login diff --git a/Spigot-Server-Patches/0123-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0122-Option-to-remove-corrupt-tile-entities.patch similarity index 93% rename from Spigot-Server-Patches/0123-Option-to-remove-corrupt-tile-entities.patch rename to Spigot-Server-Patches/0122-Option-to-remove-corrupt-tile-entities.patch index 209c36dee3..55fce892e2 100644 --- a/Spigot-Server-Patches/0123-Option-to-remove-corrupt-tile-entities.patch +++ b/Spigot-Server-Patches/0122-Option-to-remove-corrupt-tile-entities.patch @@ -1,4 +1,4 @@ -From a2dcc102be77a4a8396d4bfa981d8a98b0585868 Mon Sep 17 00:00:00 2001 +From 83b2f4fb5840f8237a3c42bf09ead19888c0d422 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 5 Oct 2016 16:27:36 -0500 Subject: [PATCH] Option to remove corrupt tile entities @@ -19,7 +19,7 @@ index 92ab55182f..eed454bf40 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index f9b6970ae6..98c2de5507 100644 +index 3d366ddeb2..cacef3ac9f 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -533,6 +533,12 @@ public class Chunk implements IChunkAccess { @@ -36,5 +36,5 @@ index f9b6970ae6..98c2de5507 100644 // CraftBukkit end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0123-Add-EntityZapEvent.patch similarity index 98% rename from Spigot-Server-Patches/0124-Add-EntityZapEvent.patch rename to Spigot-Server-Patches/0123-Add-EntityZapEvent.patch index 8afc616d23..883df50bc5 100644 --- a/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0123-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 488f3c7f82abf9110bec823d81b0d5848a1eb2f8 Mon Sep 17 00:00:00 2001 +From d3f655a1ce1d75488a5ab18caf0020b0743a86ae Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent diff --git a/Spigot-Server-Patches/0125-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0124-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 93% rename from Spigot-Server-Patches/0125-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to Spigot-Server-Patches/0124-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index 5d5dfea941..f322005c74 100644 --- a/Spigot-Server-Patches/0125-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/Spigot-Server-Patches/0124-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -1,4 +1,4 @@ -From 72962248955c09915aa74c5c5a0ab69ca8092c90 Mon Sep 17 00:00:00 2001 +From b69e373bb7de1abeaae748b3ae900241fddd39f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Nov 2016 20:28:12 -0400 Subject: [PATCH] Don't load Chunks from Hoppers and other things @@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary" and treat it as a single chest if the other sides are unloaded diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index 5fd6061f60..af18759ee4 100644 +index 65b616481e..8183a61c9d 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -227,7 +227,12 @@ public class BlockChest extends BlockTileEntity implements IBlockWaterlogged { @@ -31,5 +31,5 @@ index 5fd6061f60..af18759ee4 100644 if (iblockdata1.getBlock() == iblockdata.getBlock()) { BlockPropertyChestType blockpropertychesttype1 = (BlockPropertyChestType) iblockdata1.get(BlockChest.b); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0126-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0125-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch similarity index 96% rename from Spigot-Server-Patches/0126-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch rename to Spigot-Server-Patches/0125-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index 1d28761192..576cd8d9ca 100644 --- a/Spigot-Server-Patches/0126-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/Spigot-Server-Patches/0125-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -1,4 +1,4 @@ -From 534f1cf5c45d4d413c99733210dd85860caf7934 Mon Sep 17 00:00:00 2001 +From 245b1105e503637337735834ddea9ee8015defb3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 12 Nov 2016 23:25:22 -0600 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items @@ -30,7 +30,7 @@ index eed454bf40..4892113a15 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 23a1f8c77c..a86dd55292 100644 +index 9d86beda9e..44dd99ea21 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -232,6 +232,15 @@ public class EntityFallingBlock extends Entity { diff --git a/Spigot-Server-Patches/0127-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0126-Cache-user-authenticator-threads.patch similarity index 97% rename from Spigot-Server-Patches/0127-Cache-user-authenticator-threads.patch rename to Spigot-Server-Patches/0126-Cache-user-authenticator-threads.patch index c6e37c3b21..9c0dc170b1 100644 --- a/Spigot-Server-Patches/0127-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0126-Cache-user-authenticator-threads.patch @@ -1,4 +1,4 @@ -From 83603e56bc06c14e18250fa7bde1afb4182b2443 Mon Sep 17 00:00:00 2001 +From 6ee6eb5ba5a2da7dcc4fcbeb187d1a61d01d28e1 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 08:31:45 -0500 Subject: [PATCH] Cache user authenticator threads @@ -66,5 +66,5 @@ index b85b048ace..22d5c7d20a 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0128-Optimise-removeQueue.patch b/Spigot-Server-Patches/0127-Optimise-removeQueue.patch similarity index 98% rename from Spigot-Server-Patches/0128-Optimise-removeQueue.patch rename to Spigot-Server-Patches/0127-Optimise-removeQueue.patch index f52f73b622..a180d5b4e3 100644 --- a/Spigot-Server-Patches/0128-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0127-Optimise-removeQueue.patch @@ -1,4 +1,4 @@ -From 552c591c8c4d8848e81c63e8dc4e25433f43098f Mon Sep 17 00:00:00 2001 +From ed828ddc907f52c204ea2f7118569aa7093b0c58 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 13:22:40 +0000 Subject: [PATCH] Optimise removeQueue diff --git a/Spigot-Server-Patches/0129-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0128-Allow-Reloading-of-Command-Aliases.patch similarity index 93% rename from Spigot-Server-Patches/0129-Allow-Reloading-of-Command-Aliases.patch rename to Spigot-Server-Patches/0128-Allow-Reloading-of-Command-Aliases.patch index cbb34c82ab..b46fe489ed 100644 --- a/Spigot-Server-Patches/0129-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0128-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 7a062ff681cbc396ec082939c1b38acc783f9515 Mon Sep 17 00:00:00 2001 +From ac9880ce3b57a21a033a6e6f6a50a02ba352718a Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:21:52 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 337aea2dc..a63a3798c 100644 +index 064969774b..5712560058 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2071,5 +2071,24 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0130-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0129-Add-source-to-PlayerExpChangeEvent.patch similarity index 94% rename from Spigot-Server-Patches/0130-Add-source-to-PlayerExpChangeEvent.patch rename to Spigot-Server-Patches/0129-Add-source-to-PlayerExpChangeEvent.patch index f5448fb22f..41c14dc9f1 100644 --- a/Spigot-Server-Patches/0130-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0129-Add-source-to-PlayerExpChangeEvent.patch @@ -1,11 +1,11 @@ -From 8ddeb2009ad01fc6ee3ff8a2ee3ba8d2a907d092 Mon Sep 17 00:00:00 2001 +From b145b409818c3a79f83f36cd1b6e7edef34969ad Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:48:33 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index b20813be64..bfba08fb24 100644 +index 26a3a1d03a..a4cd502bca 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -190,7 +190,7 @@ public class EntityExperienceOrb extends Entity { @@ -18,7 +18,7 @@ index b20813be64..bfba08fb24 100644 this.die(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a26ecc86f6..e597f37903 100644 +index cf1abd1875..445f2aef95 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -106,6 +106,7 @@ import org.bukkit.entity.ThrownPotion; @@ -48,5 +48,5 @@ index a26ecc86f6..e597f37903 100644 return handleBlockGrowEvent(world, pos, block, 3); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0131-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0130-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 89% rename from Spigot-Server-Patches/0131-Optimize-World.isLoaded-BlockPosition-Z.patch rename to Spigot-Server-Patches/0130-Optimize-World.isLoaded-BlockPosition-Z.patch index ebe4e0d4e8..914fd856f3 100644 --- a/Spigot-Server-Patches/0131-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0130-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -1,4 +1,4 @@ -From d32d0431d4d152f44d3e35c9318481c6b44e934c Mon Sep 17 00:00:00 2001 +From faa1b636f4ab2334b575232edef0fb8e30468b61 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Dec 2016 00:11:43 -0500 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z Reduce method invocations for World.isLoaded(BlockPosition)Z diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c6048d3d4a..a8cfdd0eee 100644 +index ec69c25394..9142edd4f8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -209,6 +209,10 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -21,5 +21,5 @@ index c6048d3d4a..a8cfdd0eee 100644 public boolean isLoadedAndInBounds(BlockPosition blockposition) { return getWorldBorder().isInBounds(blockposition) && getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0132-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0131-Don-t-let-fishinghooks-use-portals.patch similarity index 90% rename from Spigot-Server-Patches/0132-Don-t-let-fishinghooks-use-portals.patch rename to Spigot-Server-Patches/0131-Don-t-let-fishinghooks-use-portals.patch index 8b30649f67..1c5d1d22d4 100644 --- a/Spigot-Server-Patches/0132-Don-t-let-fishinghooks-use-portals.patch +++ b/Spigot-Server-Patches/0131-Don-t-let-fishinghooks-use-portals.patch @@ -1,11 +1,11 @@ -From 85be9c35dfdec0ea13c3bacba04bcc608d39d9d4 Mon Sep 17 00:00:00 2001 +From 60eab5063789e0ce5d62881948cad28c890e40d7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 16 Dec 2016 16:03:19 -0600 Subject: [PATCH] Don't let fishinghooks use portals diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4ef333ef12..c5576e0325 100644 +index 44709d5d46..58f7bb658f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -156,7 +156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index 4ef333ef12..c5576e0325 100644 public DimensionManager dimension; protected BlockPosition al; diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 19a6233c3f..390f1a24d0 100644 +index 84e6d660d3..74b726937e 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -163,6 +163,12 @@ public class EntityFishingHook extends Entity { @@ -35,5 +35,5 @@ index 19a6233c3f..390f1a24d0 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0132-Add-ProjectileCollideEvent.patch similarity index 97% rename from Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch rename to Spigot-Server-Patches/0132-Add-ProjectileCollideEvent.patch index 3b3bbfd506..95ba8bfd99 100644 --- a/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0132-Add-ProjectileCollideEvent.patch @@ -1,11 +1,11 @@ -From 303e19d604d675467fcfdc323aa5e5512833511b Mon Sep 17 00:00:00 2001 +From 9e59579b000cb3ac3240be5bdb9c9725d22892a1 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 28fc512bab..5ee0802e04 100644 +index 44ea39e3d1..fa46dedb83 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -184,6 +184,16 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -26,7 +26,7 @@ index 28fc512bab..5ee0802e04 100644 this.a((MovingObjectPosition) object); this.impulse = true; diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java -index faf0647574..fe4e993d5c 100644 +index 1a9fee8da1..14c4394933 100644 --- a/src/main/java/net/minecraft/server/EntityFireball.java +++ b/src/main/java/net/minecraft/server/EntityFireball.java @@ -67,7 +67,16 @@ public abstract class EntityFireball extends Entity { @@ -48,7 +48,7 @@ index faf0647574..fe4e993d5c 100644 // CraftBukkit start - Fire ProjectileHitEvent diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 390f1a24d0..758559d35d 100644 +index 74b726937e..05fa5cd6af 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -217,7 +217,16 @@ public class EntityFishingHook extends Entity { diff --git a/Spigot-Server-Patches/0134-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0133-Prevent-Pathfinding-out-of-World-Border.patch similarity index 91% rename from Spigot-Server-Patches/0134-Prevent-Pathfinding-out-of-World-Border.patch rename to Spigot-Server-Patches/0133-Prevent-Pathfinding-out-of-World-Border.patch index 0017c18492..25d59e7b14 100644 --- a/Spigot-Server-Patches/0134-Prevent-Pathfinding-out-of-World-Border.patch +++ b/Spigot-Server-Patches/0133-Prevent-Pathfinding-out-of-World-Border.patch @@ -1,4 +1,4 @@ -From 6bd0cb7d5c929286f4fde9332bd37fff86afa1b2 Mon Sep 17 00:00:00 2001 +From 562c5614110ce24da2f2e220cfa45786010c56b7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Dec 2016 23:07:42 -0500 Subject: [PATCH] Prevent Pathfinding out of World Border @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border This prevents Entities from trying to run outside of the World Border diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index ed69eaa176..a473c03b9d 100644 +index 8b05b8acd8..65b38d75b4 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -95,6 +95,7 @@ public abstract class NavigationAbstract { @@ -18,5 +18,5 @@ index ed69eaa176..a473c03b9d 100644 return null; } else if (!this.a()) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0135-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0134-Bound-Treasure-Maps-to-World-Border.patch similarity index 96% rename from Spigot-Server-Patches/0135-Bound-Treasure-Maps-to-World-Border.patch rename to Spigot-Server-Patches/0134-Bound-Treasure-Maps-to-World-Border.patch index 6a567860c1..c7d442e7cb 100644 --- a/Spigot-Server-Patches/0135-Bound-Treasure-Maps-to-World-Border.patch +++ b/Spigot-Server-Patches/0134-Bound-Treasure-Maps-to-World-Border.patch @@ -1,4 +1,4 @@ -From c805f6549209e45d27672bb6edcf7e5e03241f86 Mon Sep 17 00:00:00 2001 +From a9da592db6a1b23e9f7cbc6702363dcce57ea9e3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:15:11 -0500 Subject: [PATCH] Bound Treasure Maps to World Border @@ -23,7 +23,7 @@ index 464e1e101a..7b2eace75c 100644 if (structurestart != null && structurestart.e()) { diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index 77b805f3ae..1e622a0434 100644 +index 1388610a7b..8902581376 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -24,6 +24,18 @@ public class WorldBorder { @@ -46,5 +46,5 @@ index 77b805f3ae..1e622a0434 100644 return (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e() && (double) chunkcoordintpair.g() > this.d() && (double) chunkcoordintpair.e() < this.f(); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0136-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0135-Configurable-Cartographer-Treasure-Maps.patch similarity index 96% rename from Spigot-Server-Patches/0136-Configurable-Cartographer-Treasure-Maps.patch rename to Spigot-Server-Patches/0135-Configurable-Cartographer-Treasure-Maps.patch index 8d49c98d17..24ec0f0d57 100644 --- a/Spigot-Server-Patches/0136-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0135-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From 208c79c5f233446a430809e437d2f300299ae608 Mon Sep 17 00:00:00 2001 +From 7ed82a5f1625536217b8d9d482843c3b44fc24dc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps @@ -40,5 +40,5 @@ index 2a4e4f7859..0b66323698 100644 if (blockposition != null) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0137-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0136-Optimize-ItemStack.isEmpty.patch similarity index 88% rename from Spigot-Server-Patches/0137-Optimize-ItemStack.isEmpty.patch rename to Spigot-Server-Patches/0136-Optimize-ItemStack.isEmpty.patch index a79c809ee9..cc213dd880 100644 --- a/Spigot-Server-Patches/0137-Optimize-ItemStack.isEmpty.patch +++ b/Spigot-Server-Patches/0136-Optimize-ItemStack.isEmpty.patch @@ -1,4 +1,4 @@ -From 0d1aa8b0f00b719abe1a5aa9d3b188caec784a56 Mon Sep 17 00:00:00 2001 +From ca5d889e447186ee476dd04b849c5ba3a319be9b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Dec 2016 03:48:29 -0500 Subject: [PATCH] Optimize ItemStack.isEmpty() @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty() Remove hashMap lookup every check, simplify code to remove ternary diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index b643a41235..b7d327211c 100644 +index 5bc078d314..09d0de48e8 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -145,7 +145,7 @@ public final class ItemStack { @@ -19,5 +19,5 @@ index b643a41235..b7d327211c 100644 public ItemStack cloneAndSubtract(int i) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0138-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0137-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 94% rename from Spigot-Server-Patches/0138-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to Spigot-Server-Patches/0137-Add-API-methods-to-control-if-armour-stands-can-move.patch index edf111abb2..4024c44f57 100644 --- a/Spigot-Server-Patches/0138-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0137-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From e9365a29ab4cec0deea0498aa8db4a1a2497b4ef Mon Sep 17 00:00:00 2001 +From 92409889b996769785a3bda1db6c605081dec4a4 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index bee5444989..1ae3ffa666 100644 +index 2ba9cc9fec..ccdd0d27e3 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving { @@ -52,5 +52,5 @@ index 2b66a08ade..124c3185bc 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0138-Properly-fix-item-duplication-bug.patch similarity index 95% rename from Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch rename to Spigot-Server-Patches/0138-Properly-fix-item-duplication-bug.patch index 645b09b71f..93fc4f5547 100644 --- a/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0138-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From 25310ce37d460f67350b589d4c816932835d3bc8 Mon Sep 17 00:00:00 2001 +From cfcdc41816f6c2f0160bcf7c24b2637d4f9001b6 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug diff --git a/Spigot-Server-Patches/0140-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0139-String-based-Action-Bar-API.patch similarity index 97% rename from Spigot-Server-Patches/0140-String-based-Action-Bar-API.patch rename to Spigot-Server-Patches/0139-String-based-Action-Bar-API.patch index 264f7a0e7b..a6e48e552d 100644 --- a/Spigot-Server-Patches/0140-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0139-String-based-Action-Bar-API.patch @@ -1,4 +1,4 @@ -From f1d16cb1aee6052f8cce8e79053ce2ff6ef0e923 Mon Sep 17 00:00:00 2001 +From 78844c50d111bbf2057a4e8d314f9a5950440823 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 15:02:42 -0500 Subject: [PATCH] String based Action Bar API diff --git a/Spigot-Server-Patches/0141-Firework-API-s.patch b/Spigot-Server-Patches/0140-Firework-API-s.patch similarity index 98% rename from Spigot-Server-Patches/0141-Firework-API-s.patch rename to Spigot-Server-Patches/0140-Firework-API-s.patch index 14d54e02bd..a864b3b5ac 100644 --- a/Spigot-Server-Patches/0141-Firework-API-s.patch +++ b/Spigot-Server-Patches/0140-Firework-API-s.patch @@ -1,11 +1,11 @@ -From e28ce87f55dc8e8275e90c00ef83d989b86fb299 Mon Sep 17 00:00:00 2001 +From 87cebc52b802b5c19db5d61c746477912f5c360f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 01:18:33 -0500 Subject: [PATCH] Firework API's diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index 959ad19dec..b3f39d5a2f 100644 +index 25851b70ca..ffd379c970 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -3,6 +3,8 @@ package net.minecraft.server; @@ -134,5 +134,5 @@ index 6b69be7421..37374ae5b3 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0142-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0141-PlayerTeleportEndGatewayEvent.patch similarity index 94% rename from Spigot-Server-Patches/0142-PlayerTeleportEndGatewayEvent.patch rename to Spigot-Server-Patches/0141-PlayerTeleportEndGatewayEvent.patch index c5b9d8f1a3..5e9fceae63 100644 --- a/Spigot-Server-Patches/0142-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0141-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 1ec750a1e9fffe5959c08da9927f1e8e8e09753b Mon Sep 17 00:00:00 2001 +From af4af9976fb10b41c436513723fa9f58c7bc3baf Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 21:44:50 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -19,5 +19,5 @@ index 2f44cf89f9..1783f59140 100644 if (teleEvent.isCancelled()) { return; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0142-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 96% rename from Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch rename to Spigot-Server-Patches/0142-Provide-E-TE-Chunk-count-stat-methods.patch index 39da83f209..28453ae716 100644 --- a/Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-Server-Patches/0142-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From c4c9bd77113a059d54e10603eb602a8454310e36 Mon Sep 17 00:00:00 2001 +From 8630f7f8db241e12a753cafae1d81092a54c3fc1 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/0144-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0143-Enforce-Sync-Player-Saves.patch similarity index 90% rename from Spigot-Server-Patches/0144-Enforce-Sync-Player-Saves.patch rename to Spigot-Server-Patches/0143-Enforce-Sync-Player-Saves.patch index 4fe453fd27..01774b9b73 100644 --- a/Spigot-Server-Patches/0144-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0143-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From a8a8f44e6b5ff879b3df33496bb1529836997fc6 Mon Sep 17 00:00:00 2001 +From 3680d942009e273966790b51f05ee712053bb431 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:41:58 -0500 Subject: [PATCH] Enforce Sync Player Saves @@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index ca6863adc4..99aedfe8d5 100644 +index ee5297dc38..ccf8b7c707 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -930,11 +930,13 @@ public abstract class PlayerList { @@ -25,5 +25,5 @@ index ca6863adc4..99aedfe8d5 100644 public WhiteList getWhitelist() { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0145-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0144-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 93% rename from Spigot-Server-Patches/0145-Don-t-allow-entities-to-ride-themselves-572.patch rename to Spigot-Server-Patches/0144-Don-t-allow-entities-to-ride-themselves-572.patch index a719e09fc9..b7a8bd78b8 100644 --- a/Spigot-Server-Patches/0145-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0144-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,4 +1,4 @@ -From f75ca265343834ec3ad756ba51d8c526b5b532e4 Mon Sep 17 00:00:00 2001 +From 9b3f4c490e738a0d2f35ebf3b8faa6d5d454b9b2 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/Spigot-Server-Patches/0146-Fix-block-break-desync.patch b/Spigot-Server-Patches/0145-Fix-block-break-desync.patch similarity index 90% rename from Spigot-Server-Patches/0146-Fix-block-break-desync.patch rename to Spigot-Server-Patches/0145-Fix-block-break-desync.patch index e384877a42..64024222d0 100644 --- a/Spigot-Server-Patches/0146-Fix-block-break-desync.patch +++ b/Spigot-Server-Patches/0145-Fix-block-break-desync.patch @@ -1,11 +1,11 @@ -From 0644dde4c9469d6df4361024f66736701e159fb6 Mon Sep 17 00:00:00 2001 +From 775d003e54e71a05b075395faad7fc6c01db7fe9 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f88ec07835..20ecb9ef05 100644 +index 6632b80d2a..ac8ab28a35 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1179,6 +1179,8 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -18,5 +18,5 @@ index f88ec07835..20ecb9ef05 100644 } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) { return; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0146-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 99% rename from Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to Spigot-Server-Patches/0146-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 0c8897046d..aa50ed26f4 100644 --- a/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0146-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 674113294741991783d32f1717fe1f1cc111c56e Mon Sep 17 00:00:00 2001 +From e81b55e667659802d85f0197c4187c6f918c8e52 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:31:46 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player diff --git a/Spigot-Server-Patches/0148-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0147-Cap-Entity-Collisions.patch similarity index 94% rename from Spigot-Server-Patches/0148-Cap-Entity-Collisions.patch rename to Spigot-Server-Patches/0147-Cap-Entity-Collisions.patch index 3c22450b72..c7a7dac869 100644 --- a/Spigot-Server-Patches/0148-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0147-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From f1130718576a46dd0584cb28f10b0b451840a3bb Mon Sep 17 00:00:00 2001 +From 25f86fbad228623411fc3764317edb52bc2c879a 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 406bc611c1..58fe5a8c4d 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e1ad87f2fe..e15fd1dc72 100644 +index f541011a34..187441e87d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -39,7 +39,7 @@ index e1ad87f2fe..e15fd1dc72 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b402818008..5e58930e81 100644 +index cb2f3eb458..7695404790 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2559,8 +2559,11 @@ public abstract class EntityLiving extends Entity { @@ -56,5 +56,5 @@ index b402818008..5e58930e81 100644 this.D(entity); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0149-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0148-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 96% rename from Spigot-Server-Patches/0149-Remove-CraftScheduler-Async-Task-Debugger.patch rename to Spigot-Server-Patches/0148-Remove-CraftScheduler-Async-Task-Debugger.patch index 1ac73f8b9f..c6c27e1af9 100644 --- a/Spigot-Server-Patches/0149-Remove-CraftScheduler-Async-Task-Debugger.patch +++ b/Spigot-Server-Patches/0148-Remove-CraftScheduler-Async-Task-Debugger.patch @@ -1,4 +1,4 @@ -From 9b76d21faf5f8187f9297f728bf578cd5418738d Mon Sep 17 00:00:00 2001 +From 04af820e49a344152ec1bd0a9daf4f2c44aea781 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 @@ -47,5 +47,5 @@ index 552daf4376..e102be583c 100644 @Deprecated -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0149-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch similarity index 97% rename from Spigot-Server-Patches/0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch rename to Spigot-Server-Patches/0149-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index 218577f7b2..4926526c74 100644 --- a/Spigot-Server-Patches/0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/Spigot-Server-Patches/0149-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -1,4 +1,4 @@ -From a8776e3e3d6d0fa4f7e873ecf5bf0613c035c811 Mon Sep 17 00:00:00 2001 +From 30af74c2627fbed188f8faa0d2055df0d293a699 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/0151-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0150-Do-not-let-armorstands-drown.patch similarity index 96% rename from Spigot-Server-Patches/0151-Do-not-let-armorstands-drown.patch rename to Spigot-Server-Patches/0150-Do-not-let-armorstands-drown.patch index d062e2c69c..ab486a3d34 100644 --- a/Spigot-Server-Patches/0151-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0150-Do-not-let-armorstands-drown.patch @@ -1,4 +1,4 @@ -From bf168d4122dee870e39cb2350a42dd74d9dcff28 Mon Sep 17 00:00:00 2001 +From 96957aa18534d0571cfc8b389b7920d040aede63 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/0152-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0151-Properly-handle-async-calls-to-restart-the-server.patch similarity index 99% rename from Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch rename to Spigot-Server-Patches/0151-Properly-handle-async-calls-to-restart-the-server.patch index 86ebc5e9f4..2445cea9f9 100644 --- a/Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0151-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From 8eab04cea452331e234fd2e9efab94ba9b062fc0 Mon Sep 17 00:00:00 2001 +From 1b30ad8c9df9c5d7f37cbfc77ce0a143cf30a5d9 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/0153-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0152-Add-system-property-to-disable-book-size-limits.patch similarity index 97% rename from Spigot-Server-Patches/0153-Add-system-property-to-disable-book-size-limits.patch rename to Spigot-Server-Patches/0152-Add-system-property-to-disable-book-size-limits.patch index 7cfffd65d8..600df7424b 100644 --- a/Spigot-Server-Patches/0153-Add-system-property-to-disable-book-size-limits.patch +++ b/Spigot-Server-Patches/0152-Add-system-property-to-disable-book-size-limits.patch @@ -1,4 +1,4 @@ -From e7875772c3d38a9ef46d168cad323488980d69f6 Mon Sep 17 00:00:00 2001 +From 683df218036ebc78192dc9c8a02c55b80d8667c3 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 @@ -57,5 +57,5 @@ index fe8e6dcb77..f8a3c9718d 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0154-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0153-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 95% rename from Spigot-Server-Patches/0154-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to Spigot-Server-Patches/0153-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index 120e219038..7aaf0d6e4e 100644 --- a/Spigot-Server-Patches/0154-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/Spigot-Server-Patches/0153-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -1,4 +1,4 @@ -From a177666eae7d3cb7a0d44a74ad229d61d8c173c8 Mon Sep 17 00:00:00 2001 +From c4b698b1aad2c729f5fd134247b4ae2d1d272cf0 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 @@ -26,7 +26,7 @@ index 58fe5a8c4d..a341214952 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 892922ca63..cfcbd1a2e5 100644 +index 1a1b1dd1e8..0974135c65 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -436,7 +436,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -39,7 +39,7 @@ index 892922ca63..cfcbd1a2e5 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 20ecb9ef05..5b888cdaf9 100644 +index ac8ab28a35..175f685d27 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1787,6 +1787,13 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -57,5 +57,5 @@ index 20ecb9ef05..5b888cdaf9 100644 case STOP_SNEAKING: this.player.setSneaking(false); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0155-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0154-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 92% rename from Spigot-Server-Patches/0155-Add-configuration-option-to-prevent-player-names-fro.patch rename to Spigot-Server-Patches/0154-Add-configuration-option-to-prevent-player-names-fro.patch index c8e72279c4..ae4c01bfd7 100644 --- a/Spigot-Server-Patches/0155-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-Server-Patches/0154-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From d62ac0b6e20553f8febf57002df663f4bd6e4bea Mon Sep 17 00:00:00 2001 +From 8a835287484b998c45492a6eabbd77e416d4a77a Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 9 Jun 2017 07:24:34 -0700 Subject: [PATCH] Add configuration option to prevent player names from being @@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index b5a50afd2..11d2a1013 100644 +index b5a50afd24..11d2a1013b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -259,4 +259,9 @@ public class PaperConfig { @@ -20,7 +20,7 @@ index b5a50afd2..11d2a1013 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a63a3798c..84e0b5bc2 100644 +index 5712560058..91618e1cc4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2090,5 +2090,10 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0156-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0155-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 99% rename from Spigot-Server-Patches/0156-Use-TerminalConsoleAppender-for-console-improvements.patch rename to Spigot-Server-Patches/0155-Use-TerminalConsoleAppender-for-console-improvements.patch index 72d5391cbd..6437780b5e 100644 --- a/Spigot-Server-Patches/0156-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0155-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From f6cc721c80acddf822ac4edb3f47e97140c03bea Mon Sep 17 00:00:00 2001 +From 6f8be57e59c46637610960e4bb672fdaed914cec Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements diff --git a/Spigot-Server-Patches/0157-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0156-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 94% rename from Spigot-Server-Patches/0157-provide-a-configurable-option-to-disable-creeper-lin.patch rename to Spigot-Server-Patches/0156-provide-a-configurable-option-to-disable-creeper-lin.patch index 21058fccf2..82d5bdfbe6 100644 --- a/Spigot-Server-Patches/0157-provide-a-configurable-option-to-disable-creeper-lin.patch +++ b/Spigot-Server-Patches/0156-provide-a-configurable-option-to-disable-creeper-lin.patch @@ -1,4 +1,4 @@ -From 431c39c6b3ee684e88a0150bbab94c0a55c1303e Mon Sep 17 00:00:00 2001 +From 3e86d99e5f3c5d4e37b9b33d28490c32fd29e009 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Jun 2017 21:01:18 +0100 Subject: [PATCH] provide a configurable option to disable creeper lingering @@ -21,7 +21,7 @@ index a341214952..abc967d3f5 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 13ddc00d68..9f03d03375 100644 +index e1374d2398..0503af5af3 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -225,7 +225,7 @@ public class EntityCreeper extends EntityMonster { @@ -34,5 +34,5 @@ index 13ddc00d68..9f03d03375 100644 entityareaeffectcloud.setSource(this); // CraftBukkit -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0158-Item-canEntityPickup.patch b/Spigot-Server-Patches/0157-Item-canEntityPickup.patch similarity index 97% rename from Spigot-Server-Patches/0158-Item-canEntityPickup.patch rename to Spigot-Server-Patches/0157-Item-canEntityPickup.patch index e87435a768..8942ac734c 100644 --- a/Spigot-Server-Patches/0158-Item-canEntityPickup.patch +++ b/Spigot-Server-Patches/0157-Item-canEntityPickup.patch @@ -1,4 +1,4 @@ -From 7624eca940fe78d29f514c7fa7b2a38222c4c287 Mon Sep 17 00:00:00 2001 +From d6ffd0ce568969f209eda0a4b772fac3c99cb791 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:17 -0500 Subject: [PATCH] Item#canEntityPickup diff --git a/Spigot-Server-Patches/0159-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0158-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 95% rename from Spigot-Server-Patches/0159-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to Spigot-Server-Patches/0158-PlayerPickupItemEvent-setFlyAtPlayer.patch index 19610c4b87..f7cf60028a 100644 --- a/Spigot-Server-Patches/0159-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-Server-Patches/0158-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 3adf70a9d27f3776a9362ff5b33116e2428e9b15 Mon Sep 17 00:00:00 2001 +From cc323d545a6848f3374ffea305558da5eb91451c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:09 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index d9c7a21504..b77e3e6684 100644 +index c0b81223f1..1baff88c4a 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -318,6 +318,7 @@ public class EntityItem extends Entity { @@ -44,5 +44,5 @@ index d9c7a21504..b77e3e6684 100644 this.die(); itemstack.setCount(i); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0160-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0159-PlayerAttemptPickupItemEvent.patch similarity index 93% rename from Spigot-Server-Patches/0160-PlayerAttemptPickupItemEvent.patch rename to Spigot-Server-Patches/0159-PlayerAttemptPickupItemEvent.patch index 7642730cdd..8692759a82 100644 --- a/Spigot-Server-Patches/0160-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-Server-Patches/0159-PlayerAttemptPickupItemEvent.patch @@ -1,11 +1,11 @@ -From 5dc4cb491195fc4ab9a94beecde37314ba8f4bb8 Mon Sep 17 00:00:00 2001 +From 9baa44b04f58ad80dbb3d6c5889b5c56e45a7063 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:30 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index b77e3e6684..b813f402cd 100644 +index 1baff88c4a..f1f86ef8b5 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -8,6 +8,7 @@ import javax.annotation.Nullable; @@ -40,5 +40,5 @@ index b77e3e6684..b813f402cd 100644 itemstack.setCount(canHold); // Call legacy event -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0161-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0160-Add-UnknownCommandEvent.patch similarity index 94% rename from Spigot-Server-Patches/0161-Add-UnknownCommandEvent.patch rename to Spigot-Server-Patches/0160-Add-UnknownCommandEvent.patch index cf93a63364..edaaa2da50 100644 --- a/Spigot-Server-Patches/0161-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0160-Add-UnknownCommandEvent.patch @@ -1,11 +1,11 @@ -From dbda32bf98912ea95692678327b76ba4cacade12 Mon Sep 17 00:00:00 2001 +From 01d77313d73d18364ca1e8bc114f4094cdf77d7d Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:21 -0400 Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b6ae46ae00..5e0118978d 100644 +index 6528705809..f1bacaa316 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -77,6 +77,7 @@ import net.minecraft.server.WorldServer; @@ -40,5 +40,5 @@ index b6ae46ae00..5e0118978d 100644 // Spigot end -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0162-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0161-Basic-PlayerProfile-API.patch similarity index 99% rename from Spigot-Server-Patches/0162-Basic-PlayerProfile-API.patch rename to Spigot-Server-Patches/0161-Basic-PlayerProfile-API.patch index 8ccd3b0116..2b57a1c641 100644 --- a/Spigot-Server-Patches/0162-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0161-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From e961e12849371c52121475dba18b552bee9ed306 Mon Sep 17 00:00:00 2001 +From 964f26c93dfb6aaf7285cc4441827b1932e071a0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API diff --git a/Spigot-Server-Patches/0163-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0162-Shoulder-Entities-Release-API.patch similarity index 98% rename from Spigot-Server-Patches/0163-Shoulder-Entities-Release-API.patch rename to Spigot-Server-Patches/0162-Shoulder-Entities-Release-API.patch index edc9c3d902..d95525993a 100644 --- a/Spigot-Server-Patches/0163-Shoulder-Entities-Release-API.patch +++ b/Spigot-Server-Patches/0162-Shoulder-Entities-Release-API.patch @@ -1,4 +1,4 @@ -From 71e205fc8189f676cc4600851d7812d351f91db0 Mon Sep 17 00:00:00 2001 +From f008ff982451ce9641423b9acb9da537cfc40543 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 15:18:30 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/Spigot-Server-Patches/0164-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0163-Profile-Lookup-Events.patch similarity index 98% rename from Spigot-Server-Patches/0164-Profile-Lookup-Events.patch rename to Spigot-Server-Patches/0163-Profile-Lookup-Events.patch index 9f92e7e2c2..0d33120e81 100644 --- a/Spigot-Server-Patches/0164-Profile-Lookup-Events.patch +++ b/Spigot-Server-Patches/0163-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From 268f0e45ba5ead3b8c87011230f625f86e438f14 Mon Sep 17 00:00:00 2001 +From f6a2b66f0e5156d76a1d731c48bba727b1207c09 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 17:00:32 -0400 Subject: [PATCH] Profile Lookup Events @@ -81,5 +81,5 @@ index 3bcdb8f93f..bb9894318e 100644 } } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0165-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0164-Block-player-logins-during-server-shutdown.patch similarity index 93% rename from Spigot-Server-Patches/0165-Block-player-logins-during-server-shutdown.patch rename to Spigot-Server-Patches/0164-Block-player-logins-during-server-shutdown.patch index 483be44809..3db70dc206 100644 --- a/Spigot-Server-Patches/0165-Block-player-logins-during-server-shutdown.patch +++ b/Spigot-Server-Patches/0164-Block-player-logins-during-server-shutdown.patch @@ -1,4 +1,4 @@ -From 6b5222a0d18c2480df7603625ecacd6ab7423bee Mon Sep 17 00:00:00 2001 +From a9e916ddd30419bc82b0938d310b646b840df645 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 2 Jul 2017 21:35:56 -0500 Subject: [PATCH] Block player logins during server shutdown @@ -22,5 +22,5 @@ index 22d5c7d20a..91b6f1de80 100644 this.c(); } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0166-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0165-Entity-fromMobSpawner.patch similarity index 98% rename from Spigot-Server-Patches/0166-Entity-fromMobSpawner.patch rename to Spigot-Server-Patches/0165-Entity-fromMobSpawner.patch index 8b2975125a..f250b57ae1 100644 --- a/Spigot-Server-Patches/0166-Entity-fromMobSpawner.patch +++ b/Spigot-Server-Patches/0165-Entity-fromMobSpawner.patch @@ -1,4 +1,4 @@ -From d63672d137904d533b23538d91e2349181a48e02 Mon Sep 17 00:00:00 2001 +From 31c3e212cbb80c9baae344907996eb3169799122 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/Spigot-Server-Patches/0167-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0166-Improve-the-Saddle-API-for-Horses.patch similarity index 97% rename from Spigot-Server-Patches/0167-Improve-the-Saddle-API-for-Horses.patch rename to Spigot-Server-Patches/0166-Improve-the-Saddle-API-for-Horses.patch index c349e39ea8..cf71ffc86a 100644 --- a/Spigot-Server-Patches/0167-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-Server-Patches/0166-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From bffbd646bbe2d0ccec1ec3e76227a5f0c2468bd2 Mon Sep 17 00:00:00 2001 +From 071b823ed588b9674e461e2cd86eac137df94bde Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Dec 2016 16:24:06 -0500 Subject: [PATCH] Improve the Saddle API for Horses @@ -61,5 +61,5 @@ index 0000000000..99cfbaf90b + +} -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0168-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0167-Implement-ensureServerConversions-API.patch similarity index 93% rename from Spigot-Server-Patches/0168-Implement-ensureServerConversions-API.patch rename to Spigot-Server-Patches/0167-Implement-ensureServerConversions-API.patch index 74a0e317b9..f3bc4ff4fb 100644 --- a/Spigot-Server-Patches/0168-Implement-ensureServerConversions-API.patch +++ b/Spigot-Server-Patches/0167-Implement-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From d72bdcebc98a30a3345f7f2ac54bf6a6231c7fc3 Mon Sep 17 00:00:00 2001 +From 95a62dfe623a3db5bf5fe0dedc858723c5fe49d8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 22:43:12 -0400 Subject: [PATCH] Implement ensureServerConversions API @@ -22,5 +22,5 @@ index 133a80ee05..1dc21e08db 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0169-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0168-Implement-getI18NDisplayName.patch similarity index 96% rename from Spigot-Server-Patches/0169-Implement-getI18NDisplayName.patch rename to Spigot-Server-Patches/0168-Implement-getI18NDisplayName.patch index 1ddd18d20b..f3f2cc7bf6 100644 --- a/Spigot-Server-Patches/0169-Implement-getI18NDisplayName.patch +++ b/Spigot-Server-Patches/0168-Implement-getI18NDisplayName.patch @@ -1,4 +1,4 @@ -From bb223cd0e09381cf7c62fc08b25013e5790b1a82 Mon Sep 17 00:00:00 2001 +From 34dc27d1706f5947b85bc1c52b1cf45954d12551 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:59:38 -0400 Subject: [PATCH] Implement getI18NDisplayName diff --git a/Spigot-Server-Patches/0170-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0169-ProfileWhitelistVerifyEvent.patch similarity index 97% rename from Spigot-Server-Patches/0170-ProfileWhitelistVerifyEvent.patch rename to Spigot-Server-Patches/0169-ProfileWhitelistVerifyEvent.patch index 60c8afb16c..d02af5b4dc 100644 --- a/Spigot-Server-Patches/0170-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-Server-Patches/0169-ProfileWhitelistVerifyEvent.patch @@ -1,4 +1,4 @@ -From db62c709bbc0622ea837fdcd760c04366ac762a0 Mon Sep 17 00:00:00 2001 +From e02110d4745e02e359c48da4a50f3cb83a052ef4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:10 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent diff --git a/Spigot-Server-Patches/0171-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0170-Fix-this-stupid-bullshit.patch similarity index 95% rename from Spigot-Server-Patches/0171-Fix-this-stupid-bullshit.patch rename to Spigot-Server-Patches/0170-Fix-this-stupid-bullshit.patch index c121f5e01d..a5513c27bf 100644 --- a/Spigot-Server-Patches/0171-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0170-Fix-this-stupid-bullshit.patch @@ -1,4 +1,4 @@ -From e7da035fc66ac524b9c12166e031d9bb6d175ae5 Mon Sep 17 00:00:00 2001 +From 8b179538436564e62406d8d4ca1b68b77192d430 Mon Sep 17 00:00:00 2001 From: DemonWav Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit @@ -29,5 +29,5 @@ index 4aebe53f8a..405ea5c465 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0171-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 92% rename from Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to Spigot-Server-Patches/0171-Ocelot-despawns-should-honor-nametags-and-leash.patch index 062367d532..a423a6ca67 100644 --- a/Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch +++ b/Spigot-Server-Patches/0171-Ocelot-despawns-should-honor-nametags-and-leash.patch @@ -1,4 +1,4 @@ -From f7877d26120925dbabe0977916bc73476426ac68 Mon Sep 17 00:00:00 2001 +From 35e77793dd39c7699a40e87fb7a39359baf2a0c5 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:54:40 -0500 Subject: [PATCH] Ocelot despawns should honor nametags and leash diff --git a/Spigot-Server-Patches/0173-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0172-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 92% rename from Spigot-Server-Patches/0173-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to Spigot-Server-Patches/0172-Reset-spawner-timer-when-spawner-event-is-cancelled.patch index 9f9be5af99..384345a493 100644 --- a/Spigot-Server-Patches/0173-Reset-spawner-timer-when-spawner-event-is-cancelled.patch +++ b/Spigot-Server-Patches/0172-Reset-spawner-timer-when-spawner-event-is-cancelled.patch @@ -1,11 +1,11 @@ -From c8a3ac3b122efcb12b6b67fe3aa8d3fa39da9e24 Mon Sep 17 00:00:00 2001 +From 04b5b085feab5f37a904100407e28d2fd8a1e7c8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:45:19 -0500 Subject: [PATCH] Reset spawner timer when spawner event is cancelled diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 7d140a6f5a..93fad14d3f 100644 +index 4bd511dd7c..59bd9ccd70 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -139,6 +139,9 @@ public abstract class MobSpawnerAbstract { @@ -28,5 +28,5 @@ index 7d140a6f5a..93fad14d3f 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0174-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0173-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 91% rename from Spigot-Server-Patches/0174-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to Spigot-Server-Patches/0173-Fix-MC-117075-TE-Unload-Lag-Spike.patch index 0f4f10bb0b..83a6bc40ec 100644 --- a/Spigot-Server-Patches/0174-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/0173-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -1,11 +1,11 @@ -From a2985f1101c80660cf8832eaf19a902ef2979081 Mon Sep 17 00:00:00 2001 +From 1a7a9a51b43e095130857564bbcdb0f68fcebcda Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 9 Aug 2017 17:51:22 -0500 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a8cfdd0eee..250767b94e 100644 +index 9142edd4f8..4498a21073 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -734,7 +734,11 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -22,5 +22,5 @@ index a8cfdd0eee..250767b94e 100644 this.tileEntityListUnload.clear(); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0175-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0174-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 95% rename from Spigot-Server-Patches/0175-Allow-specifying-a-custom-authentication-servers-dow.patch rename to Spigot-Server-Patches/0174-Allow-specifying-a-custom-authentication-servers-dow.patch index 3c20be5b1e..d0c0877d70 100644 --- a/Spigot-Server-Patches/0175-Allow-specifying-a-custom-authentication-servers-dow.patch +++ b/Spigot-Server-Patches/0174-Allow-specifying-a-custom-authentication-servers-dow.patch @@ -1,4 +1,4 @@ -From 46382aea473c15b38bab2ab4dfd169d443a812be Mon Sep 17 00:00:00 2001 +From 858c91ba3c061e0005949dbbf7c269e9d2833289 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 17 Aug 2017 16:08:20 -0700 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick @@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 56cea23b06..f4d089f3ef 100644 +index 11d2a1013b..11f08c2b73 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -1,5 +1,6 @@ @@ -42,5 +42,5 @@ index 91b6f1de80..398f67f4b6 100644 LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable"); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0176-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0175-LivingEntity-setKiller.patch similarity index 94% rename from Spigot-Server-Patches/0176-LivingEntity-setKiller.patch rename to Spigot-Server-Patches/0175-LivingEntity-setKiller.patch index c322b0721b..ed9a23dd9e 100644 --- a/Spigot-Server-Patches/0176-LivingEntity-setKiller.patch +++ b/Spigot-Server-Patches/0175-LivingEntity-setKiller.patch @@ -1,11 +1,11 @@ -From 0676117ae1cf83582d918c9ff4d18941193bd7fa Mon Sep 17 00:00:00 2001 +From a7f048ab79c856fbd66d9771917961fcdf0849a3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:48 -0500 Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index ed528faada..60d365d163 100644 +index 3961ae1710..31e3bf0edf 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -76,7 +76,7 @@ public abstract class EntityLiving extends Entity { @@ -39,5 +39,5 @@ index aa50435bec..42cc158824 100644 public boolean addPotionEffect(PotionEffect effect) { return addPotionEffect(effect, false); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0176-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch similarity index 95% rename from Spigot-Server-Patches/0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch rename to Spigot-Server-Patches/0176-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index 1734c1202c..5980e49e56 100644 --- a/Spigot-Server-Patches/0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/Spigot-Server-Patches/0176-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -1,4 +1,4 @@ -From e231bdeb4f428f995d8de30ae00651cef191147b Mon Sep 17 00:00:00 2001 +From acbb8800c69c6b08ac98fd6b56f92730baf8936b Mon Sep 17 00:00:00 2001 From: Minecrell Date: Mon, 18 Sep 2017 12:00:03 +0200 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger @@ -12,7 +12,7 @@ results in a separate line, even though it should not result in a line break. Log4j's implementation handles it correctly. diff --git a/pom.xml b/pom.xml -index ef508bbd71..5c401a71c5 100644 +index 58ccbaa1ae..85fa0d9833 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,11 @@ diff --git a/Spigot-Server-Patches/0178-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0177-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 97% rename from Spigot-Server-Patches/0178-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to Spigot-Server-Patches/0177-Handle-plugin-prefixes-using-Log4J-configuration.patch index 46c8053122..ae08ccecc9 100644 --- a/Spigot-Server-Patches/0178-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0177-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -1,4 +1,4 @@ -From d6471afd221ff20861555e4dd9a763da3e15d4b8 Mon Sep 17 00:00:00 2001 +From 9f209f9fdb0f1db65d06fc642e2734d923c69c26 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:55 +0200 Subject: [PATCH] Handle plugin prefixes using Log4J configuration @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/pom.xml b/pom.xml -index 80359d1bf5..85f005aa99 100644 +index 85fa0d9833..5558921cd7 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ @@ -70,5 +70,5 @@ index 08b6bb7f97..9f8334376f 100644 -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0179-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0178-Include-Log4J2-SLF4J-implementation.patch similarity index 86% rename from Spigot-Server-Patches/0179-Include-Log4J2-SLF4J-implementation.patch rename to Spigot-Server-Patches/0178-Include-Log4J2-SLF4J-implementation.patch index 136ab9b3b1..7d4c1cf866 100644 --- a/Spigot-Server-Patches/0179-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0178-Include-Log4J2-SLF4J-implementation.patch @@ -1,11 +1,11 @@ -From 59eca7b341a244fc699ffd026269f9549f843cfc Mon Sep 17 00:00:00 2001 +From de30ec478a00e6fccbb8039b4d9f5fcd5f0b0a44 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:35 +0200 Subject: [PATCH] Include Log4J2 SLF4J implementation diff --git a/pom.xml b/pom.xml -index 85f005aa99..a10ab7cbb6 100644 +index 5558921cd7..4ead093278 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,12 @@ @@ -22,5 +22,5 @@ index 85f005aa99..a10ab7cbb6 100644 org.apache.logging.log4j log4j-iostreams -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0180-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0179-Disable-logger-prefix-for-various-plugins-bypassing-.patch similarity index 96% rename from Spigot-Server-Patches/0180-Disable-logger-prefix-for-various-plugins-bypassing-.patch rename to Spigot-Server-Patches/0179-Disable-logger-prefix-for-various-plugins-bypassing-.patch index 6cf2ff86f7..6467e16677 100644 --- a/Spigot-Server-Patches/0180-Disable-logger-prefix-for-various-plugins-bypassing-.patch +++ b/Spigot-Server-Patches/0179-Disable-logger-prefix-for-various-plugins-bypassing-.patch @@ -1,4 +1,4 @@ -From d87e2204f9fe229e5255c4e310f1d53094c66fb1 Mon Sep 17 00:00:00 2001 +From 82fd6103c48845be28830291ff3beb861b79fa4f Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sat, 23 Sep 2017 21:07:20 +0200 Subject: [PATCH] Disable logger prefix for various plugins bypassing the @@ -35,5 +35,5 @@ index 9f8334376f..6711e6dff9 100644 -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0181-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0180-Add-PlayerJumpEvent.patch similarity index 96% rename from Spigot-Server-Patches/0181-Add-PlayerJumpEvent.patch rename to Spigot-Server-Patches/0180-Add-PlayerJumpEvent.patch index 875aabe1e4..594b7afc58 100644 --- a/Spigot-Server-Patches/0181-Add-PlayerJumpEvent.patch +++ b/Spigot-Server-Patches/0180-Add-PlayerJumpEvent.patch @@ -1,11 +1,11 @@ -From 405dfb08e27bc7c6acc024bec9837e4563665704 Mon Sep 17 00:00:00 2001 +From 0140510111bb6ade378f031f5e2e73d48125a6af Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:44 -0400 Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5b888cdaf9..3ba0ca063c 100644 +index 175f685d27..a04577fc00 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory; @@ -54,5 +54,5 @@ index 5b888cdaf9..3ba0ca063c 100644 this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9)); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0182-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0181-handle-PacketPlayInKeepAlive-async.patch similarity index 95% rename from Spigot-Server-Patches/0182-handle-PacketPlayInKeepAlive-async.patch rename to Spigot-Server-Patches/0181-handle-PacketPlayInKeepAlive-async.patch index 610747749c..159e422547 100644 --- a/Spigot-Server-Patches/0182-handle-PacketPlayInKeepAlive-async.patch +++ b/Spigot-Server-Patches/0181-handle-PacketPlayInKeepAlive-async.patch @@ -1,4 +1,4 @@ -From 6c6217c28e5d281cb4a6711f408feda4b11a2c26 Mon Sep 17 00:00:00 2001 +From 1ef7f2174a1803599715615c8adc4c30910af694 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 5 Oct 2017 01:54:07 +0100 Subject: [PATCH] handle PacketPlayInKeepAlive async @@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing random disconnections for clients. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3ba0ca063c..a7275e7ef8 100644 +index a04577fc00..c6a5b00f4f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2507,14 +2507,18 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -40,5 +40,5 @@ index 3ba0ca063c..a7275e7ef8 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0183-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0182-Expose-client-protocol-version-and-virtual-host.patch similarity index 98% rename from Spigot-Server-Patches/0183-Expose-client-protocol-version-and-virtual-host.patch rename to Spigot-Server-Patches/0182-Expose-client-protocol-version-and-virtual-host.patch index 7facd0dd17..439a222134 100644 --- a/Spigot-Server-Patches/0183-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-Server-Patches/0182-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From 15855906cc02f96933838633a10a24733a24618a Mon Sep 17 00:00:00 2001 +From 4cf6d5926062d486f4a50f535729040c2f737f20 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:45:20 +0200 Subject: [PATCH] Expose client protocol version and virtual host diff --git a/Spigot-Server-Patches/0184-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0183-revert-serverside-behavior-of-keepalives.patch similarity index 97% rename from Spigot-Server-Patches/0184-revert-serverside-behavior-of-keepalives.patch rename to Spigot-Server-Patches/0183-revert-serverside-behavior-of-keepalives.patch index 28f53983b6..ab515c4188 100644 --- a/Spigot-Server-Patches/0184-revert-serverside-behavior-of-keepalives.patch +++ b/Spigot-Server-Patches/0183-revert-serverside-behavior-of-keepalives.patch @@ -1,4 +1,4 @@ -From e40d8b0493dbaac80cddf8a09ed5c731c2581c39 Mon Sep 17 00:00:00 2001 +From 1a9949e280b4bebe540a442cee90614fd94c2bd7 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 15 Oct 2017 00:29:07 +0100 Subject: [PATCH] revert serverside behavior of keepalives @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a7275e7ef8..22dca3fe68 100644 +index c6a5b00f4f..eb720814b2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -74,5 +74,5 @@ index a7275e7ef8..22dca3fe68 100644 this.minecraftServer.getMethodProfiler().exit(); // CraftBukkit start -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0184-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 98% rename from Spigot-Server-Patches/0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to Spigot-Server-Patches/0184-Send-attack-SoundEffects-only-to-players-who-can-see.patch index c726fb9114..44056df2e3 100644 --- a/Spigot-Server-Patches/0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch +++ b/Spigot-Server-Patches/0184-Send-attack-SoundEffects-only-to-players-who-can-see.patch @@ -1,4 +1,4 @@ -From 492d1245c3a9cc3a18c95c4db09b6f44df606ed8 Mon Sep 17 00:00:00 2001 +From eefa48f2de222faf1d041b776efaf9875b7099ac Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 31 Oct 2017 03:26:18 +0100 Subject: [PATCH] Send attack SoundEffects only to players who can see the diff --git a/Spigot-Server-Patches/0186-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0185-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 96% rename from Spigot-Server-Patches/0186-Option-for-maximum-exp-value-when-merging-orbs.patch rename to Spigot-Server-Patches/0185-Option-for-maximum-exp-value-when-merging-orbs.patch index d287dc6d91..4039b808aa 100644 --- a/Spigot-Server-Patches/0186-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0185-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -1,4 +1,4 @@ -From 48b7998a874015e3d8f5ea4f419acdbccf9fc6ea Mon Sep 17 00:00:00 2001 +From 483471325dc8eb5956f2fbb3c00ff4100a5e08e3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 10 Nov 2017 23:03:12 -0500 Subject: [PATCH] Option for maximum exp value when merging orbs @@ -20,7 +20,7 @@ index abc967d3f5..2a50d6babf 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 224d1dbffc..123cefd47c 100644 +index a33a9fd792..85a9dd5abb 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -529,16 +529,32 @@ public class CraftEventFactory { @@ -60,5 +60,5 @@ index 224d1dbffc..123cefd47c 100644 // Spigot end } else if (!(entity instanceof EntityPlayer)) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0187-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0186-Add-PlayerArmorChangeEvent.patch similarity index 95% rename from Spigot-Server-Patches/0187-Add-PlayerArmorChangeEvent.patch rename to Spigot-Server-Patches/0186-Add-PlayerArmorChangeEvent.patch index aef46b2cf4..ed3b6ac27d 100644 --- a/Spigot-Server-Patches/0187-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-Server-Patches/0186-Add-PlayerArmorChangeEvent.patch @@ -1,11 +1,11 @@ -From 54531036950a2891e999a6eea8e6c2683ea15bab Mon Sep 17 00:00:00 2001 +From bf32bf3a52c0b61c1ecef7ac8e4f2bda54cbc8b6 Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:46:34 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 60d365d163..6c75db0ee2 100644 +index 31e3bf0edf..1157a9eb63 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1,5 +1,6 @@ @@ -42,5 +42,5 @@ index 02a7ae6785..60b235f16f 100644 return this.g; } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0188-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0187-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 93% rename from Spigot-Server-Patches/0188-Prevent-logins-from-being-processed-when-the-player-.patch rename to Spigot-Server-Patches/0187-Prevent-logins-from-being-processed-when-the-player-.patch index 4bddad87bf..ef14f9ead0 100644 --- a/Spigot-Server-Patches/0188-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/Spigot-Server-Patches/0187-Prevent-logins-from-being-processed-when-the-player-.patch @@ -1,4 +1,4 @@ -From 71c74c8488e21b1da841fb5211b7eaa09b25c693 Mon Sep 17 00:00:00 2001 +From 4ecf4e7620ffd03508de14868a4ead9c60538684 Mon Sep 17 00:00:00 2001 From: killme Date: Sun, 12 Nov 2017 19:40:01 +0100 Subject: [PATCH] Prevent logins from being processed when the player has @@ -23,5 +23,5 @@ index 398f67f4b6..fe912e0eb1 100644 EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId()); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0189-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0188-use-CB-BlockState-implementations-for-captured-block.patch similarity index 94% rename from Spigot-Server-Patches/0189-use-CB-BlockState-implementations-for-captured-block.patch rename to Spigot-Server-Patches/0188-use-CB-BlockState-implementations-for-captured-block.patch index 581aae9229..e87a1d9fda 100644 --- a/Spigot-Server-Patches/0189-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0188-use-CB-BlockState-implementations-for-captured-block.patch @@ -1,4 +1,4 @@ -From b5a486f4091d15eb119a9de04c69e33b26f5821d Mon Sep 17 00:00:00 2001 +From 2782a4c62845d813bea905849ed8f34e4b24429e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 16 Nov 2017 12:12:41 +0000 Subject: [PATCH] use CB BlockState implementations for captured blocks @@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping information on restoration when the event is cancelled. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3d5b3892f1..0fc24f2076 100644 +index ed78bba710..985b459efe 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -348,7 +348,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -31,5 +31,5 @@ index 3d5b3892f1..0fc24f2076 100644 } // CraftBukkit end -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0190-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0189-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 98% rename from Spigot-Server-Patches/0190-API-to-get-a-BlockState-without-a-snapshot.patch rename to Spigot-Server-Patches/0189-API-to-get-a-BlockState-without-a-snapshot.patch index bd1b55da7f..128affa924 100644 --- a/Spigot-Server-Patches/0190-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0189-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From 9a8c63a1e8c01ce7cdf74e61fcc915d903fa5a19 Mon Sep 17 00:00:00 2001 +From 737bb71a4ceeeccf3e9e4060927f83d066c46372 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:08:22 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE If Tile Entity was null, correct Sign to return empty lines instead of null diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 35574a5ef3..acce1788db 100644 +index 5e495a4b8c..90cc57b46e 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -236,7 +236,12 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -131,5 +131,5 @@ index 15022ada0c..af15656cc4 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0191-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0190-AsyncTabCompleteEvent.patch similarity index 98% rename from Spigot-Server-Patches/0191-AsyncTabCompleteEvent.patch rename to Spigot-Server-Patches/0190-AsyncTabCompleteEvent.patch index b9c054c2d6..f3fba2c75f 100644 --- a/Spigot-Server-Patches/0191-AsyncTabCompleteEvent.patch +++ b/Spigot-Server-Patches/0190-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From b53cdf97994aa4d61a06bf64e608708c41c3983a Mon Sep 17 00:00:00 2001 +From 1a466ee597411c487d3c67762982498071c0597a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:19:58 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -14,7 +14,7 @@ completion, such as offline players. Also adds isCommand and getLocation to the sync TabCompleteEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 22dca3fe68..b0275fc14d 100644 +index eb720814b2..0a9fc4653a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -520,10 +520,10 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -72,7 +72,7 @@ index 22dca3fe68..b0275fc14d 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 455f52e3ea..5e9e601bf4 100644 +index 40ac5a9757..c72b68b03e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1662,7 +1662,7 @@ public final class CraftServer implements Server { @@ -129,5 +129,5 @@ index 5510266fb1..a51202ed53 100644 Waitable> waitable = new Waitable>() { @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0192-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0191-Avoid-NPE-in-PathfinderGoalTempt.patch similarity index 88% rename from Spigot-Server-Patches/0192-Avoid-NPE-in-PathfinderGoalTempt.patch rename to Spigot-Server-Patches/0191-Avoid-NPE-in-PathfinderGoalTempt.patch index 9b535bc052..233bcf32a7 100644 --- a/Spigot-Server-Patches/0192-Avoid-NPE-in-PathfinderGoalTempt.patch +++ b/Spigot-Server-Patches/0191-Avoid-NPE-in-PathfinderGoalTempt.patch @@ -1,11 +1,11 @@ -From cfbe644ce90f5771aa0417ac94410322c4ba6ee5 Mon Sep 17 00:00:00 2001 +From fa19402a942ab8272ab9c930fc1e81089f34ec87 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 29 Nov 2017 22:18:54 -0500 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java -index fb395bcded..d1164dd682 100644 +index 1bf5d6c08b..0b036f29cf 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java @@ -55,7 +55,7 @@ public class PathfinderGoalTempt extends PathfinderGoal { @@ -18,5 +18,5 @@ index fb395bcded..d1164dd682 100644 } } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0193-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0192-PlayerPickupExperienceEvent.patch similarity index 91% rename from Spigot-Server-Patches/0193-PlayerPickupExperienceEvent.patch rename to Spigot-Server-Patches/0192-PlayerPickupExperienceEvent.patch index 8f200ed4c2..b3cb689539 100644 --- a/Spigot-Server-Patches/0193-PlayerPickupExperienceEvent.patch +++ b/Spigot-Server-Patches/0192-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From 8c05281f55390af8e225a619fcce4cbb10e03d14 Mon Sep 17 00:00:00 2001 +From 71af057dab772c879a4292fd4a17994677fc95cf Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:02:53 -0500 Subject: [PATCH] PlayerPickupExperienceEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 49668f2c21..704a48c8ea 100644 +index 214ecdb884..8c25695669 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -219,7 +219,7 @@ public class EntityExperienceOrb extends Entity { @@ -19,5 +19,5 @@ index 49668f2c21..704a48c8ea 100644 entityhuman.receive(this, 1); Entry entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0194-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0193-ExperienceOrbMergeEvent.patch similarity index 93% rename from Spigot-Server-Patches/0194-ExperienceOrbMergeEvent.patch rename to Spigot-Server-Patches/0193-ExperienceOrbMergeEvent.patch index f823f86a3a..060236894d 100644 --- a/Spigot-Server-Patches/0194-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0193-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 443f117aa22831c4a72932a4d3f831c09821f84c Mon Sep 17 00:00:00 2001 +From fc1ff1410e553f1f59fb536a3ca3dc7216ecfd87 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:57:26 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 123cefd47c..12d4300437 100644 +index 85a9dd5abb..aedff6fcfd 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -539,7 +539,7 @@ public class CraftEventFactory { @@ -21,5 +21,5 @@ index 123cefd47c..12d4300437 100644 if ((int) newTotal < 0) continue; // Overflow if (maxValue > 0 && newTotal > (long)maxValue) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0195-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0194-Ability-to-apply-mending-to-XP-API.patch similarity index 98% rename from Spigot-Server-Patches/0195-Ability-to-apply-mending-to-XP-API.patch rename to Spigot-Server-Patches/0194-Ability-to-apply-mending-to-XP-API.patch index cad0a9d396..2cfe7fa123 100644 --- a/Spigot-Server-Patches/0195-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-Server-Patches/0194-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From 3891a5f730f2b9b9b85b2e10d3caf2416244d591 Mon Sep 17 00:00:00 2001 +From 52e2098f3f1c39e11e215086de44578ee0b064cc Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:36:49 -0500 Subject: [PATCH] Ability to apply mending to XP API diff --git a/Spigot-Server-Patches/0196-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0195-Make-max-squid-spawn-height-configurable.patch similarity index 96% rename from Spigot-Server-Patches/0196-Make-max-squid-spawn-height-configurable.patch rename to Spigot-Server-Patches/0195-Make-max-squid-spawn-height-configurable.patch index 7c17335ce9..0a7929310e 100644 --- a/Spigot-Server-Patches/0196-Make-max-squid-spawn-height-configurable.patch +++ b/Spigot-Server-Patches/0195-Make-max-squid-spawn-height-configurable.patch @@ -1,4 +1,4 @@ -From d6c58af2097797188b9223dd7ab2fb2b428a59d8 Mon Sep 17 00:00:00 2001 +From c31588b927c0c2dca1232e2888ce57f58ef85a32 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 11 Jan 2018 16:47:28 -0600 Subject: [PATCH] Make max squid spawn height configurable diff --git a/Spigot-Server-Patches/0197-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0196-PreCreatureSpawnEvent.patch similarity index 98% rename from Spigot-Server-Patches/0197-PreCreatureSpawnEvent.patch rename to Spigot-Server-Patches/0196-PreCreatureSpawnEvent.patch index 4806dd1272..f632950d41 100644 --- a/Spigot-Server-Patches/0197-PreCreatureSpawnEvent.patch +++ b/Spigot-Server-Patches/0196-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From 5ec4e4eb79464575a464f37d17f6c282708019d9 Mon Sep 17 00:00:00 2001 +From 0c3441dbdb5e6791987dd56d478fe17474049c6a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:01:31 -0500 Subject: [PATCH] PreCreatureSpawnEvent diff --git a/Spigot-Server-Patches/0198-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0197-PlayerNaturallySpawnCreaturesEvent.patch similarity index 97% rename from Spigot-Server-Patches/0198-PlayerNaturallySpawnCreaturesEvent.patch rename to Spigot-Server-Patches/0197-PlayerNaturallySpawnCreaturesEvent.patch index 1c9e9fa6a5..3f5e4d9c39 100644 --- a/Spigot-Server-Patches/0198-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-Server-Patches/0197-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From 38ed795fadbf5334cbdca6de8d6e4c496ce3fa56 Mon Sep 17 00:00:00 2001 +From a0a096827f8afc67e10dcbb7b0db1cf71c8b0590 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:36:02 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent diff --git a/Spigot-Server-Patches/0199-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0198-Add-setPlayerProfile-API-for-Skulls.patch similarity index 98% rename from Spigot-Server-Patches/0199-Add-setPlayerProfile-API-for-Skulls.patch rename to Spigot-Server-Patches/0198-Add-setPlayerProfile-API-for-Skulls.patch index 5216b1d9ca..ab3b1a0fc7 100644 --- a/Spigot-Server-Patches/0199-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-Server-Patches/0198-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From c565fcedffcb7e47a33b9e6bde9ee9b9abe31b1a Mon Sep 17 00:00:00 2001 +From 68a9556bb6b0193a47a7d1d6f5f5736fd062d333 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:36:25 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls @@ -89,5 +89,5 @@ index 0136e1bfe1..aee97b9f03 100644 public OfflinePlayer getOwningPlayer() { if (hasOwner()) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0200-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0199-Fill-Profile-Property-Events.patch similarity index 96% rename from Spigot-Server-Patches/0200-Fill-Profile-Property-Events.patch rename to Spigot-Server-Patches/0199-Fill-Profile-Property-Events.patch index 5c49d22324..58b40efebd 100644 --- a/Spigot-Server-Patches/0200-Fill-Profile-Property-Events.patch +++ b/Spigot-Server-Patches/0199-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From 67526168597faba34192685d6062a1b33eb6f724 Mon Sep 17 00:00:00 2001 +From aff6cee764bddf59930a139a81b6343aa15682bc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:26 -0500 Subject: [PATCH] Fill Profile Property Events @@ -40,5 +40,5 @@ index 4b2a67423f..61cfdf73c8 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0201-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0200-PlayerAdvancementCriterionGrantEvent.patch similarity index 90% rename from Spigot-Server-Patches/0201-PlayerAdvancementCriterionGrantEvent.patch rename to Spigot-Server-Patches/0200-PlayerAdvancementCriterionGrantEvent.patch index 0602f6cbc1..d01856fe00 100644 --- a/Spigot-Server-Patches/0201-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-Server-Patches/0200-PlayerAdvancementCriterionGrantEvent.patch @@ -1,11 +1,11 @@ -From e247a63ff88544efe5b780130e260a8b1739024a Mon Sep 17 00:00:00 2001 +From 0e3401a294b9c8b69789d8c62b985d6696b066ec Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:29 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index c254b73992..a284a940ef 100644 +index e8a69e18e3..1833310c1f 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -276,6 +276,12 @@ public class AdvancementDataPlayer { @@ -22,5 +22,5 @@ index c254b73992..a284a940ef 100644 this.i.add(advancement); flag = true; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0202-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0201-Add-ArmorStand-Item-Meta.patch similarity index 99% rename from Spigot-Server-Patches/0202-Add-ArmorStand-Item-Meta.patch rename to Spigot-Server-Patches/0201-Add-ArmorStand-Item-Meta.patch index 455dd1a634..b869f3cf73 100644 --- a/Spigot-Server-Patches/0202-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-Server-Patches/0201-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From 437467739ecf5c3c4184bd791f3e8dedd9d700e1 Mon Sep 17 00:00:00 2001 +From 2a61ec71281823d7d99f99230a669f200084ee35 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:04:14 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -415,5 +415,5 @@ index 6abde9030d..2a0852675b 100644 assertThat("Forgotten test?", providers, hasSize(ItemStackTest.COMPOUND_MATERIALS.length - 4/* Normal item meta, skulls, eggs and tile entities */)); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0203-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0202-Extend-Player-Interact-cancellation.patch similarity index 97% rename from Spigot-Server-Patches/0203-Extend-Player-Interact-cancellation.patch rename to Spigot-Server-Patches/0202-Extend-Player-Interact-cancellation.patch index 5fbe658a1b..a68cc1d17c 100644 --- a/Spigot-Server-Patches/0203-Extend-Player-Interact-cancellation.patch +++ b/Spigot-Server-Patches/0202-Extend-Player-Interact-cancellation.patch @@ -1,4 +1,4 @@ -From df8f84d392aba0dc66edac609affc84aa605bff7 Mon Sep 17 00:00:00 2001 +From 134726eb24f6e5bbf0d6f2af3bd5946d7469404c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Feb 2018 10:43:46 +0000 Subject: [PATCH] Extend Player Interact cancellation @@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds when cancelling interaction. diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index ff8b11e7ea..06ea3899a6 100644 +index e306b138db..89a13b88bb 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -111,6 +111,11 @@ public class PlayerInteractManager { @@ -55,5 +55,5 @@ index ff8b11e7ea..06ea3899a6 100644 enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS; } else if (this.gamemode == EnumGamemode.SPECTATOR) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0204-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0203-Tameable-getOwnerUniqueId-API.patch similarity index 95% rename from Spigot-Server-Patches/0204-Tameable-getOwnerUniqueId-API.patch rename to Spigot-Server-Patches/0203-Tameable-getOwnerUniqueId-API.patch index 17655ff6ad..ad9d5ac473 100644 --- a/Spigot-Server-Patches/0204-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-Server-Patches/0203-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 1f31cd40461cea71649fe2bcc34434130ddefc78 Mon Sep 17 00:00:00 2001 +From 0ac0b4152f839162f71bb98e12e0fc8c2a1fc439 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 01:14:55 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -35,5 +35,5 @@ index 5dfa40dda1..407b95cafd 100644 try { return getHandle().getOwnerUUID(); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0205-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0204-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 94% rename from Spigot-Server-Patches/0205-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to Spigot-Server-Patches/0204-Toggleable-player-crits-helps-mitigate-hacked-client.patch index 9afb11d08d..85666fdec0 100644 --- a/Spigot-Server-Patches/0205-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/Spigot-Server-Patches/0204-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -1,4 +1,4 @@ -From 12003905165fe0747ab7cd4a5b9d1b7d0afeb959 Mon Sep 17 00:00:00 2001 +From e72f8157523f1c73fb244b9068ff74076d0d0672 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Sat, 10 Mar 2018 00:50:24 +0100 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients. @@ -21,7 +21,7 @@ index c3e61bdfe3..32bfe0e462 100644 private void allChunksAreSlimeChunks() { allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index ec0982b587..cc9b265182 100644 +index 3b978528ba..3a01cbe014 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -981,6 +981,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -33,5 +33,5 @@ index ec0982b587..cc9b265182 100644 if (flag2) { f *= 1.5F; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0206-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0205-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch similarity index 94% rename from Spigot-Server-Patches/0206-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch rename to Spigot-Server-Patches/0205-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch index 1152d12c86..992f7f5b8f 100644 --- a/Spigot-Server-Patches/0206-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch +++ b/Spigot-Server-Patches/0205-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch @@ -1,4 +1,4 @@ -From ad49102b47b65052b10f2e5ec291769c0b31e284 Mon Sep 17 00:00:00 2001 +From 8b96543a76cc08b48fe326604b18352ab2a5171b Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Mar 2018 13:03:49 +0000 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened @@ -27,5 +27,5 @@ index 5a9ac3960d..fd31b9a6dc 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0207-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0206-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 96% rename from Spigot-Server-Patches/0207-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to Spigot-Server-Patches/0206-Prevent-Frosted-Ice-from-loading-holding-chunks.patch index 2da87529fa..0ee5b60f09 100644 --- a/Spigot-Server-Patches/0207-Prevent-Frosted-Ice-from-loading-holding-chunks.patch +++ b/Spigot-Server-Patches/0206-Prevent-Frosted-Ice-from-loading-holding-chunks.patch @@ -1,4 +1,4 @@ -From 67059dc9aad32e8a6c2ba0337fcd54bac50e8f36 Mon Sep 17 00:00:00 2001 +From 7ac8c7e353cf5f3913550f1e8e3ff711c6590a45 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Mar 2018 16:33:15 -0500 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks @@ -28,5 +28,5 @@ index 39c3bbc9cf..881dfb1235 100644 if (j >= i) { boolean flag = false; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0208-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0207-Disable-Explicit-Network-Manager-Flushing.patch similarity index 95% rename from Spigot-Server-Patches/0208-Disable-Explicit-Network-Manager-Flushing.patch rename to Spigot-Server-Patches/0207-Disable-Explicit-Network-Manager-Flushing.patch index 0294c66740..8a94ba5970 100644 --- a/Spigot-Server-Patches/0208-Disable-Explicit-Network-Manager-Flushing.patch +++ b/Spigot-Server-Patches/0207-Disable-Explicit-Network-Manager-Flushing.patch @@ -1,4 +1,4 @@ -From 2e20022635cc7003cd0918ae9db9fce0d5396053 Mon Sep 17 00:00:00 2001 +From 71cd602aff4b675890553c5817cd9ac7c1ba4c99 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 11 Mar 2018 14:13:33 -0400 Subject: [PATCH] Disable Explicit Network Manager Flushing @@ -33,5 +33,5 @@ index ae60f757e3..efd02bd67d 100644 if (this.u++ % 20 == 0) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0209-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0208-Implement-extended-PaperServerListPingEvent.patch similarity index 99% rename from Spigot-Server-Patches/0209-Implement-extended-PaperServerListPingEvent.patch rename to Spigot-Server-Patches/0208-Implement-extended-PaperServerListPingEvent.patch index 10e041fe33..81442c4197 100644 --- a/Spigot-Server-Patches/0209-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0208-Implement-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 0d93958a9f51a86cc7d7bc5d7543240d6d6de6b1 Mon Sep 17 00:00:00 2001 +From 41e69d35aa968bc6b8dc3b3a31e5cb233d88b3b3 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent diff --git a/Spigot-Server-Patches/0210-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0209-Improved-Async-Task-Scheduler.patch similarity index 99% rename from Spigot-Server-Patches/0210-Improved-Async-Task-Scheduler.patch rename to Spigot-Server-Patches/0209-Improved-Async-Task-Scheduler.patch index 2d4168644d..ae572da914 100644 --- a/Spigot-Server-Patches/0210-Improved-Async-Task-Scheduler.patch +++ b/Spigot-Server-Patches/0209-Improved-Async-Task-Scheduler.patch @@ -1,4 +1,4 @@ -From 582d898d6fe4c0fb74af9e7fa79c5c7f3ad4d629 Mon Sep 17 00:00:00 2001 +From 38ef37404d0a30c16796943f663c48d508d276e5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Mar 2018 22:59:43 -0400 Subject: [PATCH] Improved Async Task Scheduler @@ -365,5 +365,5 @@ index e102be583c..5db848de14 100644 private boolean isReady(final int currentTick) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0211-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0210-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 97% rename from Spigot-Server-Patches/0211-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to Spigot-Server-Patches/0210-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 229f9c65cf..f43f52b2b6 100644 --- a/Spigot-Server-Patches/0211-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-Server-Patches/0210-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From 3d6724fc7cee960e5d943681b9dccdc926ceb2af Mon Sep 17 00:00:00 2001 +From d15c15def5935bf31a84e867e7372ea817970d57 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:45:57 -0400 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent @@ -44,5 +44,5 @@ index fe912e0eb1..7c3b9c0b97 100644 if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) { final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0211-Player.setPlayerProfile-API.patch similarity index 99% rename from Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch rename to Spigot-Server-Patches/0211-Player.setPlayerProfile-API.patch index ca8bb42f36..47c0048606 100644 --- a/Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0211-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 290b3fd4259af66943157d89e26bb8002ed8fe15 Mon Sep 17 00:00:00 2001 +From fbd1e663fc3466166abda5a828f35e4b2cf60930 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:29:48 -0400 Subject: [PATCH] Player.setPlayerProfile API diff --git a/Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0212-Fix-Dragon-Server-Crashes.patch similarity index 94% rename from Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch rename to Spigot-Server-Patches/0212-Fix-Dragon-Server-Crashes.patch index cb4ad96deb..cad9987a65 100644 --- a/Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch +++ b/Spigot-Server-Patches/0212-Fix-Dragon-Server-Crashes.patch @@ -1,4 +1,4 @@ -From 654b4d51ed903e170bf4026d5e22e7b4a70765b5 Mon Sep 17 00:00:00 2001 +From e8c906ae42b88262f4e92c026b98820cc5e250f8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Mar 2018 20:52:07 -0400 Subject: [PATCH] Fix Dragon Server Crashes @@ -20,5 +20,5 @@ index cfe84f4d48..4ab310cd6b 100644 blockposition_mutableblockposition.c(d0, d2, d1); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0213-getPlayerUniqueId-API.patch similarity index 94% rename from Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch rename to Spigot-Server-Patches/0213-getPlayerUniqueId-API.patch index 5f5dbb3850..c8fd577269 100644 --- a/Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch +++ b/Spigot-Server-Patches/0213-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From da1dbeeafbe7a28fe90ce0401b8fef7e0d1c2630 Mon Sep 17 00:00:00 2001 +From 4aceee276baf3321444685bfb475c8b4730fda66 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:40:24 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5e9e601bf4..f6c5a9c364 100644 +index c72b68b03e..46c5a5bdc5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1355,6 +1355,26 @@ public final class CraftServer implements Server { @@ -40,5 +40,5 @@ index 5e9e601bf4..f6c5a9c364 100644 @Deprecated public OfflinePlayer getOfflinePlayer(String name) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0214-Make-player-data-saving-configurable.patch similarity index 94% rename from Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch rename to Spigot-Server-Patches/0214-Make-player-data-saving-configurable.patch index c0f1a1eb58..f2812ab755 100644 --- a/Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch +++ b/Spigot-Server-Patches/0214-Make-player-data-saving-configurable.patch @@ -1,11 +1,11 @@ -From 3109f0699aadf453dfea116c3124ce999efe4e31 Mon Sep 17 00:00:00 2001 +From 4c08907d29c45dfa8ca04220ee2eb3a23024bcd4 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 26 Mar 2018 18:30:53 +0300 Subject: [PATCH] Make player data saving configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index f4d089f3ef..a186b6eb01 100644 +index 11f08c2b73..4169ec9a58 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -270,4 +270,13 @@ public class PaperConfig { @@ -35,5 +35,5 @@ index a0254d8e51..e60e10c57d 100644 NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound()); File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat.tmp"); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0215-Make-legacy-ping-handler-more-reliable.patch similarity index 98% rename from Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch rename to Spigot-Server-Patches/0215-Make-legacy-ping-handler-more-reliable.patch index 5739d7aa99..24657fdaa3 100644 --- a/Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch +++ b/Spigot-Server-Patches/0215-Make-legacy-ping-handler-more-reliable.patch @@ -1,4 +1,4 @@ -From f72d331f517437918fda36c8aa15a747e6cff9ae Mon Sep 17 00:00:00 2001 +From e13bda55e016863f9efe159833297a0a7f4adb54 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 18:22:50 +0200 Subject: [PATCH] Make legacy ping handler more reliable @@ -167,5 +167,5 @@ index 9ee5a1ff02..063efe9bbe 100644 channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0216-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 99% rename from Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to Spigot-Server-Patches/0216-Call-PaperServerListPingEvent-for-legacy-pings.patch index 204962cd74..aac20c0e95 100644 --- a/Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch +++ b/Spigot-Server-Patches/0216-Call-PaperServerListPingEvent-for-legacy-pings.patch @@ -1,4 +1,4 @@ -From c6bd94a00efd5031f3504a1b5eee0052e4c04f47 Mon Sep 17 00:00:00 2001 +From 4aca7c3c2a763638adf3e61872d00bb70c36dfce Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:51 +0200 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings @@ -153,5 +153,5 @@ index 063efe9bbe..4a49fe4cc6 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0217-Flag-to-disable-the-channel-limit.patch similarity index 96% rename from Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch rename to Spigot-Server-Patches/0217-Flag-to-disable-the-channel-limit.patch index 4a0e763b5b..3daf12b04f 100644 --- a/Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch +++ b/Spigot-Server-Patches/0217-Flag-to-disable-the-channel-limit.patch @@ -1,4 +1,4 @@ -From bcd066472315825b03e4b1c71f701ceff331e79e Mon Sep 17 00:00:00 2001 +From dc03357a8942aaa3568bd3bcea22d657b103a5bc Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 31 Mar 2018 17:04:26 +0100 Subject: [PATCH] Flag to disable the channel limit diff --git a/Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0218-Add-method-to-open-already-placed-sign.patch similarity index 95% rename from Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch rename to Spigot-Server-Patches/0218-Add-method-to-open-already-placed-sign.patch index 2ec3736610..f557c70710 100644 --- a/Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-Server-Patches/0218-Add-method-to-open-already-placed-sign.patch @@ -1,4 +1,4 @@ -From 46f626578c1dca38ae56b655bc58d65623ba6be8 Mon Sep 17 00:00:00 2001 +From c05f9bf900cc8143ba0ddf32482e87e6b505a04b Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 1 Apr 2018 02:29:37 +0300 Subject: [PATCH] Add method to open already placed sign diff --git a/Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0219-Configurable-sprint-interruption-on-attack.patch similarity index 94% rename from Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch rename to Spigot-Server-Patches/0219-Configurable-sprint-interruption-on-attack.patch index 2ec7583e2d..0d5e111369 100644 --- a/Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch +++ b/Spigot-Server-Patches/0219-Configurable-sprint-interruption-on-attack.patch @@ -1,4 +1,4 @@ -From c402117fadd7300eb849eb14c4a64eec4f3cacc8 Mon Sep 17 00:00:00 2001 +From 632a6f79df52ad7e946488db55cc098e501fab2f Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sat, 14 Apr 2018 20:20:46 +0200 Subject: [PATCH] Configurable sprint interruption on attack @@ -20,7 +20,7 @@ index 32bfe0e462..7024336c3a 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index f4f1037b3d..9abdf8b24b 100644 +index 1c73572c40..4ff6cba65e 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1030,7 +1030,11 @@ public abstract class EntityHuman extends EntityLiving { @@ -37,5 +37,5 @@ index f4f1037b3d..9abdf8b24b 100644 if (flag3) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0220-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 91% rename from Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to Spigot-Server-Patches/0220-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index 98576f55ab..100fc1d0c6 100644 --- a/Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/Spigot-Server-Patches/0220-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -1,11 +1,11 @@ -From f6c4dd8ffddc7a35eed0d0e1ffac06b6073dc189 Mon Sep 17 00:00:00 2001 +From 43c7f6f43a04232a14c43c800f17f260743d4378 Mon Sep 17 00:00:00 2001 From: 0x22 <0x22@futureclient.net> Date: Thu, 26 Apr 2018 04:41:11 -0400 Subject: [PATCH] Fix exploit that allowed colored signs to be created diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b0275fc14d..498483930e 100644 +index 0a9fc4653a..7ee0a88234 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2522,7 +2522,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -18,5 +18,5 @@ index b0275fc14d..498483930e 100644 SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); this.server.getPluginManager().callEvent(event); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0222-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0221-EndermanEscapeEvent.patch similarity index 98% rename from Spigot-Server-Patches/0222-EndermanEscapeEvent.patch rename to Spigot-Server-Patches/0221-EndermanEscapeEvent.patch index efa3e3345c..305a64b814 100644 --- a/Spigot-Server-Patches/0222-EndermanEscapeEvent.patch +++ b/Spigot-Server-Patches/0221-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From 6bdfb8ccadb49bf6366901ad45a60a688ab58b32 Mon Sep 17 00:00:00 2001 +From 1cf9ec2ad9bf5b15fb78fba68f2c1584d99cf4ef Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:15:55 -0400 Subject: [PATCH] EndermanEscapeEvent diff --git a/Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0222-Enderman.teleportRandomly.patch similarity index 93% rename from Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch rename to Spigot-Server-Patches/0222-Enderman.teleportRandomly.patch index 0c863e501e..42ef22f655 100644 --- a/Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch +++ b/Spigot-Server-Patches/0222-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From ad3c50fdfd47758a33901af927d9e186bd89e465 Mon Sep 17 00:00:00 2001 +From d47adfc0d1daebab680e9b7e1b14c52ddeb096b2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:44 -0400 Subject: [PATCH] Enderman.teleportRandomly() @@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly() Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 93f66181bf..d9288ad44b 100644 +index db351a2494..d136b07f3e 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -190,6 +190,7 @@ public class EntityEnderman extends EntityMonster { @@ -30,5 +30,5 @@ index 970efabd37..0c5f359346 100644 public MaterialData getCarriedMaterial() { IBlockData blockData = getHandle().getCarried(); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0223-Block-Enderpearl-Travel-Exploit.patch similarity index 96% rename from Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch rename to Spigot-Server-Patches/0223-Block-Enderpearl-Travel-Exploit.patch index b1ea09c70a..2703b029ad 100644 --- a/Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch +++ b/Spigot-Server-Patches/0223-Block-Enderpearl-Travel-Exploit.patch @@ -1,4 +1,4 @@ -From 0b89fac3016889bcdacb6c93583efa9575a82023 Mon Sep 17 00:00:00 2001 +From 399ddc1100ef6e2a9b49082f8661764395ebeb50 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 17:15:26 -0400 Subject: [PATCH] Block Enderpearl Travel Exploit @@ -39,5 +39,5 @@ index 5f0cb4c33d..f2f4b2d929 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0224-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 98% rename from Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch rename to Spigot-Server-Patches/0224-Expand-World.spawnParticle-API-and-add-Builder.patch index 5c11c7398e..868b34c1cf 100644 --- a/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0224-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 6a652351f60fd0d151663a43c4fc08cf06169867 Mon Sep 17 00:00:00 2001 +From 2e8b98f9f26aa269a7e1df92886f9b98120a5a50 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 15 Aug 2017 22:29:12 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder diff --git a/Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0225-EndermanAttackPlayerEvent.patch similarity index 92% rename from Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch rename to Spigot-Server-Patches/0225-EndermanAttackPlayerEvent.patch index 9bd20db793..cb09e71e5a 100644 --- a/Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch +++ b/Spigot-Server-Patches/0225-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From f10483d2e7cb47912256c20d1993968add4e37da Mon Sep 17 00:00:00 2001 +From 9d3e6458c04dfe59712729e81a5bad126c30a6e3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:18:54 -0400 Subject: [PATCH] EndermanAttackPlayerEvent @@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index d9288ad44b..6db334cb59 100644 +index d136b07f3e..ad65200dca 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -138,7 +138,15 @@ public class EntityEnderman extends EntityMonster { @@ -28,5 +28,5 @@ index d9288ad44b..6db334cb59 100644 if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0226-WitchConsumePotionEvent.patch similarity index 92% rename from Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch rename to Spigot-Server-Patches/0226-WitchConsumePotionEvent.patch index 28d6e3eeb7..922f6f590d 100644 --- a/Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch +++ b/Spigot-Server-Patches/0226-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From 4296725693b6a847fbb25c51af000ffc532cec1c Mon Sep 17 00:00:00 2001 +From 8642105153addd151d1712e184000b267a91f16b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:35:16 -0400 Subject: [PATCH] WitchConsumePotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent Fires when a witch consumes the potion in their hand diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 1d6232f4ea..8ae1a38a49 100644 +index cc7b026b44..6e9d341584 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -88,7 +88,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -23,5 +23,5 @@ index 1d6232f4ea..8ae1a38a49 100644 if (list != null) { Iterator iterator = list.iterator(); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0227-WitchThrowPotionEvent.patch similarity index 94% rename from Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch rename to Spigot-Server-Patches/0227-WitchThrowPotionEvent.patch index 6c0d7c0aa3..3c3e7e3431 100644 --- a/Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch +++ b/Spigot-Server-Patches/0227-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From c4aa352ec984bbaa7c0f6a566f8c4e05cdd1c6fd Mon Sep 17 00:00:00 2001 +From 2c48cd90874f88dec40312f4c4b2f804891227db Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:44:58 -0400 Subject: [PATCH] WitchThrowPotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent Fired when a witch throws a potion at a player diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 8ae1a38a49..59339e529b 100644 +index 6e9d341584..0c641d915d 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -29,5 +29,5 @@ index 8ae1a38a49..59339e529b 100644 entitypotion.shoot(d0, d1 + (double) (f1 * 0.2F), d2, 0.75F, 8.0F); this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_WITCH_THROW, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0228-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 95% rename from Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to Spigot-Server-Patches/0228-Allow-spawning-Item-entities-with-World.spawnEntity.patch index ae8904e3d0..26d6ae9b84 100644 --- a/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch +++ b/Spigot-Server-Patches/0228-Allow-spawning-Item-entities-with-World.spawnEntity.patch @@ -1,4 +1,4 @@ -From 0979593c9d81786c5bcfe1c41ee65385280e719b Mon Sep 17 00:00:00 2001 +From 4b7d50cd5cac72dc37866db7fe2a84670b6ab371 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Jun 2018 20:39:20 -0400 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity diff --git a/Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0229-WitchReadyPotionEvent.patch similarity index 93% rename from Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch rename to Spigot-Server-Patches/0229-WitchReadyPotionEvent.patch index 33162b5092..129a9f8bf3 100644 --- a/Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch +++ b/Spigot-Server-Patches/0229-WitchReadyPotionEvent.patch @@ -1,11 +1,11 @@ -From f42caadd189582851118a75c503fba35463b1fdd Mon Sep 17 00:00:00 2001 +From dfad001781fe947acd0822392498719bc0167250 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:26 -0400 Subject: [PATCH] WitchReadyPotionEvent diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 59339e529b..8b95ec3a81 100644 +index 0c641d915d..d383b0ab41 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -121,7 +121,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -22,5 +22,5 @@ index 59339e529b..8b95ec3a81 100644 this.s(true); this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_WITCH_DRINK, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0230-ItemStack-getMaxItemUseDuration.patch similarity index 91% rename from Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch rename to Spigot-Server-Patches/0230-ItemStack-getMaxItemUseDuration.patch index 46259c189b..2a50f0a938 100644 --- a/Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-Server-Patches/0230-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From 1950fcf414420f228e7b65098ea34bd976b1981e Mon Sep 17 00:00:00 2001 +From d3828a5bc616aec9126c60faad9deecf4c37d5b5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 23:00:29 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration @@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index b7d327211c..2acd02f2f4 100644 +index 09d0de48e8..90c7182554 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -545,6 +545,7 @@ public final class ItemStack { @@ -18,7 +18,7 @@ index b7d327211c..2acd02f2f4 100644 return this.getItem().f_(this); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 88154d2f23..1609e6bbb6 100644 +index 6e018396e6..bd85d9ec49 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -174,6 +174,13 @@ public final class CraftItemStack extends ItemStack { @@ -36,5 +36,5 @@ index 88154d2f23..1609e6bbb6 100644 public void addUnsafeEnchantment(Enchantment ench, int level) { Validate.notNull(ench, "Cannot add null enchantment"); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0231-Implement-EntityTeleportEndGatewayEvent.patch similarity index 96% rename from Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch rename to Spigot-Server-Patches/0231-Implement-EntityTeleportEndGatewayEvent.patch index 6c682adaac..29ba12e840 100644 --- a/Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0231-Implement-EntityTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 53ecb19ca0976884e8574a335fb89e0661a90467 Mon Sep 17 00:00:00 2001 +From f973058e7aea93b92fc6f60795f1ac00bf55ec5f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 14:08:39 +0200 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent @@ -30,5 +30,5 @@ index 1783f59140..e28461f18a 100644 this.h(); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0232-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 93% rename from Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to Spigot-Server-Patches/0232-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch index 050beea946..b70147a691 100644 --- a/Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch +++ b/Spigot-Server-Patches/0232-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch @@ -1,4 +1,4 @@ -From 375cdb8189eaf7be96586deb8893b8447d28454d Mon Sep 17 00:00:00 2001 +From 681ff00a6dc855543d933d7035d9b3fc7d5419f6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 01:18:49 -0400 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event @@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event Otherwise the creeper infinite explodes diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 9f03d03375..29569805cb 100644 +index 0503af5af3..1bb318e549 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -11,7 +11,7 @@ public class EntityCreeper extends EntityMonster { @@ -27,5 +27,5 @@ index 9f03d03375..29569805cb 100644 // CraftBukkit end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0233-Fix-CraftEntity-hashCode.patch similarity index 96% rename from Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch rename to Spigot-Server-Patches/0233-Fix-CraftEntity-hashCode.patch index 0fc01185d7..5efe44f045 100644 --- a/Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch +++ b/Spigot-Server-Patches/0233-Fix-CraftEntity-hashCode.patch @@ -1,4 +1,4 @@ -From 4b76d46b97c6a707b807aa063cc6526c3c1d9443 Mon Sep 17 00:00:00 2001 +From 99807033d0da819bc2879859945fc415e30c760a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 20:20:15 -0400 Subject: [PATCH] Fix CraftEntity hashCode @@ -45,5 +45,5 @@ index b000bc8c71..1cd3448e57 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0234-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 97% rename from Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch rename to Spigot-Server-Patches/0234-Configurable-Alternative-LootPool-Luck-Formula.patch index a4213269b8..24047e87dc 100644 --- a/Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch +++ b/Spigot-Server-Patches/0234-Configurable-Alternative-LootPool-Luck-Formula.patch @@ -1,4 +1,4 @@ -From 9b22bb2970ca9180368fad766e58ffcfc3029c26 Mon Sep 17 00:00:00 2001 +From 97cf8b21984196a1757626fed942ba2fb869343d Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Jun 2018 00:30:32 -0400 Subject: [PATCH] Configurable Alternative LootPool Luck Formula @@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas. I would love to see this change in Vanilla, so Mojang please pull :) diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index a186b6eb01..a9b71c85d5 100644 +index 4169ec9a58..eeef7d330b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -279,4 +279,12 @@ public class PaperConfig { @@ -109,5 +109,5 @@ index 1016325bd7..2c979e0b74 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0235-Print-Error-details-when-failing-to-save-player-data.patch similarity index 92% rename from Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch rename to Spigot-Server-Patches/0235-Print-Error-details-when-failing-to-save-player-data.patch index 6c0a9ef28d..9adbd9680f 100644 --- a/Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch +++ b/Spigot-Server-Patches/0235-Print-Error-details-when-failing-to-save-player-data.patch @@ -1,4 +1,4 @@ -From 44a97ae3cf3c57a75a55cb47257a5d398d3b54af Mon Sep 17 00:00:00 2001 +From 012af648516b3cc090e997ed68abcd12306f21da Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Jun 2018 20:37:03 -0400 Subject: [PATCH] Print Error details when failing to save player data @@ -18,5 +18,5 @@ index e60e10c57d..350ac42d6b 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0236-Make-shield-blocking-delay-configurable.patch similarity index 96% rename from Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch rename to Spigot-Server-Patches/0236-Make-shield-blocking-delay-configurable.patch index 9aeb74c976..fb45cb7e3e 100644 --- a/Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-Server-Patches/0236-Make-shield-blocking-delay-configurable.patch @@ -1,4 +1,4 @@ -From 3ac1c60a49cda9ac7174230b50c97839fe66b928 Mon Sep 17 00:00:00 2001 +From 5733d372277edc71bed1de0535f4c5d10f42a7f5 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:18:16 -0500 Subject: [PATCH] Make shield blocking delay configurable @@ -19,7 +19,7 @@ index fe9415b1de..ce17447faf 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6c75db0ee2..d4d86d854d 100644 +index 1157a9eb63..d4c38ae462 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2921,7 +2921,7 @@ public abstract class EntityLiving extends Entity { @@ -68,5 +68,5 @@ index 42cc158824..513b3fac7f 100644 // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0237-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch similarity index 95% rename from Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch rename to Spigot-Server-Patches/0237-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch index a73c7624fe..da60c968d1 100644 --- a/Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch +++ b/Spigot-Server-Patches/0237-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch @@ -1,4 +1,4 @@ -From e54cc15c485c0393d77dc5537e748586b42ddc8b Mon Sep 17 00:00:00 2001 +From 4fddbea79f4a3005b50fb33bcedfcc1325ba8151 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Jun 2018 16:23:38 -0400 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors diff --git a/Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch similarity index 97% rename from Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch rename to Spigot-Server-Patches/0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index d18e2d1a78..6d3cba0446 100644 --- a/Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-Server-Patches/0238-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From 659c3d48fdac24b2be07f24c72243d298a6c8935 Mon Sep 17 00:00:00 2001 +From afc3ee4482452f13a70513d86722ef37f88fe289 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:51:17 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API Adds ability to get what arrow was shot, and control if it should be consumed. diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java -index e575d3cff7..85157e80d2 100644 +index fd649020c1..2331ec2750 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java @@ -157,7 +157,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR @@ -19,7 +19,7 @@ index e575d3cff7..85157e80d2 100644 event.getProjectile().remove(); return; diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java -index 50b815dc89..4ec02c8ce7 100644 +index 19a25023d9..8d5864975b 100644 --- a/src/main/java/net/minecraft/server/ItemBow.java +++ b/src/main/java/net/minecraft/server/ItemBow.java @@ -36,6 +36,7 @@ public class ItemBow extends ItemProjectileWeapon { @@ -59,7 +59,7 @@ index 50b815dc89..4ec02c8ce7 100644 if (itemstack1.isEmpty()) { entityhuman.inventory.f(itemstack1); diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java -index 1e75e3002a..1e17522154 100644 +index 5aab02afd2..0a926db89e 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -220,7 +220,7 @@ public class ItemCrossbow extends ItemProjectileWeapon { @@ -72,7 +72,7 @@ index 1e75e3002a..1e17522154 100644 event.getProjectile().remove(); return; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 12d4300437..47338c692a 100644 +index aedff6fcfd..9de01e6041 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -50,6 +50,7 @@ import net.minecraft.server.GeneratorAccess; @@ -104,5 +104,5 @@ index 12d4300437..47338c692a 100644 return event; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0239-PlayerReadyArrowEvent.patch similarity index 94% rename from Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch rename to Spigot-Server-Patches/0239-PlayerReadyArrowEvent.patch index 16820076eb..e2ee419234 100644 --- a/Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch +++ b/Spigot-Server-Patches/0239-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From 4611102caddf855571c9e97d22707e50267d495d Mon Sep 17 00:00:00 2001 +From adafb2ca931c6803440f62978075333ce2224e83 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:12:53 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use. Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 9abdf8b24b..fc25b3c749 100644 +index 4ff6cba65e..ed1ba110c2 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2033,6 +2033,17 @@ public abstract class EntityHuman extends EntityLiving { @@ -38,5 +38,5 @@ index 9abdf8b24b..fc25b3c749 100644 } } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0240-Fire-EntityShootBowEvent-for-Illusioner.patch similarity index 95% rename from Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch rename to Spigot-Server-Patches/0240-Fire-EntityShootBowEvent-for-Illusioner.patch index fb03ec4b4e..49232e3bbb 100644 --- a/Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch +++ b/Spigot-Server-Patches/0240-Fire-EntityShootBowEvent-for-Illusioner.patch @@ -1,4 +1,4 @@ -From 33bd3a375c11fb9b4f115b4658870807c5fd1e41 Mon Sep 17 00:00:00 2001 +From e4acd3e1a5eaaa8826b995479981136e151c5c6b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 22:19:36 -0400 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner @@ -29,5 +29,5 @@ index 4e0e6caa16..76641682b1 100644 class a extends EntityIllagerWizard.c { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0241-Implement-EntityKnockbackByEntityEvent.patch similarity index 93% rename from Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch rename to Spigot-Server-Patches/0241-Implement-EntityKnockbackByEntityEvent.patch index d4e9f81f98..a0722dfa2d 100644 --- a/Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch +++ b/Spigot-Server-Patches/0241-Implement-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From 9345ab7434b7c4b882f9bcf138d8ed82fadc3aa1 Mon Sep 17 00:00:00 2001 +From f9b162cead2d1ebc2406f33152f6719e7c9efa44 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:46:23 +0200 Subject: [PATCH] Implement EntityKnockbackByEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent This event is called when an entity receives knockback by another entity. diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index d4d86d854d..90099c814a 100644 +index d4c38ae462..ca266029e4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1430,6 +1430,16 @@ public abstract class EntityLiving extends Entity { @@ -27,5 +27,5 @@ index d4d86d854d..90099c814a 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0243-Expand-Explosions-API.patch b/Spigot-Server-Patches/0242-Expand-Explosions-API.patch similarity index 95% rename from Spigot-Server-Patches/0243-Expand-Explosions-API.patch rename to Spigot-Server-Patches/0242-Expand-Explosions-API.patch index c149e43d3f..a15d094767 100644 --- a/Spigot-Server-Patches/0243-Expand-Explosions-API.patch +++ b/Spigot-Server-Patches/0242-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From 6d7cf0c26050dcdd1d09bfc922a86afb81230752 Mon Sep 17 00:00:00 2001 +From 75a77b5bcd0db050f6e3317960c2594342c1b6be Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Jun 2018 23:17:24 -0400 Subject: [PATCH] Expand Explosions API diff --git a/Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0243-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 97% rename from Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch rename to Spigot-Server-Patches/0243-LivingEntity-Hand-Raised-Item-Use-API.patch index 932940d67b..8c5a8c7f8b 100644 --- a/Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-Server-Patches/0243-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From b109ad1fa20944732d072622bc680c04ca9c0168 Mon Sep 17 00:00:00 2001 +From b0faee85e57c0c7015285cd9537162bb4ba3d1c9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:21:28 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API diff --git a/Spigot-Server-Patches/0245-RangedEntity-API.patch b/Spigot-Server-Patches/0244-RangedEntity-API.patch similarity index 99% rename from Spigot-Server-Patches/0245-RangedEntity-API.patch rename to Spigot-Server-Patches/0244-RangedEntity-API.patch index 3e2789cac9..b4dafa4206 100644 --- a/Spigot-Server-Patches/0245-RangedEntity-API.patch +++ b/Spigot-Server-Patches/0244-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From cc4de933927fb70735afce637a5f24dcb55817b0 Mon Sep 17 00:00:00 2001 +From acb433946eb305f66734bb9b2626ded708a7af41 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 22:00:49 -0400 Subject: [PATCH] RangedEntity API @@ -158,5 +158,5 @@ index 38b555cc7e..03cf6136e6 100644 private BossBar bossBar; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0245-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 97% rename from Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch rename to Spigot-Server-Patches/0245-Add-config-to-disable-ender-dragon-legacy-check.patch index 0a28bfd2b3..be597b4a9c 100644 --- a/Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch +++ b/Spigot-Server-Patches/0245-Add-config-to-disable-ender-dragon-legacy-check.patch @@ -1,4 +1,4 @@ -From 1b9d997ce1370508edf9ad5fa2f0ff5250c1ce83 Mon Sep 17 00:00:00 2001 +From 6e95295db6a2ad40cdd96833b30205b0d2c980c3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 22 Jun 2018 10:38:31 -0500 Subject: [PATCH] Add config to disable ender dragon legacy check @@ -47,5 +47,5 @@ index 88a8e4abd0..6700c8c658 100644 if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) { if (nbttagcompound.b("DragonUUID")) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0246-Implement-World.getEntity-UUID-API.patch similarity index 93% rename from Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch rename to Spigot-Server-Patches/0246-Implement-World.getEntity-UUID-API.patch index 8159ca4ccc..fc8e44290a 100644 --- a/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch +++ b/Spigot-Server-Patches/0246-Implement-World.getEntity-UUID-API.patch @@ -1,4 +1,4 @@ -From a6ea1dabbe73417ebaf2ed3a87fb21b5305c6aa3 Mon Sep 17 00:00:00 2001 +From 077b6953f0e099b298618e749ccf132581015342 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:08:14 +0200 Subject: [PATCH] Implement World.getEntity(UUID) API diff --git a/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0247-InventoryCloseEvent-Reason-API.patch similarity index 99% rename from Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch rename to Spigot-Server-Patches/0247-InventoryCloseEvent-Reason-API.patch index 561292eb6f..71da17623d 100644 --- a/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0247-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 948edd8a1cb0f5e2518a52386f557246e1ab7fb8 Mon Sep 17 00:00:00 2001 +From 9c7802eb0238ad39dd2bed450702083f69c0c32e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API diff --git a/Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch similarity index 98% rename from Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch rename to Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch index a4830277e3..c3967ddca0 100644 --- a/Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch +++ b/Spigot-Server-Patches/0248-Configurable-Bed-Search-Radius.patch @@ -1,4 +1,4 @@ -From 4817baa2bdd791a7c813118c88a33b95011ef849 Mon Sep 17 00:00:00 2001 +From c2ec9dece225f34798c3314e94f3e0dda39b52b4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 15:22:06 -0400 Subject: [PATCH] Configurable Bed Search Radius @@ -10,7 +10,7 @@ player at their bed should it of became obstructed. Defaults to vanilla 1. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3294fbbe..83e54cb9 100644 +index 3294fbbeaf..83e54cb904 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -375,4 +375,15 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 3294fbbe..83e54cb9 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java -index c49eb0ec..70222713 100644 +index c49eb0ecb3..35cf3c3aca 100644 --- a/src/main/java/net/minecraft/server/BlockBed.java +++ b/src/main/java/net/minecraft/server/BlockBed.java @@ -171,6 +171,10 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity { diff --git a/Spigot-Server-Patches/0250-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0249-Vex-getSummoner-API.patch similarity index 93% rename from Spigot-Server-Patches/0250-Vex-getSummoner-API.patch rename to Spigot-Server-Patches/0249-Vex-getSummoner-API.patch index 82b6e4e19c..f7799af9ed 100644 --- a/Spigot-Server-Patches/0250-Vex-getSummoner-API.patch +++ b/Spigot-Server-Patches/0249-Vex-getSummoner-API.patch @@ -1,4 +1,4 @@ -From 891a98cea3f044d4d2d5e660edb9aac212f74969 Mon Sep 17 00:00:00 2001 +From 583e1426a47e19e775c1ab3b504b9900f56e4dab Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 15:30:22 -0400 Subject: [PATCH] Vex#getSummoner API @@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API Get's the NPC that summoned this Vex diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index e74f85e6f0..d7bea83890 100644 +index be6c173e3e..c8e81b824f 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster { @@ -47,5 +47,5 @@ index 737a37b6fe..169c951ec3 100644 public String toString() { return "CraftVex"; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 92% rename from Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch index fdb4480e46..09128a082e 100644 --- a/Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/Spigot-Server-Patches/0250-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -1,4 +1,4 @@ -From 982e63c55abf1172635ed55754d5e5b3c55942f7 Mon Sep 17 00:00:00 2001 +From b7fff65fac1a15e172dd2457fd8f5bc6c2dbbcaf Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 13 Jul 2018 14:54:43 +0200 Subject: [PATCH] Refresh player inventory when cancelling @@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is cancelled to avoid this problem. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 088873515c..05dec82386 100644 +index 13f406f507..d32f89493f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1970,6 +1970,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -28,5 +28,5 @@ index 088873515c..05dec82386 100644 } // CraftBukkit end -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch similarity index 92% rename from Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch rename to Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch index d8304e114f..b5ee080193 100644 --- a/Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch +++ b/Spigot-Server-Patches/0251-Don-t-change-the-Entity-Random-seed-for-squids.patch @@ -1,4 +1,4 @@ -From 087c2d8c136a6e67b44483c56e4d75961a78e807 Mon Sep 17 00:00:00 2001 +From f1ddefe1fac520a5f1c2b5909da1b3d3fcb04c99 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:05:00 -0400 Subject: [PATCH] Don't change the Entity Random seed for squids diff --git a/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch similarity index 95% rename from Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch rename to Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch index 11129863f6..366551d631 100644 --- a/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch +++ b/Spigot-Server-Patches/0252-Re-add-vanilla-entity-warnings-for-duplicates.patch @@ -1,4 +1,4 @@ -From 8c526f139e36db37c38b5bcea39c42781da65d6f Mon Sep 17 00:00:00 2001 +From a54d2f532d9fa34870e1e88b5318ac4a45bb7f4c Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:08:05 -0400 Subject: [PATCH] Re-add vanilla entity warnings for duplicates diff --git a/Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch similarity index 89% rename from Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch rename to Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch index b6284045b4..f4b67683e3 100644 --- a/Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch +++ b/Spigot-Server-Patches/0253-Avoid-item-merge-if-stack-size-above-max-stack-size.patch @@ -1,11 +1,11 @@ -From b585d98bd4f316c2400857295de19c6388c5c58f Mon Sep 17 00:00:00 2001 +From d0945ac58e3c0c8b8e5a7e858da3d2da991e3435 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 16 Jul 2018 12:42:20 +0200 Subject: [PATCH] Avoid item merge if stack size above max stack size diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index b813f402cd..ed93f9e797 100644 +index f1f86ef8b5..6e026d34f0 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -168,6 +168,10 @@ public class EntityItem extends Entity { @@ -20,5 +20,5 @@ index b813f402cd..ed93f9e797 100644 double radius = world.spigotConfig.itemMerge; List list = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius), (entityitem) -> { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch similarity index 90% rename from Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch rename to Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch index 8a7070cd4b..37b0818db8 100644 --- a/Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch +++ b/Spigot-Server-Patches/0254-Use-asynchronous-Log4j-2-loggers.patch @@ -1,11 +1,11 @@ -From 22a6f746e26c3ff51eadae48bb0b660189a3a0ba Mon Sep 17 00:00:00 2001 +From e73db9e760fe68b5eb791fc1b6b784c210e93f69 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 17 Jul 2018 16:42:17 +0200 Subject: [PATCH] Use asynchronous Log4j 2 loggers diff --git a/pom.xml b/pom.xml -index a10ab7cbb6..2cb84223e6 100644 +index 4ead093278..1f3571dd0f 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,13 @@ @@ -30,5 +30,5 @@ index 0000000000..ee7c90784c @@ -0,0 +1 @@ +Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch similarity index 95% rename from Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch rename to Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch index a89126c618..0a8839f6c5 100644 --- a/Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch +++ b/Spigot-Server-Patches/0255-add-more-information-to-Entity.toString.patch @@ -1,4 +1,4 @@ -From 93ae9c7de466e57d10430a20223b30b7ac1d350b Mon Sep 17 00:00:00 2001 +From 3d0f50c3805fb60f8b3a46079a3ffe2eb0a80929 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:13:28 -0400 Subject: [PATCH] add more information to Entity.toString() diff --git a/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 98% rename from Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index ae2b732ea8..3518548c71 100644 --- a/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/0256-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -1,4 +1,4 @@ -From 6b76b838c87ba763ff99a5c639382d2dabe59ddd Mon Sep 17 00:00:00 2001 +From d36df81ad826c2207447db7aefef352cc02fdbf4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 08:25:40 -0400 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues diff --git a/Spigot-Server-Patches/0258-EnderDragon-Events.patch b/Spigot-Server-Patches/0257-EnderDragon-Events.patch similarity index 97% rename from Spigot-Server-Patches/0258-EnderDragon-Events.patch rename to Spigot-Server-Patches/0257-EnderDragon-Events.patch index 1f6807cd35..9fe2c4aaf2 100644 --- a/Spigot-Server-Patches/0258-EnderDragon-Events.patch +++ b/Spigot-Server-Patches/0257-EnderDragon-Events.patch @@ -1,4 +1,4 @@ -From 8f20e2699a59fc519e02eeb983ee623ddaef35a2 Mon Sep 17 00:00:00 2001 +From c2e0cb702ebab1f5eaff4db97a24715a844a319f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:27 -0500 Subject: [PATCH] EnderDragon Events @@ -42,7 +42,7 @@ index 14e20f4961..0b0815e113 100644 if (this.d != null) { while (!this.d.b()) { diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java -index 239be99c51..2195b83ce2 100644 +index 3c2f846b5c..b6958bf789 100644 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java @@ -40,8 +40,10 @@ public class EntityDragonFireball extends EntityFireball { @@ -57,5 +57,5 @@ index 239be99c51..2195b83ce2 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch similarity index 96% rename from Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch rename to Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch index aba82ea52a..ac74a9b023 100644 --- a/Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch +++ b/Spigot-Server-Patches/0258-PlayerElytraBoostEvent.patch @@ -1,4 +1,4 @@ -From 0f5dfd118418ac048073cf64be67d48689125945 Mon Sep 17 00:00:00 2001 +From cd0f0503a69a3bb87922c0f5505e17e1d5905917 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:59 -0500 Subject: [PATCH] PlayerElytraBoostEvent @@ -30,5 +30,5 @@ index aea46ffae5..9e86ef4ce2 100644 return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, entityhuman.b(enumhand)); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch similarity index 99% rename from Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch rename to Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch index bd111d251b..625dbf9890 100644 --- a/Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch +++ b/Spigot-Server-Patches/0259-PlayerLaunchProjectileEvent.patch @@ -1,4 +1,4 @@ -From 1d1aa649311627d5cda969cc199dba389a039b40 Mon Sep 17 00:00:00 2001 +From 0ee99f0f22afb8d7ce8ca804304d8b9fc39643cd Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:11:03 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent @@ -260,5 +260,5 @@ index e267e43fe5..fa6d627db4 100644 entityhuman.b(StatisticList.ITEM_USED.b(this)); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch similarity index 99% rename from Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch rename to Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch index 4b5cc41009..6cea35f026 100644 --- a/Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch +++ b/Spigot-Server-Patches/0260-Speedup-BlockPos-by-fixing-inlining.patch @@ -1,4 +1,4 @@ -From e462313c5340c19f4b93debff49ea4b5e51d7427 Mon Sep 17 00:00:00 2001 +From 849558c0002512199abba3186085b2ae1f3e023b Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 30 Nov 2016 20:56:58 -0600 Subject: [PATCH] Speedup BlockPos by fixing inlining diff --git a/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0261-Optimize-RegistryID.c.patch similarity index 96% rename from Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch rename to Spigot-Server-Patches/0261-Optimize-RegistryID.c.patch index 074271570a..6940d978b7 100644 --- a/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch +++ b/Spigot-Server-Patches/0261-Optimize-RegistryID.c.patch @@ -1,4 +1,4 @@ -From 2b727700e11081035b2e289e74f2d025620821a0 Mon Sep 17 00:00:00 2001 +From 22685187f21ca82ea256680bf4eba499577af155 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 23 Jul 2018 13:08:19 -0400 Subject: [PATCH] Optimize RegistryID.c() @@ -64,5 +64,5 @@ index e15d286710..e8a48b9a4c 100644 public int b() { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0262-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 94% rename from Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to Spigot-Server-Patches/0262-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index 50defe87dc..7a7cf3ce60 100644 --- a/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0262-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,4 +1,4 @@ -From 7d902591943518002acd1d7d4ce88b4ef7847de0 Mon Sep 17 00:00:00 2001 +From ac6df6a38235e42c919ac37242f083db8e1ae93d Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 12:57:39 +0200 Subject: [PATCH] Option to prevent armor stands from doing entity lookups @@ -21,7 +21,7 @@ index 83e54cb904..f06bb3ae19 100644 private void maxEntityCollision() { maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) ); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 299a316a4b..d205ec01ac 100644 +index f476f326f1..d08bd6d963 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -873,6 +873,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -40,5 +40,5 @@ index 299a316a4b..d205ec01ac 100644 int i = MathHelper.floor(axisalignedbb.minX); int j = MathHelper.f(axisalignedbb.maxX); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0263-Vanished-players-don-t-have-rights.patch similarity index 99% rename from Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch rename to Spigot-Server-Patches/0263-Vanished-players-don-t-have-rights.patch index 12452027c9..1de3fcec85 100644 --- a/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0263-Vanished-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From 6012ed43cb5d0b10b3490ed3ff459c84f0be2b77 Mon Sep 17 00:00:00 2001 +From 06c40aefa0e83c45954e684d2b2b5b4d7ecc3dcf Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 14:22:26 +0200 Subject: [PATCH] Vanished players don't have rights diff --git a/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0264-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch similarity index 88% rename from Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch rename to Spigot-Server-Patches/0264-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch index 6a674eab56..8148b835cc 100644 --- a/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch +++ b/Spigot-Server-Patches/0264-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch @@ -1,4 +1,4 @@ -From a343000f250db682610e2129a58d51653e06829b Mon Sep 17 00:00:00 2001 +From 8c46a9caa0ab41ce3d97389a8510bdf636b65846 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:18:31 -0400 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it @@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 98c2de5507..4409a6ec84 100644 +index cacef3ac9f..10381fe95d 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -416,6 +416,7 @@ public class Chunk implements IChunkAccess { @@ -26,5 +26,5 @@ index 98c2de5507..4409a6ec84 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0265-Add-some-Debug-to-Chunk-Entity-slices.patch similarity index 95% rename from Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch rename to Spigot-Server-Patches/0265-Add-some-Debug-to-Chunk-Entity-slices.patch index 1b53b24442..cf2d177314 100644 --- a/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch +++ b/Spigot-Server-Patches/0265-Add-some-Debug-to-Chunk-Entity-slices.patch @@ -1,4 +1,4 @@ -From 3f863b60ea75e77e1d1a9514444d0e3d9b8567ff Mon Sep 17 00:00:00 2001 +From 910c86e5b07b13599b91e3bca94c1aec6eddab0e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:44:23 -0400 Subject: [PATCH] Add some Debug to Chunk Entity slices @@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created if the entity was to end up in 2 different chunk slices diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 4409a6ec84..5d1947f826 100644 +index 10381fe95d..ebc00f355e 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -408,6 +408,25 @@ public class Chunk implements IChunkAccess { @@ -57,7 +57,7 @@ index 4409a6ec84..5d1947f826 100644 return; } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index fe9881fdf2..32162003ab 100644 +index 8bc3e0464d..e1cd5e72a5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -69,5 +69,5 @@ index fe9881fdf2..32162003ab 100644 static boolean isLevelAtLeast(NBTTagCompound tag, int level) { return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0267-EntityTransformedEvent.patch b/Spigot-Server-Patches/0266-EntityTransformedEvent.patch similarity index 98% rename from Spigot-Server-Patches/0267-EntityTransformedEvent.patch rename to Spigot-Server-Patches/0266-EntityTransformedEvent.patch index 5caf14c7fa..dbb8a06338 100644 --- a/Spigot-Server-Patches/0267-EntityTransformedEvent.patch +++ b/Spigot-Server-Patches/0266-EntityTransformedEvent.patch @@ -1,4 +1,4 @@ -From 0ace783016fca6b139c0bcc9802d8f9782bda197 Mon Sep 17 00:00:00 2001 +From 240ff9ec9465aa5cd5827052356565df8f7fc3a8 Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:30:03 -0400 Subject: [PATCH] EntityTransformedEvent diff --git a/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0267-SkeletonHorse-Additions.patch similarity index 97% rename from Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch rename to Spigot-Server-Patches/0267-SkeletonHorse-Additions.patch index 1d86d60c43..754b9e9963 100644 --- a/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch +++ b/Spigot-Server-Patches/0267-SkeletonHorse-Additions.patch @@ -1,4 +1,4 @@ -From eedf0cb25f0dfa2d6ad2cd0205b03de7ad555a1f Mon Sep 17 00:00:00 2001 +From e823ee4eb0c1a3edf6d9fd5ef6f9f5c82becc9e1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:31 -0500 Subject: [PATCH] SkeletonHorse Additions diff --git a/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0268-Prevent-Saving-Bad-entities-to-chunks.patch similarity index 97% rename from Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch rename to Spigot-Server-Patches/0268-Prevent-Saving-Bad-entities-to-chunks.patch index 38abbec2a3..549f21bd55 100644 --- a/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch +++ b/Spigot-Server-Patches/0268-Prevent-Saving-Bad-entities-to-chunks.patch @@ -1,4 +1,4 @@ -From 46b21135bcded2c0f67837ada678ce4bbb866d7c Mon Sep 17 00:00:00 2001 +From 44289d020a881a6a2b76a38030761ea5a1bb1bc3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 26 Jul 2018 00:11:12 -0400 Subject: [PATCH] Prevent Saving Bad entities to chunks diff --git a/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0269-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 98% rename from Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to Spigot-Server-Patches/0269-Don-t-call-getItemMeta-on-hasItemMeta.patch index f9c8bb6bcc..fd71f2de8a 100644 --- a/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch +++ b/Spigot-Server-Patches/0269-Don-t-call-getItemMeta-on-hasItemMeta.patch @@ -1,4 +1,4 @@ -From 51bc9957213416d48bfe9ce4b4533bb42cae2e8d Mon Sep 17 00:00:00 2001 +From 543c30c4f40482908a726af61607a4fedf546721 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Thu, 26 Jul 2018 14:10:23 +0200 Subject: [PATCH] Don't call getItemMeta on hasItemMeta @@ -84,5 +84,5 @@ index 2a0852675b..f30f743121 100644 @Test public void testBlockStateMeta() { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0270-Ignore-Dead-Entities-in-entityList-iteration.patch similarity index 99% rename from Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch rename to Spigot-Server-Patches/0270-Ignore-Dead-Entities-in-entityList-iteration.patch index da252d8e45..ed33fe9f82 100644 --- a/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0270-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -1,4 +1,4 @@ -From cf1eba4249fbb1139b10ce3007247a2b4d5d62b1 Mon Sep 17 00:00:00 2001 +From 2cd0a100f8299533b6802f20e1462325cb2bb352 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Jul 2018 12:18:27 -0400 Subject: [PATCH] Ignore Dead Entities in entityList iteration diff --git a/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0271-Provide-option-to-use-a-versioned-world-folder-for-t.patch similarity index 99% rename from Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch rename to Spigot-Server-Patches/0271-Provide-option-to-use-a-versioned-world-folder-for-t.patch index 16ca51c77b..f15d1e80d7 100644 --- a/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch +++ b/Spigot-Server-Patches/0271-Provide-option-to-use-a-versioned-world-folder-for-t.patch @@ -1,4 +1,4 @@ -From ec2e90e9be6047a2dfb9d230d1503ea53ac82beb Mon Sep 17 00:00:00 2001 +From 1064dde4abf521b20e6a6209bc173850f0e85d44 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 29 Jul 2018 15:48:50 -0400 Subject: [PATCH] Provide option to use a versioned world folder for testing @@ -19,7 +19,7 @@ may be some delay there, but region files are only copied on demand. This is highly experiemental so backup your world before relying on this to not modify it diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index a9b71c85d5..8c3880c838 100644 +index eeef7d330b..dfdc7c384d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -13,6 +13,7 @@ import java.util.List; @@ -226,5 +226,5 @@ index 350ac42d6b..eaae446861 100644 this.baseDir.mkdirs(); this.playerDir = new File(this.baseDir, "playerdata"); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0272-MC-111480-Start-Entity-ID-s-at-1.patch similarity index 90% rename from Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch rename to Spigot-Server-Patches/0272-MC-111480-Start-Entity-ID-s-at-1.patch index 4c843367f9..86420446f0 100644 --- a/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch +++ b/Spigot-Server-Patches/0272-MC-111480-Start-Entity-ID-s-at-1.patch @@ -1,4 +1,4 @@ -From f3e67244df3ab9e3a6e9bb0828d6b666f4c712e1 Mon Sep 17 00:00:00 2001 +From 0124be370577db0ef70727ec3693451e04125433 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 29 Jul 2018 22:58:47 -0400 Subject: [PATCH] MC-111480: Start Entity ID's at 1 @@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special, and can break things such as Elytra Fireworks. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 50b6765a55..8a95e0f117 100644 +index b02b084556..c32ed855bd 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -20,5 +20,5 @@ index 50b6765a55..8a95e0f117 100644 private static final AxisAlignedBB d = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D); private static double e = 1.0D; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0273-Implement-Expanded-ArmorStand-API.patch similarity index 98% rename from Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch rename to Spigot-Server-Patches/0273-Implement-Expanded-ArmorStand-API.patch index 6b806ade49..a1a4be01bb 100644 --- a/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch +++ b/Spigot-Server-Patches/0273-Implement-Expanded-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From a35fd8580409ac0c309eb3af91c1e00cdeeeb359 Mon Sep 17 00:00:00 2001 +From ebbfa162412e2f440bbb15d847a96a8883787b38 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:25:46 -0400 Subject: [PATCH] Implement Expanded ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 81226d6042..b5b7631919 100644 +index 62a878d13d..25afd95542 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving { @@ -126,5 +126,5 @@ index 124c3185bc..9f5c3b92e3 100644 // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0275-AnvilDamageEvent.patch b/Spigot-Server-Patches/0274-AnvilDamageEvent.patch similarity index 96% rename from Spigot-Server-Patches/0275-AnvilDamageEvent.patch rename to Spigot-Server-Patches/0274-AnvilDamageEvent.patch index b58cf8f341..08fb3f6ad4 100644 --- a/Spigot-Server-Patches/0275-AnvilDamageEvent.patch +++ b/Spigot-Server-Patches/0274-AnvilDamageEvent.patch @@ -1,4 +1,4 @@ -From 8fec80ea05d9f068a343877a10844d06900a35b4 Mon Sep 17 00:00:00 2001 +From fd7190989ea36cd191deab66a2d11da05dc1bb9a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:37:03 -0500 Subject: [PATCH] AnvilDamageEvent @@ -26,5 +26,5 @@ index 88e706f077..abdcd52c46 100644 if (iblockdata1 == null) { world.a(blockposition, false); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0275-Add-TNTPrimeEvent.patch similarity index 98% rename from Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch rename to Spigot-Server-Patches/0275-Add-TNTPrimeEvent.patch index e16a9fee31..a8d8e848e0 100644 --- a/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/0275-Add-TNTPrimeEvent.patch @@ -1,11 +1,11 @@ -From 3054e7ac5aee07e7632ef0e46e2fae0357452385 Mon Sep 17 00:00:00 2001 +From 25463ea486a70596f9d40438db8fc112b7c5615b Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 16 Jul 2018 00:05:05 +0300 Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index f769df41a6..087535caf9 100644 +index 49e3d7284b..71357b73fa 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -114,7 +114,7 @@ index 013fa35241..f717ac87c4 100644 world.a(blockposition, false); } diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 0baec5e119..9b2ac3c63a 100644 +index f015c023e2..8dc849ca14 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock; @@ -138,5 +138,5 @@ index 0baec5e119..9b2ac3c63a 100644 this.world.a(blockposition, false); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0276-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 96% rename from Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch rename to Spigot-Server-Patches/0276-Break-up-and-make-tab-spam-limits-configurable.patch index 6c934ace59..3465becb5a 100644 --- a/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/Spigot-Server-Patches/0276-Break-up-and-make-tab-spam-limits-configurable.patch @@ -1,4 +1,4 @@ -From d01b92b4aabe9e0688e7280e5a836d30684c6c01 Mon Sep 17 00:00:00 2001 +From 5610410edd6a8b3ffeb7f570499968b748abd107 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 29 Jul 2018 05:02:15 +0100 Subject: [PATCH] Break up and make tab spam limits configurable @@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on plugins doing unsafe things. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 8c3880c838..d773ef5b0d 100644 +index dfdc7c384d..207e5d3e23 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -311,4 +311,18 @@ public class PaperConfig { @@ -45,7 +45,7 @@ index 8c3880c838..d773ef5b0d 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 05dec82386..0aa1e2a057 100644 +index d32f89493f..c43b1aca1e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -74,5 +74,5 @@ index 05dec82386..0aa1e2a057 100644 return; } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0277-Add-hand-to-bucket-events.patch similarity index 98% rename from Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch rename to Spigot-Server-Patches/0277-Add-hand-to-bucket-events.patch index 842aff60cc..533b096e9c 100644 --- a/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0277-Add-hand-to-bucket-events.patch @@ -1,4 +1,4 @@ -From cace64c725c45217e60399dabbaae2461b8fdb18 Mon Sep 17 00:00:00 2001 +From c96126417eb762b23d3f5ecdb60587f87b70002c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 2 Aug 2018 08:44:35 -0500 Subject: [PATCH] Add hand to bucket events @@ -67,7 +67,7 @@ index cb28914118..5dc967f8ba 100644 ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 78baaf6253..eec3effef7 100644 +index dd25a8ad29..c9185a1986 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -360,6 +360,20 @@ public class CraftEventFactory { @@ -105,5 +105,5 @@ index 78baaf6253..eec3effef7 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0278-MC-135506-Experience-should-save-as-Integers.patch similarity index 92% rename from Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch rename to Spigot-Server-Patches/0278-MC-135506-Experience-should-save-as-Integers.patch index 238a6c3ba7..ebb0166674 100644 --- a/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch +++ b/Spigot-Server-Patches/0278-MC-135506-Experience-should-save-as-Integers.patch @@ -1,11 +1,11 @@ -From 1183e34fb095ef621f4e86dc5d09bf0d92a84c2e Mon Sep 17 00:00:00 2001 +From ee4b0150bc52de4dc2872f2c7efc012ca55af1fc Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 3 Aug 2018 00:04:54 -0400 Subject: [PATCH] MC-135506: Experience should save as Integers diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 64d71a9a2a..65c9969613 100644 +index 6a5954889e..1a98442e08 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -204,7 +204,7 @@ public class EntityExperienceOrb extends Entity { @@ -27,5 +27,5 @@ index 64d71a9a2a..65c9969613 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0279-Fix-client-rendering-skulls-from-same-user.patch similarity index 98% rename from Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch rename to Spigot-Server-Patches/0279-Fix-client-rendering-skulls-from-same-user.patch index e47989d733..69b8d04f94 100644 --- a/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch +++ b/Spigot-Server-Patches/0279-Fix-client-rendering-skulls-from-same-user.patch @@ -1,4 +1,4 @@ -From 91f92dfcdf9c6d9f9de49a16ab9d0456ac680667 Mon Sep 17 00:00:00 2001 +From 142a1ff6a8a71d094da726acf6cf83c3f034b490 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Nov 2016 00:40:42 -0500 Subject: [PATCH] Fix client rendering skulls from same user @@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user, for when different skins were used when skull was made. diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 2acd02f2f4..ca1bd02995 100644 +index 90c7182554..b9c5af51f5 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -54,7 +54,7 @@ public final class ItemStack { @@ -117,5 +117,5 @@ index 177cceb77f..0882d82cef 100644 public NBTTagCompound b() { return this.save(new NBTTagCompound()); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0280-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 99% rename from Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch rename to Spigot-Server-Patches/0280-Add-Early-Warning-Feature-to-WatchDog.patch index 999391656c..5e4336cd15 100644 --- a/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0280-Add-Early-Warning-Feature-to-WatchDog.patch @@ -1,4 +1,4 @@ -From b26772db491bba5d3aafa87ad747cdbe65fb5874 Mon Sep 17 00:00:00 2001 +From 3a38581c5e2448ea2245459ccd395a728ede17e2 Mon Sep 17 00:00:00 2001 From: miclebrick Date: Wed, 8 Aug 2018 15:30:52 -0400 Subject: [PATCH] Add Early Warning Feature to WatchDog diff --git a/Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0281-Make-EnderDragon-implement-Mob.patch similarity index 95% rename from Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch rename to Spigot-Server-Patches/0281-Make-EnderDragon-implement-Mob.patch index 5a8c547eb3..3bea42b5fd 100644 --- a/Spigot-Server-Patches/0282-Make-EnderDragon-implement-Mob.patch +++ b/Spigot-Server-Patches/0281-Make-EnderDragon-implement-Mob.patch @@ -1,4 +1,4 @@ -From 783acc449b55db2fbcc9925a4a6011bf18ec36db Mon Sep 17 00:00:00 2001 +From 0abb7e37dea94ffcb4dc3160c2052b1d2245294f Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 10 Aug 2018 22:11:49 -0400 Subject: [PATCH] Make EnderDragon implement Mob @@ -32,5 +32,5 @@ index cc115cc368..4947249da2 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0282-Detect-and-repair-corrupt-Region-Files.patch similarity index 98% rename from Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch rename to Spigot-Server-Patches/0282-Detect-and-repair-corrupt-Region-Files.patch index 15183e1f30..3098a8b93b 100644 --- a/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch +++ b/Spigot-Server-Patches/0282-Detect-and-repair-corrupt-Region-Files.patch @@ -1,4 +1,4 @@ -From 2726a8e5a3268e94dbecc08766492627088ffe98 Mon Sep 17 00:00:00 2001 +From b6e215608d79136bb77b0665d15a50b063cdfb5c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Aug 2018 00:49:20 -0400 Subject: [PATCH] Detect and repair corrupt Region Files @@ -111,5 +111,5 @@ index 4e6288e8bb..e68f901943 100644 private final ChunkCoordIntPair b; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0283-Use-ConcurrentHashMap-in-JsonList.patch similarity index 98% rename from Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch rename to Spigot-Server-Patches/0283-Use-ConcurrentHashMap-in-JsonList.patch index f6f208601a..642865280a 100644 --- a/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch +++ b/Spigot-Server-Patches/0283-Use-ConcurrentHashMap-in-JsonList.patch @@ -1,4 +1,4 @@ -From 9a838e19d0439217ea3ccd929378e34a78ec8865 Mon Sep 17 00:00:00 2001 +From fe166744007c77fbc0097a98dbc3fea50669f9c3 Mon Sep 17 00:00:00 2001 From: egg82 Date: Tue, 7 Aug 2018 01:24:23 -0600 Subject: [PATCH] Use ConcurrentHashMap in JsonList @@ -99,5 +99,5 @@ index 734e7ecf63..8570e38f42 100644 String s = this.b.toJson(collection); BufferedWriter bufferedwriter = null; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0284-Use-a-Queue-for-Queueing-Commands.patch similarity index 96% rename from Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch rename to Spigot-Server-Patches/0284-Use-a-Queue-for-Queueing-Commands.patch index 7a0562b481..5cf3376a59 100644 --- a/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch +++ b/Spigot-Server-Patches/0284-Use-a-Queue-for-Queueing-Commands.patch @@ -1,4 +1,4 @@ -From bb720aeb6b6cde871c625e63ab9cfa986d45a97f Mon Sep 17 00:00:00 2001 +From 44e2e546dbb528b69323163f2d94513d457cba24 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 12 Aug 2018 02:33:39 -0400 Subject: [PATCH] Use a Queue for Queueing Commands diff --git a/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0285-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 95% rename from Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to Spigot-Server-Patches/0285-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index 5aaae72e0c..07e7d94af2 100644 --- a/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-Server-Patches/0285-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,4 +1,4 @@ -From 0627ef1af25e16c18d835409db66f82219117887 Mon Sep 17 00:00:00 2001 +From 4949093ada5b472252a7a3b17c944a50f171b0e8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:16:34 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots @@ -35,5 +35,5 @@ index 08f8d80965..011e40458e 100644 return entities; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0286-Allow-disabling-armour-stand-ticking.patch similarity index 98% rename from Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch rename to Spigot-Server-Patches/0286-Allow-disabling-armour-stand-ticking.patch index 2a129de78c..e542709046 100644 --- a/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-Server-Patches/0286-Allow-disabling-armour-stand-ticking.patch @@ -1,4 +1,4 @@ -From 19a594ed1689467aba50bb9ace86c75a0ab2ee69 Mon Sep 17 00:00:00 2001 +From a840fe7244538c921ee95d7646f4949a6e0f5fac Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:09 -0700 Subject: [PATCH] Allow disabling armour stand ticking @@ -20,7 +20,7 @@ index f06bb3ae19..a5b4f99901 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index b5b7631919..9157dace14 100644 +index 25afd95542..19eb40db93 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -44,6 +44,11 @@ public class EntityArmorStand extends EntityLiving { @@ -140,7 +140,7 @@ index b5b7631919..9157dace14 100644 public Vector3f r() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index d2dddf1c72..1dd8475877 100644 +index 1500e43eee..32c51a941b 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2265,52 +2265,7 @@ public abstract class EntityLiving extends Entity { @@ -276,5 +276,5 @@ index 9f5c3b92e3..07ce93f17c 100644 // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0287-Optimize-BlockPosition-helper-methods.patch similarity index 97% rename from Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch rename to Spigot-Server-Patches/0287-Optimize-BlockPosition-helper-methods.patch index f41a3f8d08..3f3e23e24f 100644 --- a/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch +++ b/Spigot-Server-Patches/0287-Optimize-BlockPosition-helper-methods.patch @@ -1,4 +1,4 @@ -From b2810864b445412544e0e5fec305411ee8973a14 Mon Sep 17 00:00:00 2001 +From f9f2ff37461d6185309fcbe4f922b65a89a6e1fb Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Aug 2018 12:05:12 -0700 Subject: [PATCH] Optimize BlockPosition helper methods @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods Resolves #1338 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 93c3fa78f6..07b0cc7b12 100644 +index 04f754d2c1..16f0930404 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -134,55 +134,72 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -96,5 +96,5 @@ index 93c3fa78f6..07b0cc7b12 100644 public BlockPosition shift(EnumDirection enumdirection, int i) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0288-Send-nearby-packets-from-world-player-list-not-serve.patch similarity index 98% rename from Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch rename to Spigot-Server-Patches/0288-Send-nearby-packets-from-world-player-list-not-serve.patch index 2dbd05a585..3c97954c9a 100644 --- a/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch +++ b/Spigot-Server-Patches/0288-Send-nearby-packets-from-world-player-list-not-serve.patch @@ -1,4 +1,4 @@ -From a80635947334c0cdcced16154df86a2df8e2cc64 Mon Sep 17 00:00:00 2001 +From ae55b8c787098245f360f1832020027995902aa3 Mon Sep 17 00:00:00 2001 From: Mystiflow Date: Fri, 6 Jul 2018 13:21:30 +0100 Subject: [PATCH] Send nearby packets from world player list not server list diff --git a/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0289-Restore-vanlla-default-mob-spawn-range.patch similarity index 91% rename from Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch rename to Spigot-Server-Patches/0289-Restore-vanlla-default-mob-spawn-range.patch index 89065fde23..a28daa86be 100644 --- a/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch +++ b/Spigot-Server-Patches/0289-Restore-vanlla-default-mob-spawn-range.patch @@ -1,4 +1,4 @@ -From 6c9c04e023ccae16a3c8453184a3e47eb7c92020 Mon Sep 17 00:00:00 2001 +From 0abdc81f576fee006411839c5b2ac0c872bd4ca3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Aug 2018 12:43:16 -0400 Subject: [PATCH] Restore vanlla default mob-spawn-range @@ -18,5 +18,5 @@ index 7f0adb70d1..4c1cb6d7bf 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0291-Optimize-Hoppers.patch b/Spigot-Server-Patches/0290-Optimize-Hoppers.patch similarity index 99% rename from Spigot-Server-Patches/0291-Optimize-Hoppers.patch rename to Spigot-Server-Patches/0290-Optimize-Hoppers.patch index e0ef55229d..6c557ae82d 100644 --- a/Spigot-Server-Patches/0291-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0290-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 62264deed642f84486c25015c6936fb9d3fc6e57 Mon Sep 17 00:00:00 2001 +From a85602b67990d6af6c2ee7bbe85df8095c148225 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers diff --git a/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0291-Optimize-CraftBlockData-Creation.patch similarity index 95% rename from Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch rename to Spigot-Server-Patches/0291-Optimize-CraftBlockData-Creation.patch index 779b11fbe0..73491bf223 100644 --- a/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch +++ b/Spigot-Server-Patches/0291-Optimize-CraftBlockData-Creation.patch @@ -1,4 +1,4 @@ -From 1d500b69a89b640cba6fd9857e353f2159f5264d Mon Sep 17 00:00:00 2001 +From c85ad1cb28ff05d7f73864887652b8765c08feda Mon Sep 17 00:00:00 2001 From: miclebrick Date: Thu, 23 Aug 2018 11:45:32 -0400 Subject: [PATCH] Optimize CraftBlockData Creation @@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData and cloning it when one is needed. diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index 0f4aa698aa..c66cabe82f 100644 +index 862ae25544..d25989d514 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap; @@ -58,5 +58,5 @@ index c1666a9baf..3c29abd525 100644 } } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0293-Fix-MC-124320.patch b/Spigot-Server-Patches/0292-Fix-MC-124320.patch similarity index 95% rename from Spigot-Server-Patches/0293-Fix-MC-124320.patch rename to Spigot-Server-Patches/0292-Fix-MC-124320.patch index d734374a01..7d15241da3 100644 --- a/Spigot-Server-Patches/0293-Fix-MC-124320.patch +++ b/Spigot-Server-Patches/0292-Fix-MC-124320.patch @@ -1,11 +1,11 @@ -From b03251735923842e02254daa0a4eefde6793406a Mon Sep 17 00:00:00 2001 +From 8646aeae6d145823c1c400a2bfb873d41b836350 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 23 Aug 2018 09:25:30 -0500 Subject: [PATCH] Fix MC-124320 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 03d3090b3f..0bddca623e 100644 +index c72ae7e251..d71102164e 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -167,6 +167,7 @@ public class Block implements IMaterial { @@ -17,7 +17,7 @@ index 03d3090b3f..0bddca623e 100644 IBlockData iblockdata1 = iblockdata; BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(); diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 6db334cb59..5e850db327 100644 +index ad65200dca..9f2c339ae3 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -335,8 +335,9 @@ public class EntityEnderman extends EntityMonster { @@ -49,5 +49,5 @@ index 6db334cb59..5e850db327 100644 if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) { // CraftBukkit start - Place event -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0293-Slime-Pathfinder-Events.patch similarity index 99% rename from Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch rename to Spigot-Server-Patches/0293-Slime-Pathfinder-Events.patch index 51586230c7..47c2c33eba 100644 --- a/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch +++ b/Spigot-Server-Patches/0293-Slime-Pathfinder-Events.patch @@ -1,4 +1,4 @@ -From 205a6705fadbbabd90b5db2d3cb8ef7028bb485e Mon Sep 17 00:00:00 2001 +From 3d511e21c8df2994033d392ccf3b448bf80e3e93 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:42 -0500 Subject: [PATCH] Slime Pathfinder Events diff --git a/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0294-Configurable-speed-for-water-flowing-over-lava.patch similarity index 96% rename from Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch rename to Spigot-Server-Patches/0294-Configurable-speed-for-water-flowing-over-lava.patch index aa292391e3..228cabf1f1 100644 --- a/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0294-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,4 +1,4 @@ -From fc6811a705ae7807d5b5507c1e46e66abe37a6bc Mon Sep 17 00:00:00 2001 +From f90fac0128f6c87402d290d649ffaad7fa877d4e Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 8 Aug 2018 16:33:21 -0600 Subject: [PATCH] Configurable speed for water flowing over lava @@ -22,7 +22,7 @@ index 2b5402b009..2c27be63ea 100644 private void armorStandTick() { this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick); diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java -index 44e00339f2..b4616f259e 100644 +index cccdd13988..56bf0b1d81 100644 --- a/src/main/java/net/minecraft/server/BlockFluids.java +++ b/src/main/java/net/minecraft/server/BlockFluids.java @@ -70,11 +70,27 @@ public class BlockFluids extends Block implements IFluidSource { @@ -64,5 +64,5 @@ index 44e00339f2..b4616f259e 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0295-Optimize-RegistryMaterials.patch similarity index 95% rename from Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch rename to Spigot-Server-Patches/0295-Optimize-RegistryMaterials.patch index 6274f123c7..af625e00c4 100644 --- a/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch +++ b/Spigot-Server-Patches/0295-Optimize-RegistryMaterials.patch @@ -1,4 +1,4 @@ -From 51ad9b35e2f2b4925875f701ed1647ff170d7166 Mon Sep 17 00:00:00 2001 +From 50b263071d857e2b963dd2aad115520e7c565d41 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Aug 2018 20:49:50 -0400 Subject: [PATCH] Optimize RegistryMaterials @@ -34,5 +34,5 @@ index f291e05b26..fed38e6ef0 100644 return this.d[random.nextInt(this.d.length)]; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0296-Add-PhantomPreSpawnEvent.patch similarity index 97% rename from Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch rename to Spigot-Server-Patches/0296-Add-PhantomPreSpawnEvent.patch index ec0035bf67..05349749f0 100644 --- a/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-Server-Patches/0296-Add-PhantomPreSpawnEvent.patch @@ -1,11 +1,11 @@ -From 179c0c5ef3c991727a60cd628816cf1d2dd5e741 Mon Sep 17 00:00:00 2001 +From ef3e2ff988268e420a2359e8149ea9b16dcfb980 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:51 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index e5ed5a3dcc..e5d032d02b 100644 +index 3554410746..b672ac5c2a 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -129,6 +129,11 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -86,5 +86,5 @@ index 9f9ee92390..2b97313694 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0297-Add-More-Creeper-API.patch similarity index 97% rename from Spigot-Server-Patches/0298-Add-More-Creeper-API.patch rename to Spigot-Server-Patches/0297-Add-More-Creeper-API.patch index a3a74d9aca..b8a9d4e72f 100644 --- a/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch +++ b/Spigot-Server-Patches/0297-Add-More-Creeper-API.patch @@ -1,4 +1,4 @@ -From 189f599e1faf4412d64ea4b877a2a741d661f45f Mon Sep 17 00:00:00 2001 +From 8b23efffa1bd5e6504a1e277d38a44176e0322bc Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:26 -0500 Subject: [PATCH] Add More Creeper API diff --git a/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0298-Inventory-removeItemAnySlot.patch similarity index 97% rename from Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch rename to Spigot-Server-Patches/0298-Inventory-removeItemAnySlot.patch index e9fb7df168..6a302928b3 100644 --- a/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch +++ b/Spigot-Server-Patches/0298-Inventory-removeItemAnySlot.patch @@ -1,4 +1,4 @@ -From bb3cc30f84399754a6e6696be2443683ae7e124f Mon Sep 17 00:00:00 2001 +From 9c2d39502de7068ac6fd155480fb9bade8afc6ab Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:15 -0400 Subject: [PATCH] Inventory#removeItemAnySlot @@ -57,5 +57,5 @@ index 0d637e207e..026a0c3995 100644 // Drat! we don't have this type in the inventory if (first == -1) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0299-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 94% rename from Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to Spigot-Server-Patches/0299-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index 163afe5e27..aad2623dbb 100644 --- a/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/Spigot-Server-Patches/0299-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -1,4 +1,4 @@ -From 8c1c73a5a0258885c544039294c3636e512e5d5f Mon Sep 17 00:00:00 2001 +From 746ee758d67ef87767f6b52965425f2f26bf2a9a Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 2 Sep 2018 19:34:33 -0700 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted diff --git a/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0300-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 97% rename from Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch rename to Spigot-Server-Patches/0300-Add-ray-tracing-methods-to-LivingEntity.patch index 495151c600..fb3e441b47 100644 --- a/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0300-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,11 +1,11 @@ -From 11140e0c6dd73bc7d2c78219e6a5d9a504191e9f Mon Sep 17 00:00:00 2001 +From ed12379a9b43f11c8a4b4f3d435858a716ba8674 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:20:03 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 1dd8475877..19e7114cbb 100644 +index 32c51a941b..c80278ede0 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3176,6 +3176,23 @@ public abstract class EntityLiving extends Entity { @@ -66,5 +66,5 @@ index 8dea7d36b6..d5c4115a85 100644 public List getLastTwoTargetBlocks(Set transparent, int maxDistance) { return getLineOfSight(transparent, maxDistance, 2); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0301-Expose-attack-cooldown-methods-for-Player.patch similarity index 96% rename from Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch rename to Spigot-Server-Patches/0301-Expose-attack-cooldown-methods-for-Player.patch index 55e6b74e32..7ebf25409b 100644 --- a/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-Server-Patches/0301-Expose-attack-cooldown-methods-for-Player.patch @@ -1,4 +1,4 @@ -From d53e95e2836fe0a5f6c19430161a2d55ebdf76b4 Mon Sep 17 00:00:00 2001 +From 8089c8fd02dc786187e8393c6f76982d8de394b7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Sep 2018 15:02:00 -0500 Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/Spigot-Server-Patches/0303-Improve-death-events.patch b/Spigot-Server-Patches/0302-Improve-death-events.patch similarity index 99% rename from Spigot-Server-Patches/0303-Improve-death-events.patch rename to Spigot-Server-Patches/0302-Improve-death-events.patch index d14b6f6530..1fa7f3af07 100644 --- a/Spigot-Server-Patches/0303-Improve-death-events.patch +++ b/Spigot-Server-Patches/0302-Improve-death-events.patch @@ -1,4 +1,4 @@ -From e258830906f96b0c910558963d98251753285c78 Mon Sep 17 00:00:00 2001 +From a024b1b6e53151854d4e0f8e687e944023796f4b Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:39:35 +0100 Subject: [PATCH] Improve death events diff --git a/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0303-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 93% rename from Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch rename to Spigot-Server-Patches/0303-Allow-chests-to-be-placed-with-NBT-data.patch index d63db0c7c2..292b9cae73 100644 --- a/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/Spigot-Server-Patches/0303-Allow-chests-to-be-placed-with-NBT-data.patch @@ -1,11 +1,11 @@ -From 7d6f923ee3f9aa4456d6f8721a11c91cf5e99058 Mon Sep 17 00:00:00 2001 +From b3e4caf15cf2cb3f77a1ef4eea473ab3d621a9bb Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Sep 2018 18:43:31 -0500 Subject: [PATCH] Allow chests to be placed with NBT data diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 2d83c9e79c..dec5894637 100644 +index ab66dbf885..03236cf980 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -235,6 +235,7 @@ public final class ItemStack { @@ -30,5 +30,5 @@ index 85b450c054..efc153de5f 100644 // CraftBukkit end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0304-Mob-Pathfinding-API.patch similarity index 95% rename from Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch rename to Spigot-Server-Patches/0304-Mob-Pathfinding-API.patch index c3100b6b7b..1bbb0b1733 100644 --- a/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch +++ b/Spigot-Server-Patches/0304-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From 89cb3ce39988c8cbc81a8c2aabb970091fabd7ee Mon Sep 17 00:00:00 2001 +From 6302a7b67731add44519ff2aa3e813eb334eeb22 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 13:30:00 -0400 Subject: [PATCH] Mob Pathfinding API @@ -123,7 +123,7 @@ index 0000000000..f68a07cb96 + } +} diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index a473c03b9d..856ff22b04 100644 +index 65b38d75b4..d8da790aec 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -67,7 +67,7 @@ public abstract class NavigationAbstract { @@ -144,15 +144,15 @@ index a473c03b9d..856ff22b04 100644 BlockPosition blockposition = new BlockPosition(entity); double d0 = entity.locX; double d1 = entity.getBoundingBox().minY; -@@ -149,6 +149,7 @@ public abstract class NavigationAbstract { - private int pathfindFailures = 0; - // Paper end +@@ -133,6 +133,7 @@ public abstract class NavigationAbstract { + return pathentity != null && this.a(pathentity, d0); + } + public boolean setDestination(@Nullable PathEntity pathentity, double speed) { return a(pathentity, speed); } // Paper - OBFHELPER public boolean a(@Nullable PathEntity pathentity, double d0) { if (pathentity == null) { this.c = null; -@@ -172,7 +173,7 @@ public abstract class NavigationAbstract { +@@ -156,7 +157,7 @@ public abstract class NavigationAbstract { } } @@ -161,14 +161,14 @@ index a473c03b9d..856ff22b04 100644 public PathEntity l() { return this.c; } -@@ -258,6 +259,7 @@ public abstract class NavigationAbstract { +@@ -242,6 +243,7 @@ public abstract class NavigationAbstract { return this.c == null || this.c.b(); } + public void stopPathfinding() { o(); } // Paper - OBFHELPER public void o() { - this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations this.c = null; + } diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java index f1d94420c8..5fdb601801 100644 --- a/src/main/java/net/minecraft/server/PathEntity.java @@ -241,5 +241,5 @@ index 5bf1cd06fa..53c2d154ed 100644 public void setTarget(LivingEntity target) { EntityInsentient entity = getHandle(); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0305-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 97% rename from Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to Spigot-Server-Patches/0305-Prevent-chunk-loading-from-Fluid-Flowing.patch index 67d3c593f6..b3c1db0567 100644 --- a/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch +++ b/Spigot-Server-Patches/0305-Prevent-chunk-loading-from-Fluid-Flowing.patch @@ -1,11 +1,11 @@ -From ad4d4df902283a2b6dd24ad997510c126635d664 Mon Sep 17 00:00:00 2001 +From fb1fefb43d1421a2f13c106310cb808e643a011f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:36:16 -0400 Subject: [PATCH] Prevent chunk loading from Fluid Flowing diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java -index c76fa0b4bf..5f15143603 100644 +index 46cacf970c..fa1cec0dac 100644 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java @@ -178,7 +178,8 @@ public abstract class FluidTypeFlowing extends FluidType { @@ -75,5 +75,5 @@ index c76fa0b4bf..5f15143603 100644 Fluid fluid = (Fluid) pair.getSecond(); Fluid fluid1 = this.a(iworldreader, blockposition1, iblockdata1); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0306-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 99% rename from Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to Spigot-Server-Patches/0306-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index 4818811b36..b9e78ffbb8 100644 --- a/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/Spigot-Server-Patches/0306-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -1,4 +1,4 @@ -From d078b257fdf6c38f1c597457d9fdf8f90c586f24 Mon Sep 17 00:00:00 2001 +From 137b7e0c17738468cb4b119fa4b5478758a23e02 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:55 +0300 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values @@ -432,5 +432,5 @@ index a8b267487f..c175c20a95 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0307-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 98% rename from Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to Spigot-Server-Patches/0307-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch index f5d8de2600..8d36103d82 100644 --- a/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch +++ b/Spigot-Server-Patches/0307-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch @@ -1,4 +1,4 @@ -From 86cae0eb8c73217a6d7794e9ee45438295abdea5 Mon Sep 17 00:00:00 2001 +From 80e349f4e9b616dee129420da8566157c7955e1f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:56:36 -0400 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks diff --git a/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0308-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to Spigot-Server-Patches/0308-Prevent-mob-spawning-from-loading-generating-chunks.patch index e42062309f..8ff6603500 100644 --- a/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch +++ b/Spigot-Server-Patches/0308-Prevent-mob-spawning-from-loading-generating-chunks.patch @@ -1,4 +1,4 @@ -From 07a2f95c2ab988ea1f153d1bcedcff297bd2257d Mon Sep 17 00:00:00 2001 +From ea095c5bbe76c29c5f11d0d8c44e0d125d5b9b9b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:12:57 -0400 Subject: [PATCH] Prevent mob spawning from loading/generating chunks @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks also prevents if out of world border bounds diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 5da0f2211b..94d7bca09d 100644 +index 4458b48ee8..09f1b9d762 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -25,9 +25,9 @@ public final class SpawnerCreature { @@ -31,5 +31,5 @@ index 5da0f2211b..94d7bca09d 100644 if (Objects.equals(chunkcoordintpair, chunk.getPos()) || world.getChunkProvider().a(chunkcoordintpair)) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0309-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 97% rename from Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to Spigot-Server-Patches/0309-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch index 461bb754d8..4f0d984f84 100644 --- a/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch +++ b/Spigot-Server-Patches/0309-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch @@ -1,4 +1,4 @@ -From 7fa8a83bc26c6474100107a2221e616a4941693b Mon Sep 17 00:00:00 2001 +From 444bad1047061baffb84f0597a9913bbf953c8b9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:47:01 -0400 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning @@ -67,5 +67,5 @@ index 9a839d6540..72eb669c50 100644 @Nullable -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0310-Implement-furnace-cook-speed-multiplier-API.patch similarity index 97% rename from Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch rename to Spigot-Server-Patches/0310-Implement-furnace-cook-speed-multiplier-API.patch index 4a9aa9aadb..f651527940 100644 --- a/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-Server-Patches/0310-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From a550d6149862ab07b014f390672a16c297eb3179 Mon Sep 17 00:00:00 2001 +From df7e950ea2fbef7f6d5afbe857d261b92b7ba8c3 Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:21 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 0f6cd246ae..c983d260ae 100644 +index 2bbd3663a7..55b5646103 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -8,6 +8,7 @@ import java.util.Map; @@ -80,5 +80,5 @@ index 9cc67915ca..1ce10ea049 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0311-Support-Overriding-World-Seeds.patch similarity index 98% rename from Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch rename to Spigot-Server-Patches/0311-Support-Overriding-World-Seeds.patch index 0b66870f54..ed7a80cddd 100644 --- a/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch +++ b/Spigot-Server-Patches/0311-Support-Overriding-World-Seeds.patch @@ -1,4 +1,4 @@ -From 5548bc55f2ee3c119aaafa5b98fce9ac6d640f0c Mon Sep 17 00:00:00 2001 +From f968159774149efaa627b6042ffda9aea3243cd7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:05:31 -0400 Subject: [PATCH] Support Overriding World Seeds @@ -59,7 +59,7 @@ index a13c8c68b6..ea3695b021 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d100200518..3f1d8905a4 100644 +index 6c7ce47c5a..ac80ec7aeb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -362,7 +362,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 17 Sep 2018 23:37:31 -0400 Subject: [PATCH] Optimize Server World Map @@ -217,7 +217,7 @@ index 0000000000..6bb2f98b45 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3f1d8905a4..2198b4fbc9 100644 +index ac80ec7aeb..cb630fda6e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -78,7 +78,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 18 Sep 2018 23:53:23 +0100 Subject: [PATCH] PreSpawnerSpawnEvent diff --git a/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0314-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 98% rename from Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to Spigot-Server-Patches/0314-Catch-JsonParseException-in-Entity-and-TE-names.patch index 7417718723..8771a64f6a 100644 --- a/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch +++ b/Spigot-Server-Patches/0314-Catch-JsonParseException-in-Entity-and-TE-names.patch @@ -1,4 +1,4 @@ -From 67af7389de4a9e9b9888c17ae13ea44ce885f215 Mon Sep 17 00:00:00 2001 +From 5b92dac6e93d978a65c020c96a3d37a8f44fa960 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 22 Sep 2018 15:56:59 -0400 Subject: [PATCH] Catch JsonParseException in Entity and TE names diff --git a/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0315-Avoid-dimension-id-collisions.patch similarity index 91% rename from Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch rename to Spigot-Server-Patches/0315-Avoid-dimension-id-collisions.patch index 8e347dbe33..e8257e88e3 100644 --- a/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch +++ b/Spigot-Server-Patches/0315-Avoid-dimension-id-collisions.patch @@ -1,4 +1,4 @@ -From b0b9a2ee93688c24ac8acb636f122391dddc406e Mon Sep 17 00:00:00 2001 +From a7904b327656afffcee6abe75d0d7e753471387a Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 25 Sep 2018 06:53:43 +0200 Subject: [PATCH] Avoid dimension id collisions @@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was unloaded before. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e564688ca2..88c6d1d020 100644 +index 4e91047fac..5dfca97313 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -971,7 +971,7 @@ public final class CraftServer implements Server { @@ -21,5 +21,5 @@ index e564688ca2..88c6d1d020 100644 dimension++; break; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0316-Honor-EntityAgeable.ageLock.patch similarity index 90% rename from Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch rename to Spigot-Server-Patches/0316-Honor-EntityAgeable.ageLock.patch index 2250d8c828..e9d4e7600b 100644 --- a/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch +++ b/Spigot-Server-Patches/0316-Honor-EntityAgeable.ageLock.patch @@ -1,4 +1,4 @@ -From 87cbd418b3509e1ef0aa2936a774641da1e64b7d Mon Sep 17 00:00:00 2001 +From 0f65d2182aa5a637faa31bd08ed02a1f8e540ff1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 23 Sep 2018 20:59:53 -0500 Subject: [PATCH] Honor EntityAgeable.ageLock @@ -17,5 +17,5 @@ index da9740a99e..e87754ef33 100644 int k = j; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0317-Configurable-connection-throttle-kick-message.patch similarity index 95% rename from Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch rename to Spigot-Server-Patches/0317-Configurable-connection-throttle-kick-message.patch index 67f2e1965e..557e4d1ceb 100644 --- a/Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch +++ b/Spigot-Server-Patches/0317-Configurable-connection-throttle-kick-message.patch @@ -1,11 +1,11 @@ -From 38a27876adca7d3216359755517e82ca17fa8f1b Mon Sep 17 00:00:00 2001 +From 712e0f272c5f6f32d760f4aaf37553a52259f8ca Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 2 Oct 2018 09:57:50 +0100 Subject: [PATCH] Configurable connection throttle kick message diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ffb18902ff..2d3861c184 100644 +index ea3695b021..d2c039ea2f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -275,6 +275,11 @@ public class PaperConfig { @@ -34,5 +34,5 @@ index 07d85e5353..4b76c2d14f 100644 this.b.close(chatmessage); return; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0318-Hook-into-CB-plugin-rewrites.patch similarity index 99% rename from Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch rename to Spigot-Server-Patches/0318-Hook-into-CB-plugin-rewrites.patch index fc65eb5ec1..9806f10fe8 100644 --- a/Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch +++ b/Spigot-Server-Patches/0318-Hook-into-CB-plugin-rewrites.patch @@ -1,4 +1,4 @@ -From 101ea5d674288bc9efdec7635669fa534045c089 Mon Sep 17 00:00:00 2001 +From 51cb03cb27c37be6b2fbbe81af6980c5d7be2f8a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 3 Oct 2018 20:09:18 -0400 Subject: [PATCH] Hook into CB plugin rewrites @@ -187,5 +187,5 @@ index 467b2d9385..61f1023557 100644 { if ( owner.equals( "org/bukkit/Material" ) ) -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0319-Allow-setting-the-vex-s-summoner.patch similarity index 92% rename from Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch rename to Spigot-Server-Patches/0319-Allow-setting-the-vex-s-summoner.patch index e182e4fb12..c41869d3cd 100644 --- a/Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-Server-Patches/0319-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From a3058cff3a7477d530d1f3d0548820d7f57c01e7 Mon Sep 17 00:00:00 2001 +From 8eef2b2dae669008953802ebb34974b2803d8160 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:44 -0500 Subject: [PATCH] Allow setting the vex's summoner diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index d7bea83890..bcda21ba71 100644 +index c8e81b824f..47fceb57ee 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster { @@ -32,5 +32,5 @@ index 169c951ec3..2f7df3074f 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0321-Add-sun-related-API.patch b/Spigot-Server-Patches/0320-Add-sun-related-API.patch similarity index 97% rename from Spigot-Server-Patches/0321-Add-sun-related-API.patch rename to Spigot-Server-Patches/0320-Add-sun-related-API.patch index 17b00c2fa4..84a6890996 100644 --- a/Spigot-Server-Patches/0321-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0320-Add-sun-related-API.patch @@ -1,4 +1,4 @@ -From 4125334677d5034e6a5e79ff4e99dc2ed79f616f Mon Sep 17 00:00:00 2001 +From 0ddb4dccfa1ed3f5598a1a48100fa1ebcab8ad3f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API diff --git a/Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0321-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 92% rename from Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch rename to Spigot-Server-Patches/0321-Check-Drowned-for-Villager-Aggression-Config.patch index 280695d580..ae33ab8f6b 100644 --- a/Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch +++ b/Spigot-Server-Patches/0321-Check-Drowned-for-Villager-Aggression-Config.patch @@ -1,11 +1,11 @@ -From 41230e745046b04e5e5323e982fbc0a179f4217e Mon Sep 17 00:00:00 2001 +From 9e8452d2b6b21489bae6c5f1706696ba7273d153 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 10 Oct 2018 21:22:44 -0500 Subject: [PATCH] Check Drowned for Villager Aggression Config diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 0deb51427e..7f34cdbc34 100644 +index 38e35f0813..158c05d1e1 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { @@ -18,5 +18,5 @@ index 0deb51427e..7f34cdbc34 100644 this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bz)); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0323-Here-s-Johnny.patch b/Spigot-Server-Patches/0322-Here-s-Johnny.patch similarity index 93% rename from Spigot-Server-Patches/0323-Here-s-Johnny.patch rename to Spigot-Server-Patches/0322-Here-s-Johnny.patch index 3e28aa5dd5..fc2dc60169 100644 --- a/Spigot-Server-Patches/0323-Here-s-Johnny.patch +++ b/Spigot-Server-Patches/0322-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From 283e680a0354c5743032a1eb5e4cd18e9421dfd9 Mon Sep 17 00:00:00 2001 +From 8f4a9a3e9d84f034b12c5cc3b60d358bd0129a4f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:22 -0500 Subject: [PATCH] Here's Johnny! diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index 54c1b7c878..130a2e4ffe 100644 +index daa7bf330f..44531af417 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract { @@ -37,5 +37,5 @@ index 951d479298..5ff957ced7 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0324-Turtle-API.patch b/Spigot-Server-Patches/0323-Turtle-API.patch similarity index 99% rename from Spigot-Server-Patches/0324-Turtle-API.patch rename to Spigot-Server-Patches/0323-Turtle-API.patch index a50b9c913a..5a8ef9b22d 100644 --- a/Spigot-Server-Patches/0324-Turtle-API.patch +++ b/Spigot-Server-Patches/0323-Turtle-API.patch @@ -1,4 +1,4 @@ -From 0ad7b12ff33efd1c3f492027e1560f7ac5214a57 Mon Sep 17 00:00:00 2001 +From 84494fe39beeb59f4b4b3117892961e7e0c39ed0 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 29 Sep 2018 16:08:23 -0500 Subject: [PATCH] Turtle API diff --git a/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0324-Limit-lightning-strike-effect-distance.patch similarity index 98% rename from Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch rename to Spigot-Server-Patches/0324-Limit-lightning-strike-effect-distance.patch index 3677444b15..9c6dbcbf0e 100644 --- a/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0324-Limit-lightning-strike-effect-distance.patch @@ -1,4 +1,4 @@ -From 9a69ff4a0e316e4a1ae035872f6d248b57dfa3c2 Mon Sep 17 00:00:00 2001 +From 6f7a825520d7f9f9056ade41c80a461b5aaab2b9 Mon Sep 17 00:00:00 2001 From: Trigary Date: Fri, 14 Sep 2018 17:42:08 +0200 Subject: [PATCH] Limit lightning strike effect distance diff --git a/Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0325-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 96% rename from Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to Spigot-Server-Patches/0325-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index ef072b2add..5a3610e233 100644 --- a/Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0325-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -1,4 +1,4 @@ -From c35f0616fe3d5635d77ee1de19f4cc4f40f108c1 Mon Sep 17 00:00:00 2001 +From 851901b51da6b3e33d8626cd5f50a591f67ea212 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 17 Oct 2018 19:17:27 -0400 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles @@ -38,5 +38,5 @@ index f2f4b2d929..18d28a151a 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0326-Call-player-spectator-target-events.patch similarity index 98% rename from Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch rename to Spigot-Server-Patches/0326-Call-player-spectator-target-events.patch index 13557d312e..0ab64a428f 100644 --- a/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0326-Call-player-spectator-target-events.patch @@ -1,4 +1,4 @@ -From 2425f20e4ff9199babe673896396a4a7ec8100ce Mon Sep 17 00:00:00 2001 +From b826327c74f68b3e4202430420ea52e6da440371 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:32:19 -0500 Subject: [PATCH] Call player spectator target events diff --git a/Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0327-Add-Velocity-IP-Forwarding-Support.patch similarity index 99% rename from Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch rename to Spigot-Server-Patches/0327-Add-Velocity-IP-Forwarding-Support.patch index 40d48a9bdc..d49e4a6db9 100644 --- a/Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0327-Add-Velocity-IP-Forwarding-Support.patch @@ -1,4 +1,4 @@ -From c1be062e3c6f48a017cd6233f17781bffb8b840d Mon Sep 17 00:00:00 2001 +From 2eecaca566d12da917e349630a72487f49b69f18 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 8 Oct 2018 14:36:14 -0400 Subject: [PATCH] Add Velocity IP Forwarding Support @@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 2d3861c184..a79cba50e0 100644 +index d2c039ea2f..63d8602927 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -8,6 +8,7 @@ import java.io.IOException; @@ -278,7 +278,7 @@ index ae74dc9e18..7eb230f1b2 100644 public void a(PacketDataSerializer packetdataserializer) throws IOException { this.a = packetdataserializer.i(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 88c6d1d020..e667bfb70c 100644 +index 5dfca97313..89b13b00be 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -641,7 +641,7 @@ public final class CraftServer implements Server { @@ -291,5 +291,5 @@ index 88c6d1d020..e667bfb70c 100644 } else { return this.configuration.getInt("settings.connection-throttle"); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0329-Add-more-Witch-API.patch b/Spigot-Server-Patches/0328-Add-more-Witch-API.patch similarity index 98% rename from Spigot-Server-Patches/0329-Add-more-Witch-API.patch rename to Spigot-Server-Patches/0328-Add-more-Witch-API.patch index 88afc9a5e4..ce959a9bcf 100644 --- a/Spigot-Server-Patches/0329-Add-more-Witch-API.patch +++ b/Spigot-Server-Patches/0328-Add-more-Witch-API.patch @@ -1,11 +1,11 @@ -From 7536a7a13fb6599dcc8c01a7b69ad3ebf20835b0 Mon Sep 17 00:00:00 2001 +From 06eb1156b7c4a9280647ebf2429c50a7c8bbb040 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 14:10:46 -0500 Subject: [PATCH] Add more Witch API diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 8b95ec3a81..f30ce95686 100644 +index d383b0ab41..9fea750248 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -1,5 +1,11 @@ @@ -145,5 +145,5 @@ index bae107e76e..b43a2bbd5b 100644 + // Paper end } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0330-Fix-MC-93764.patch b/Spigot-Server-Patches/0329-Fix-MC-93764.patch similarity index 90% rename from Spigot-Server-Patches/0330-Fix-MC-93764.patch rename to Spigot-Server-Patches/0329-Fix-MC-93764.patch index d68ee4b7e6..75a14058e8 100644 --- a/Spigot-Server-Patches/0330-Fix-MC-93764.patch +++ b/Spigot-Server-Patches/0329-Fix-MC-93764.patch @@ -1,4 +1,4 @@ -From 7b3debfff808ee4828b94e57816d7b4fe40febf1 Mon Sep 17 00:00:00 2001 +From 1c9f18c2ec0fb987c8a9b3c19dda5ff6f2856f0e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Oct 2018 19:38:45 -0500 Subject: [PATCH] Fix MC-93764 @@ -18,5 +18,5 @@ index 715faef171..b97408cffa 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0330-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 98% rename from Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to Spigot-Server-Patches/0330-Add-option-to-prevent-players-from-moving-into-unloa.patch index 759fcd0518..539cc3eddc 100644 --- a/Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/Spigot-Server-Patches/0330-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -1,4 +1,4 @@ -From 4a429a8d6840632e23bf6935b380161f2c4cd79f Mon Sep 17 00:00:00 2001 +From 9ac75ccc8697bdf94a61b282f594734203917711 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Mon, 22 Oct 2018 17:34:10 +0200 Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0331-Reset-players-airTicks-on-respawn.patch similarity index 95% rename from Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch rename to Spigot-Server-Patches/0331-Reset-players-airTicks-on-respawn.patch index a0fb32f271..85d6df7fb7 100644 --- a/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0331-Reset-players-airTicks-on-respawn.patch @@ -1,4 +1,4 @@ -From fcfca6656d0e97778a35e40d5308be7b1b937a5b Mon Sep 17 00:00:00 2001 +From f92e9ea1566590348d84de4d010801f0d23ae5f4 Mon Sep 17 00:00:00 2001 From: GreenMeanie Date: Sat, 20 Oct 2018 22:34:02 -0400 Subject: [PATCH] Reset players airTicks on respawn diff --git a/Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0332-Strip-private-area-unicode-characters-from-signs.patch similarity index 98% rename from Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch rename to Spigot-Server-Patches/0332-Strip-private-area-unicode-characters-from-signs.patch index ed72e5ac87..b651006f19 100644 --- a/Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch +++ b/Spigot-Server-Patches/0332-Strip-private-area-unicode-characters-from-signs.patch @@ -1,4 +1,4 @@ -From 3e832e2ec71012418fe60b3ac89a973ce8f174b6 Mon Sep 17 00:00:00 2001 +From c7b96237e9503bcdd04ccbbd458c0083486e006a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 23 Oct 2018 20:53:43 -0400 Subject: [PATCH] Strip private area unicode characters from signs @@ -89,5 +89,5 @@ index 2c6ce5bae0..15b3add9ed 100644 public void a(int i, IChatBaseComponent ichatbasecomponent) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0333-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 95% rename from Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to Spigot-Server-Patches/0333-Don-t-sleep-after-profile-lookups-if-not-needed.patch index 2665d559d4..0564973b07 100644 --- a/Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0333-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From 846cc5b36643f5580a0d9b593929e306d2595459 Mon Sep 17 00:00:00 2001 +From 59e7d2b7d8e233a0deb8ce95a7fc5b7675a14728 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 20:25:05 -0400 Subject: [PATCH] Don't sleep after profile lookups if not needed @@ -32,5 +32,5 @@ index 71e48e87b4..23f1447cfc 100644 try { Thread.sleep(DELAY_BETWEEN_PAGES); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0334-Use-more-reasonable-thread-count-default-for-bootstr.patch similarity index 88% rename from Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch rename to Spigot-Server-Patches/0334-Use-more-reasonable-thread-count-default-for-bootstr.patch index e7419a886b..927cdeac90 100644 --- a/Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch +++ b/Spigot-Server-Patches/0334-Use-more-reasonable-thread-count-default-for-bootstr.patch @@ -1,11 +1,11 @@ -From 882e8ce036296fbfebada5e46b976ec76c2d9a38 Mon Sep 17 00:00:00 2001 +From 8b16500f4b96155fdb8b9708a68bc16a995a2275 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 23:14:38 -0400 Subject: [PATCH] Use more reasonable thread count default for bootstrap diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java -index 5fae5a1233..6bc576f10f 100644 +index 59164684e0..4e9d53fb59 100644 --- a/src/main/java/net/minecraft/server/SystemUtils.java +++ b/src/main/java/net/minecraft/server/SystemUtils.java @@ -66,7 +66,7 @@ public class SystemUtils { @@ -18,5 +18,5 @@ index 5fae5a1233..6bc576f10f 100644 if (i <= 0) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0335-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch similarity index 94% rename from Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch rename to Spigot-Server-Patches/0335-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch index 7846e0f80d..cff220579b 100644 --- a/Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch +++ b/Spigot-Server-Patches/0335-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch @@ -1,4 +1,4 @@ -From ff102bc9a0684d59483c1ea34edb790f239a0ecb Mon Sep 17 00:00:00 2001 +From 61ff3f4d1daee1bc7ed4640e9c706a5fb6f9bf37 Mon Sep 17 00:00:00 2001 From: MisterVector Date: Thu, 1 Nov 2018 14:50:05 -0700 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block @@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents the item used. diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 06ea3899a6..7f90a617fe 100644 +index 89a13b88bb..83b36b3e7f 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -354,10 +354,11 @@ public class PlayerInteractManager { @@ -30,5 +30,5 @@ index 06ea3899a6..7f90a617fe 100644 iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity, itemstack2); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0336-Optimize-World-Time-Updates.patch similarity index 97% rename from Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch rename to Spigot-Server-Patches/0336-Optimize-World-Time-Updates.patch index e59431a877..516748a98a 100644 --- a/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0336-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From 741ab9b96c8ad7ef2ac054c881efef3c6d9853f4 Mon Sep 17 00:00:00 2001 +From 7b76eb4fb930008f0a275c8cc55b980e3a6275e8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates diff --git a/Spigot-Server-Patches/0338-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0337-Restore-custom-InventoryHolder-support.patch similarity index 96% rename from Spigot-Server-Patches/0338-Restore-custom-InventoryHolder-support.patch rename to Spigot-Server-Patches/0337-Restore-custom-InventoryHolder-support.patch index 7301501b83..9f9ace3313 100644 --- a/Spigot-Server-Patches/0338-Restore-custom-InventoryHolder-support.patch +++ b/Spigot-Server-Patches/0337-Restore-custom-InventoryHolder-support.patch @@ -1,4 +1,4 @@ -From d184b27d1561696d6e5e307a58bb3953158007da Mon Sep 17 00:00:00 2001 +From f3abcd1e2da766010573ec5b3773e7f4b24c326b Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 5 Nov 2018 04:23:51 +0000 Subject: [PATCH] Restore custom InventoryHolder support @@ -42,5 +42,5 @@ index 9957ed0402..ae280dd40b 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0338-Use-Vanilla-Minecart-Speeds.patch similarity index 91% rename from Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch rename to Spigot-Server-Patches/0338-Use-Vanilla-Minecart-Speeds.patch index a95e4194eb..1dab4ae8e3 100644 --- a/Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch +++ b/Spigot-Server-Patches/0338-Use-Vanilla-Minecart-Speeds.patch @@ -1,4 +1,4 @@ -From 958e9e7c9563377bd386c7965b9f4afc0c9d3bf1 Mon Sep 17 00:00:00 2001 +From a7c108a14567dd94197d36a7cc62fc2d55f9b49f Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 8 Nov 2018 21:33:09 -0500 Subject: [PATCH] Use Vanilla Minecart Speeds @@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds CraftBukkit changed the values on flying speed, restore back to vanilla diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 2a2105cbce..3a3ed039a2 100644 +index e1a684b370..6df2930e2d 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -35,9 +35,9 @@ public abstract class EntityMinecartAbstract extends Entity { @@ -23,5 +23,5 @@ index 2a2105cbce..3a3ed039a2 100644 // CraftBukkit end -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0339-Fix-SpongeAbsortEvent-handling.patch similarity index 95% rename from Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch rename to Spigot-Server-Patches/0339-Fix-SpongeAbsortEvent-handling.patch index 8726c8ccab..9b12726221 100644 --- a/Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0339-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From 1b6cbb1044e9891d58ff56b0df7cfd450ca9c8aa Mon Sep 17 00:00:00 2001 +From 72fb9d040d6e499499389d9c15d83dd5faa60a05 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Nov 2018 05:15:21 +0000 Subject: [PATCH] Fix SpongeAbsortEvent handling @@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling Only process drops when the block is actually going to be removed diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 0bddca623e..8f809a4ee4 100644 +index d71102164e..5d8db912a6 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -472,7 +472,7 @@ public class Block implements IMaterial { @@ -37,5 +37,5 @@ index 4e281ce6dd..6a64af71b9 100644 } world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag()); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0340-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 94% rename from Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch rename to Spigot-Server-Patches/0340-Don-t-allow-digging-into-unloaded-chunks.patch index 63fc21a652..25c5b97a53 100644 --- a/Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0340-Don-t-allow-digging-into-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From 0f4fa98239d3480e0e9868669a5239239731849f Mon Sep 17 00:00:00 2001 +From 3bbd9f89a531ed543f40549ed54a71e34c549d94 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Nov 2018 21:01:09 +0000 Subject: [PATCH] Don't allow digging into unloaded chunks diff --git a/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0341-Optimize-redstone-algorithm.patch similarity index 99% rename from Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch rename to Spigot-Server-Patches/0341-Optimize-redstone-algorithm.patch index cd846eb076..7a10c35cf0 100644 --- a/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0341-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From 57c32d7dae8f6be43ba79b6335dfaa929acf3cd2 Mon Sep 17 00:00:00 2001 +From 5bc9aafd6254b8c030fd87507fae28834f3f2d8b Mon Sep 17 00:00:00 2001 From: theosib Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ad793ffa3..ef882b897 100644 +index ad793ffa38..ef882b897f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -439,4 +439,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index ad793ffa3..ef882b897 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java new file mode 100644 -index 000000000..cf5661f1c +index 0000000000..cf5661f1c5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,912 @@ @@ -956,7 +956,7 @@ index 000000000..cf5661f1c + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 7ce9cdb85..6b5015ce5 100644 +index 7ce9cdb853..6b5015ce5f 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1124,7 +1124,7 @@ index 7ce9cdb85..6b5015ce5 100644 c(iblockdata, world, blockposition); world.a(blockposition, false); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 83e7a65a2..e35188ef0 100644 +index 26f3b47208..1eb689c62a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -594,6 +594,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0342-force-entity-dismount-during-teleportation.patch similarity index 98% rename from Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch rename to Spigot-Server-Patches/0342-force-entity-dismount-during-teleportation.patch index ad66af0f1c..48080ef652 100644 --- a/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0342-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From e77f487b60e7b816cf7e5ea3c616ef9a9b2db490 Mon Sep 17 00:00:00 2001 +From 02832a04e3f0464715a6f6d7b44a3c902588aaa8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 15 Nov 2018 13:38:37 +0000 Subject: [PATCH] force entity dismount during teleportation diff --git a/Spigot-Server-Patches/0344-Book-Size-Limits.patch b/Spigot-Server-Patches/0343-Book-Size-Limits.patch similarity index 96% rename from Spigot-Server-Patches/0344-Book-Size-Limits.patch rename to Spigot-Server-Patches/0343-Book-Size-Limits.patch index 057094e47a..3f81a17621 100644 --- a/Spigot-Server-Patches/0344-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0343-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From e8a51fe1d7bee6997f8b5fc0b9567d8af626e688 Mon Sep 17 00:00:00 2001 +From 83050a39cb23424e44d47532249e96ba751d184f Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Nov 2018 23:08:50 -0500 Subject: [PATCH] Book Size Limits @@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits Puts some limits on the size of books. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index a79cba50e0..e5e41c6621 100644 +index 63d8602927..8feb0efdcd 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -375,4 +375,11 @@ public class PaperConfig { @@ -22,7 +22,7 @@ index a79cba50e0..e5e41c6621 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b506215b29..905db6448c 100644 +index 82c6d89a0c..60c1397da0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -14,6 +14,7 @@ import java.util.Iterator; @@ -77,5 +77,5 @@ index b506215b29..905db6448c 100644 PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer()); if (this.lastBookTick + 20 > MinecraftServer.currentTick) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0344-Make-the-default-permission-message-configurable.patch similarity index 94% rename from Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch rename to Spigot-Server-Patches/0344-Make-the-default-permission-message-configurable.patch index 328cd3c3b6..a2492700c6 100644 --- a/Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0344-Make-the-default-permission-message-configurable.patch @@ -1,11 +1,11 @@ -From 78c90f5bd28dbc9d1bd0da8a81a0975dfad903f1 Mon Sep 17 00:00:00 2001 +From baa2446be323e18bb1a110e05b1be5b84ac16c79 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:49:56 +0000 Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 8feb0efdc..81987e4ad 100644 +index 8feb0efdcd..81987e4ad9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -21,6 +21,7 @@ import java.util.regex.Pattern; @@ -29,7 +29,7 @@ index 8feb0efdc..81987e4ad 100644 private static void savePlayerData() { savePlayerData = getBoolean("settings.save-player-data", savePlayerData); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 19b831cdd..e56db1a0f 100644 +index 89b13b00be..605c81f8e3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2132,6 +2132,11 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0346-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0345-Add-more-Zombie-API.patch similarity index 98% rename from Spigot-Server-Patches/0346-Add-more-Zombie-API.patch rename to Spigot-Server-Patches/0345-Add-more-Zombie-API.patch index ea25781bc0..523b56947f 100644 --- a/Spigot-Server-Patches/0346-Add-more-Zombie-API.patch +++ b/Spigot-Server-Patches/0345-Add-more-Zombie-API.patch @@ -1,4 +1,4 @@ -From 578a5d0e5b5fa5d1f29dec8f145495703f1a8915 Mon Sep 17 00:00:00 2001 +From a8474fcf734b5d80f37fd3f684dcfa6c293fceff Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:59 -0500 Subject: [PATCH] Add more Zombie API diff --git a/Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0346-Prevent-rayTrace-from-loading-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch rename to Spigot-Server-Patches/0346-Prevent-rayTrace-from-loading-chunks.patch index 82c1eb8101..b37000b2f4 100644 --- a/Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0346-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 22e3357b11a10be3693f7d32b39edb73ff79773f Mon Sep 17 00:00:00 2001 +From 88d1db834cf7efcf8175b0f510661869b476c2f7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 26 Nov 2018 19:21:58 -0500 Subject: [PATCH] Prevent rayTrace from loading chunks @@ -28,5 +28,5 @@ index 577b227758..c5586e44d4 100644 Vec3D vec3d = raytrace1.b(); Vec3D vec3d1 = raytrace1.a(); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0347-Handle-Large-Packets-disconnecting-client.patch similarity index 98% rename from Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch rename to Spigot-Server-Patches/0347-Handle-Large-Packets-disconnecting-client.patch index 1e1ac36f78..1cdbdca23c 100644 --- a/Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch +++ b/Spigot-Server-Patches/0347-Handle-Large-Packets-disconnecting-client.patch @@ -1,4 +1,4 @@ -From 34995541233e5e9511c8cd8dc0170713871122bf Mon Sep 17 00:00:00 2001 +From b0536574dda5f3fac664e49532d07906165019bd Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Nov 2018 21:18:06 -0500 Subject: [PATCH] Handle Large Packets disconnecting client @@ -113,5 +113,5 @@ index f7c3655671..631234324d 100644 public PacketPlayOutWindowItems(int i, NonNullList nonnulllist) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0348-Lazy-init-world-storage-in-CraftOfflinePlayer.patch similarity index 97% rename from Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch rename to Spigot-Server-Patches/0348-Lazy-init-world-storage-in-CraftOfflinePlayer.patch index 1714c4e92e..8d9fdc0685 100644 --- a/Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch +++ b/Spigot-Server-Patches/0348-Lazy-init-world-storage-in-CraftOfflinePlayer.patch @@ -1,4 +1,4 @@ -From ea58c90215ff83a369427136c2f07600fa882dec Mon Sep 17 00:00:00 2001 +From 1a558d6f98095bdbd422f3820aee1fc116ec9c0c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 11 Dec 2018 22:25:07 -0500 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer @@ -61,5 +61,5 @@ index 6a448c02ec..c1ef1c950d 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0349-Add-PlayerConnectionCloseEvent.patch similarity index 98% rename from Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch rename to Spigot-Server-Patches/0349-Add-PlayerConnectionCloseEvent.patch index 571e3d2bdb..92650784ac 100644 --- a/Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-Server-Patches/0349-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 5cb35390023dae7af510e7a08b17112bbb53c76b Mon Sep 17 00:00:00 2001 +From a919032beccfef6ba160da3514456318037a1a82 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:28 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -81,5 +81,5 @@ index 1652662aef..23fcdea176 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0350-Prevent-Enderman-from-loading-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch rename to Spigot-Server-Patches/0350-Prevent-Enderman-from-loading-chunks.patch index 7a6eb805d4..04b8f8a243 100644 --- a/Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0350-Prevent-Enderman-from-loading-chunks.patch @@ -1,11 +1,11 @@ -From 92c93b801bfbb44afba3c6c158b911455a032f82 Mon Sep 17 00:00:00 2001 +From e242fc95ddad73d481d958d4de2504dd9cbe3e56 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 18 Dec 2018 02:15:08 +0000 Subject: [PATCH] Prevent Enderman from loading chunks diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 5e850db327..d4c4dc2fdc 100644 +index 9f2c339ae3..0989c07cf5 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -325,7 +325,8 @@ public class EntityEnderman extends EntityMonster { @@ -29,5 +29,5 @@ index 5e850db327..d4c4dc2fdc 100644 IBlockData iblockdata1 = world.getType(blockposition1); IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320 -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0351-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 99% rename from Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to Spigot-Server-Patches/0351-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 1c12247c06..4ad350b198 100644 --- a/Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0351-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From c5e3444a1fddac8467db394d2347923750958228 Mon Sep 17 00:00:00 2001 +From a95b337115d8da60d41e273590fc7fc4a761b017 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:35:43 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed diff --git a/Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0352-Fix-PlayerEditBookEvent.patch similarity index 94% rename from Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch rename to Spigot-Server-Patches/0352-Fix-PlayerEditBookEvent.patch index e0f17bc4a9..520c2e74c3 100644 --- a/Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch +++ b/Spigot-Server-Patches/0352-Fix-PlayerEditBookEvent.patch @@ -1,4 +1,4 @@ -From 61e721a4a363a9ef9874b905a32b8fb8dfcb5b61 Mon Sep 17 00:00:00 2001 +From 2468a714bb589108aff67c5718899a0e5cdb67be Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 16 Dec 2018 13:07:33 +1100 Subject: [PATCH] Fix PlayerEditBookEvent @@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta cancelled writing diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 905db6448c..9b895269a5 100644 +index 60c1397da0..cad75ff9b6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -862,9 +862,11 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -29,5 +29,5 @@ index 905db6448c..9b895269a5 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0353-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 93% rename from Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to Spigot-Server-Patches/0353-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index 5b9e0b6e54..cbb73e3e45 100644 --- a/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0353-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,4 +1,4 @@ -From 6f0a808e6ee8ae193b8132c09b0ed55f60d57d48 Mon Sep 17 00:00:00 2001 +From 0cebca4e04106de3449eb3fc49ef57677613032f Mon Sep 17 00:00:00 2001 From: connorhartley Date: Mon, 7 Jan 2019 14:43:48 -0600 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0354-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch similarity index 97% rename from Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch rename to Spigot-Server-Patches/0354-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch index a64be3c0aa..7563279df9 100644 --- a/Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch +++ b/Spigot-Server-Patches/0354-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch @@ -1,4 +1,4 @@ -From 0eaf215550416941914cf236977f29d2b6a52c2a Mon Sep 17 00:00:00 2001 +From d2a0f895a6d9566984ddbaf400eabcd07048ec94 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 31 Jan 2019 16:33:36 -0500 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons @@ -46,5 +46,5 @@ index b41750f22e..d548b27b8a 100644 // CraftBukkit end world.playBlockAction(blockposition, this, b0, enumdirection.a()); -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0355-Block-Entity-remove-from-being-called-on-Players.patch similarity index 95% rename from Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch rename to Spigot-Server-Patches/0355-Block-Entity-remove-from-being-called-on-Players.patch index 589b239e8c..1f847c6046 100644 --- a/Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0355-Block-Entity-remove-from-being-called-on-Players.patch @@ -1,4 +1,4 @@ -From 809317fe833f2b9ee60205da6154299c8051ab5b Mon Sep 17 00:00:00 2001 +From 85813839df3d8c576333cbeeb85b74b427f6fd91 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Feb 2019 23:33:24 -0500 Subject: [PATCH] Block Entity#remove from being called on Players diff --git a/Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0356-Allow-Saving-of-Oversized-Chunks.patch similarity index 99% rename from Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch rename to Spigot-Server-Patches/0356-Allow-Saving-of-Oversized-Chunks.patch index 2ef44657c9..55a7dd13cd 100644 --- a/Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch +++ b/Spigot-Server-Patches/0356-Allow-Saving-of-Oversized-Chunks.patch @@ -1,4 +1,4 @@ -From 868bf96eda2b222fbf07a80be163ca2bc3e60a4f Mon Sep 17 00:00:00 2001 +From 2debac5ab6e0ea1511b4670554cffbf3c0036213 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Feb 2019 01:08:19 -0500 Subject: [PATCH] Allow Saving of Oversized Chunks @@ -506,5 +506,5 @@ index 8718811655..c53518a477 100644 // Paper start return; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0358-BlockDestroyEvent.patch b/Spigot-Server-Patches/0357-BlockDestroyEvent.patch similarity index 95% rename from Spigot-Server-Patches/0358-BlockDestroyEvent.patch rename to Spigot-Server-Patches/0357-BlockDestroyEvent.patch index 0c4b3fea62..f2ed02bfaa 100644 --- a/Spigot-Server-Patches/0358-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0357-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 871e60c0c44878e7ad1137fdcb728bc784343ee6 Mon Sep 17 00:00:00 2001 +From 746aca7892de82c2bf16d32dfd379352f2f105af Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:20:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -11,7 +11,7 @@ floating in the air. This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e35188ef0..0f04860bc 100644 +index 1eb689c62a..f1552f23ea 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -524,8 +524,20 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0358-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 97% rename from Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to Spigot-Server-Patches/0358-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch index 8fb8b36e4b..4a2940a6a7 100644 --- a/Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch +++ b/Spigot-Server-Patches/0358-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch @@ -1,4 +1,4 @@ -From 4f251c5ffeb58544a6c4f605d3e30bdc118099ae Mon Sep 17 00:00:00 2001 +From db45bf861a2a79726dd1ee9af2ba2e1d0b2f9257 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Jan 2019 00:08:15 -0500 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes @@ -64,5 +64,5 @@ index 070fc1e3ec..691e697d68 100644 public ItemStack a(InventoryCrafting inventorycrafting) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0359-Fix-sign-edit-memory-leak.patch similarity index 97% rename from Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch rename to Spigot-Server-Patches/0359-Fix-sign-edit-memory-leak.patch index 77b57afd6e..9d73367ee1 100644 --- a/Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch +++ b/Spigot-Server-Patches/0359-Fix-sign-edit-memory-leak.patch @@ -1,4 +1,4 @@ -From 8100dac0461c94d36fed58875296ea3437b63f76 Mon Sep 17 00:00:00 2001 +From 27f4aa93fe5e8a777667f18e7595c01d9caa16f6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Feb 2019 00:15:28 -0500 Subject: [PATCH] Fix sign edit memory leak diff --git a/Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0360-Limit-Client-Sign-length-more.patch similarity index 97% rename from Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch rename to Spigot-Server-Patches/0360-Limit-Client-Sign-length-more.patch index efdf60a72a..81459bdbb7 100644 --- a/Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch +++ b/Spigot-Server-Patches/0360-Limit-Client-Sign-length-more.patch @@ -1,4 +1,4 @@ -From ed4d3806bd4c2dbb3bf90b730060219dedc26054 Mon Sep 17 00:00:00 2001 +From fecdeb7b26f0540f703f1ceda84482a19b6a6fe3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Feb 2019 22:18:40 -0500 Subject: [PATCH] Limit Client Sign length more diff --git a/Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0361-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 95% rename from Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to Spigot-Server-Patches/0361-Don-t-check-ConvertSigns-boolean-every-sign-save.patch index 0ccafaf063..1a1410160e 100644 --- a/Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch +++ b/Spigot-Server-Patches/0361-Don-t-check-ConvertSigns-boolean-every-sign-save.patch @@ -1,4 +1,4 @@ -From 7a7ca9f0480c654010590213d2b54642aa28324f Mon Sep 17 00:00:00 2001 +From 7ececc65a6af111e51f50fde466b10e80a9d169d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 11:11:29 -0500 Subject: [PATCH] Don't check ConvertSigns boolean every sign save @@ -28,5 +28,5 @@ index caeaca4c7a..dd7889a4f9 100644 } // CraftBukkit end -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0362-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch similarity index 98% rename from Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch rename to Spigot-Server-Patches/0362-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch index 5f5666f5c0..507d29b555 100644 --- a/Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch +++ b/Spigot-Server-Patches/0362-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch @@ -1,4 +1,4 @@ -From 288fa8aa868582f407eb5dd675f4a550e2e6e72a Mon Sep 17 00:00:00 2001 +From 6b928f73df2f26d973c3c8cd0660964bf454f68d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 14:55:01 -0500 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of @@ -86,5 +86,5 @@ index 58eccd9c63..ef71a1feb3 100644 if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0363-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch similarity index 96% rename from Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch rename to Spigot-Server-Patches/0363-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch index 6ae25ffdf8..bc5710f1e1 100644 --- a/Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch +++ b/Spigot-Server-Patches/0363-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch @@ -1,4 +1,4 @@ -From 83f221f3250aaf296f45e50e193667f8bbda7b6b Mon Sep 17 00:00:00 2001 +From f9c2e9c882037f3c569c12afd5338c6ddb57e036 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 16:12:35 -0500 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency @@ -23,7 +23,7 @@ index 8570e38f42..c97be42dd7 100644 this.e = flag; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 58ee7b30c0..557afdc83a 100644 +index 52aa83f51f..0da3f95f89 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -62,7 +62,7 @@ public abstract class PlayerList { @@ -62,5 +62,5 @@ index 58ee7b30c0..557afdc83a 100644 public List b(String s) { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0364-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 88% rename from Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to Spigot-Server-Patches/0364-Set-Zombie-last-tick-at-start-of-drowning-process.patch index 97a0f3472a..86f17480de 100644 --- a/Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch +++ b/Spigot-Server-Patches/0364-Set-Zombie-last-tick-at-start-of-drowning-process.patch @@ -1,4 +1,4 @@ -From d6d91a4483518bad152a8d18ab5a36f14e3f83d0 Mon Sep 17 00:00:00 2001 +From 30ff428a5ca79151685f885d4fcda75a330d5157 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Mar 2019 02:23:28 -0500 Subject: [PATCH] Set Zombie last tick at start of drowning process @@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process Fixes GH-1887 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index b20fe8e521..40a796384c 100644 +index 6e265467b0..3396983adf 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -167,6 +167,7 @@ public class EntityZombie extends EntityMonster { @@ -18,5 +18,5 @@ index b20fe8e521..40a796384c 100644 } else { this.bF = -1; -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0365-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 86% rename from Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to Spigot-Server-Patches/0365-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch index 3be8367282..35581b98bc 100644 --- a/Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch +++ b/Spigot-Server-Patches/0365-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -1,11 +1,11 @@ -From 5cad01014076348df857de84a23a05d5f76cde66 Mon Sep 17 00:00:00 2001 +From 7022dbba2844ee25fb4476b90bc50d9f338c76ac Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:08:09 +0200 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 557afdc83a..8733232759 100644 +index 0da3f95f89..65df0e7c8c 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1034,6 +1034,7 @@ public abstract class PlayerList { @@ -17,5 +17,5 @@ index 557afdc83a..8733232759 100644 } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0366-Add-LivingEntity-getTargetEntity.patch similarity index 99% rename from Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch rename to Spigot-Server-Patches/0366-Add-LivingEntity-getTargetEntity.patch index 9295a937b3..ee4f82d656 100644 --- a/Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0366-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From 91fef12ff0f535a111e89817d5ed4bba7433d569 Mon Sep 17 00:00:00 2001 +From 5f5270382ffdb9fa152b7633043ef6880d324eed Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:33:08 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0367-Use-proper-max-length-when-serialising-BungeeCord-te.patch similarity index 96% rename from Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch rename to Spigot-Server-Patches/0367-Use-proper-max-length-when-serialising-BungeeCord-te.patch index 09162ee427..d0992e2194 100644 --- a/Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch +++ b/Spigot-Server-Patches/0367-Use-proper-max-length-when-serialising-BungeeCord-te.patch @@ -1,4 +1,4 @@ -From 95c6fbab1fe80c17a686ada6af2260dd9db5d0f8 Mon Sep 17 00:00:00 2001 +From 280f7264421479fc05d210ce91b71fe94dd1b020 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 20 Mar 2019 21:19:29 -0700 Subject: [PATCH] Use proper max length when serialising BungeeCord text @@ -31,5 +31,5 @@ index 0ab611564e..f7b2095bb7 100644 // Paper end } else { -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0368-Entity-getEntitySpawnReason.patch similarity index 98% rename from Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch rename to Spigot-Server-Patches/0368-Entity-getEntitySpawnReason.patch index 5916d647c5..36043b7ae0 100644 --- a/Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/0368-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From 0c14f59b254501f4ae16ca3596c68363c42fd654 Mon Sep 17 00:00:00 2001 +From 5b0aad32383403388285e2fef30988764f8a53f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:24:52 -0400 Subject: [PATCH] Entity#getEntitySpawnReason diff --git a/Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0369-Update-entity-Metadata-for-all-tracked-players.patch similarity index 96% rename from Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch rename to Spigot-Server-Patches/0369-Update-entity-Metadata-for-all-tracked-players.patch index 5e09222e89..110e2a6242 100644 --- a/Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch +++ b/Spigot-Server-Patches/0369-Update-entity-Metadata-for-all-tracked-players.patch @@ -1,4 +1,4 @@ -From 71c33d54d04aa982d402132b281bf4ff734d3575 Mon Sep 17 00:00:00 2001 +From ef4f9b106e144f63ba67002f7387da3802fdca5b Mon Sep 17 00:00:00 2001 From: AgentTroll Date: Fri, 22 Mar 2019 22:24:03 -0700 Subject: [PATCH] Update entity Metadata for all tracked players diff --git a/Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0370-Fire-event-on-GS4-query.patch similarity index 99% rename from Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch rename to Spigot-Server-Patches/0370-Fire-event-on-GS4-query.patch index a079c29b3b..026bf94afc 100644 --- a/Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch +++ b/Spigot-Server-Patches/0370-Fire-event-on-GS4-query.patch @@ -1,4 +1,4 @@ -From 07e4c9acc95339fa5eaafe7a16eeda612545cdff Mon Sep 17 00:00:00 2001 +From f0221a873537228f9177ed01947c78bb0baecf1b Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 17 Mar 2019 21:46:56 +0200 Subject: [PATCH] Fire event on GS4 query @@ -216,5 +216,5 @@ index 848b5c3f0e..73efea7e13 100644 this.b.writeShort(Short.reverseBytes(short0)); } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0371-Implement-PlayerPostRespawnEvent.patch similarity index 94% rename from Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch rename to Spigot-Server-Patches/0371-Implement-PlayerPostRespawnEvent.patch index ecf0d45809..cd16695dfb 100644 --- a/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch +++ b/Spigot-Server-Patches/0371-Implement-PlayerPostRespawnEvent.patch @@ -1,11 +1,11 @@ -From 0670929c56d1aed98540c4f9e32a515464551c75 Mon Sep 17 00:00:00 2001 +From dcfd2cd3c35ece30d96d615071b8741561ecdf6a Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:31:00 -0700 Subject: [PATCH] Implement PlayerPostRespawnEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 1de251d217..0a733df7fc 100644 +index abddc8895e..a183bb450d 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -637,9 +637,14 @@ public abstract class PlayerList { @@ -47,5 +47,5 @@ index 1de251d217..0a733df7fc 100644 return entityplayer1; } -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0372-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 93% rename from Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to Spigot-Server-Patches/0372-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch index e0369bd8a5..08cfec9570 100644 --- a/Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch +++ b/Spigot-Server-Patches/0372-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch @@ -1,4 +1,4 @@ -From 406b8569072168912743e52beef3828bdf226d4f Mon Sep 17 00:00:00 2001 +From 472b1ae524fad0d6ddf1c211e481dcf6d7ce9b68 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:09:20 -0400 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items @@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items vanilla checks for == 0 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index ed93f9e797..dce479894f 100644 +index 6e026d34f0..2091698953 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -59,6 +59,7 @@ public class EntityItem extends Entity { @@ -26,5 +26,5 @@ index ed93f9e797..dce479894f 100644 this.lastTick = MinecraftServer.currentTick; // CraftBukkit end -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0373-Implement-getters-and-setters-for-EntityItem-owner-a.patch similarity index 95% rename from Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch rename to Spigot-Server-Patches/0373-Implement-getters-and-setters-for-EntityItem-owner-a.patch index 734c0c985f..25ed6970eb 100644 --- a/Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0373-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From ef8b18f87f25e253331cd7eb61425a2e8c3f6fdd Mon Sep 17 00:00:00 2001 +From eada047c2186598684e7566306bc446400820b6a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:23 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -51,5 +51,5 @@ index 3f552b5905..cb756b1ba0 100644 @Override -- -2.21.0 +2.22.0 diff --git a/Spigot-Server-Patches/0375-Server-Tick-Events.patch b/Spigot-Server-Patches/0374-Server-Tick-Events.patch similarity index 96% rename from Spigot-Server-Patches/0375-Server-Tick-Events.patch rename to Spigot-Server-Patches/0374-Server-Tick-Events.patch index 89118b2da8..6f8549beb0 100644 --- a/Spigot-Server-Patches/0375-Server-Tick-Events.patch +++ b/Spigot-Server-Patches/0374-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 8ac43d682c6b4a7609f15fbf734e754fbcb37f99 Mon Sep 17 00:00:00 2001 +From d8e9824a4b580f86e49f3f5dbadc1a3b2c2a72e1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 22:48:45 -0400 Subject: [PATCH] Server Tick Events diff --git a/Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0375-PlayerDeathEvent-getItemsToKeep.patch similarity index 97% rename from Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch rename to Spigot-Server-Patches/0375-PlayerDeathEvent-getItemsToKeep.patch index ea9fbcb11d..63f197d625 100644 --- a/Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-Server-Patches/0375-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From 001c2b8edfdc68f8e66b38aed2354fe3cace9b2c Mon Sep 17 00:00:00 2001 +From bfaa56a1a33a379fdda3d38619130764ed4ad235 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 23:01:33 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep diff --git a/Spigot-Server-Patches/0377-Allow-login-events-to-fire-only-after-the-server-plu.patch b/Spigot-Server-Patches/0376-Allow-login-events-to-fire-only-after-the-server-plu.patch similarity index 96% rename from Spigot-Server-Patches/0377-Allow-login-events-to-fire-only-after-the-server-plu.patch rename to Spigot-Server-Patches/0376-Allow-login-events-to-fire-only-after-the-server-plu.patch index df391f2f03..d9759e0d0d 100644 --- a/Spigot-Server-Patches/0377-Allow-login-events-to-fire-only-after-the-server-plu.patch +++ b/Spigot-Server-Patches/0376-Allow-login-events-to-fire-only-after-the-server-plu.patch @@ -1,4 +1,4 @@ -From eeb55c6cb17c46fb9568d4567c364de1ebb86b5c Mon Sep 17 00:00:00 2001 +From 0205cbc9519bee3f5784461c33abda37b125ea75 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 31 Mar 2019 22:02:24 -0700 Subject: [PATCH] Allow login events to fire only after the server plugins are @@ -56,7 +56,7 @@ index 9e4bc24058..028c23dbe6 100644 java.net.InetAddress address = ((java.net.InetSocketAddress) networkManager.getSocketAddress()).getAddress(); java.util.UUID uniqueId = i.getId(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c20d9aab38..56951b44f9 100644 +index 1e2f2f8b99..55e8db8a09 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -461,6 +461,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 1 Apr 2019 18:57:32 -0700 Subject: [PATCH] Make region files more reliable to write to diff --git a/Spigot-Server-Patches/0379-Optimize-GameRules-to-use-LinkedHashMap.patch b/Spigot-Server-Patches/0378-Optimize-GameRules-to-use-LinkedHashMap.patch similarity index 95% rename from Spigot-Server-Patches/0379-Optimize-GameRules-to-use-LinkedHashMap.patch rename to Spigot-Server-Patches/0378-Optimize-GameRules-to-use-LinkedHashMap.patch index 6c839d1562..7acff2dd91 100644 --- a/Spigot-Server-Patches/0379-Optimize-GameRules-to-use-LinkedHashMap.patch +++ b/Spigot-Server-Patches/0378-Optimize-GameRules-to-use-LinkedHashMap.patch @@ -1,4 +1,4 @@ -From b52419c24faf5241570e38f711b50e594c200c6c Mon Sep 17 00:00:00 2001 +From efc767ace0707d871f995b3968bb25840757c5d8 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Thu, 4 Apr 2019 17:55:05 -0700 Subject: [PATCH] Optimize GameRules to use LinkedHashMap diff --git a/Spigot-Server-Patches/0380-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0379-Optimize-Captured-TileEntity-Lookup.patch similarity index 95% rename from Spigot-Server-Patches/0380-Optimize-Captured-TileEntity-Lookup.patch rename to Spigot-Server-Patches/0379-Optimize-Captured-TileEntity-Lookup.patch index bd60e4b71f..32836637c2 100644 --- a/Spigot-Server-Patches/0380-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0379-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From 8f873b091df7d9b60db1f6835806c44b8eab0074 Mon Sep 17 00:00:00 2001 +From b3340b4aa1abc117157dc79b4c9658bddaa321ee Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Apr 2019 10:16:48 -0400 Subject: [PATCH] Optimize Captured TileEntity Lookup diff --git a/Spigot-Server-Patches/0381-Add-Heightmap-API.patch b/Spigot-Server-Patches/0380-Add-Heightmap-API.patch similarity index 97% rename from Spigot-Server-Patches/0381-Add-Heightmap-API.patch rename to Spigot-Server-Patches/0380-Add-Heightmap-API.patch index f149bd77b3..544eb89ac9 100644 --- a/Spigot-Server-Patches/0381-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0380-Add-Heightmap-API.patch @@ -1,4 +1,4 @@ -From 0617854be931d448fd869c0fd4649eca3cb299d2 Mon Sep 17 00:00:00 2001 +From a7b1577af9947ef2a35607e66726a6a34b87dcc5 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 1 Jan 2019 02:22:01 -0800 Subject: [PATCH] Add Heightmap API diff --git a/Spigot-Server-Patches/0382-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0381-Handle-bad-chunks-more-gracefully.patch similarity index 97% rename from Spigot-Server-Patches/0382-Handle-bad-chunks-more-gracefully.patch rename to Spigot-Server-Patches/0381-Handle-bad-chunks-more-gracefully.patch index 6335033c8d..eebbbed049 100644 --- a/Spigot-Server-Patches/0382-Handle-bad-chunks-more-gracefully.patch +++ b/Spigot-Server-Patches/0381-Handle-bad-chunks-more-gracefully.patch @@ -1,4 +1,4 @@ -From 7fce2818f03b124af4ca3607d2221fa6942feeaa Mon Sep 17 00:00:00 2001 +From d4fe06e3cd18d2641e6c122be28f45a0e365fc5a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 15 Apr 2019 02:24:52 +0100 Subject: [PATCH] Handle bad chunks more gracefully diff --git a/Spigot-Server-Patches/0383-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0382-Mob-Spawner-API-Enhancements.patch similarity index 98% rename from Spigot-Server-Patches/0383-Mob-Spawner-API-Enhancements.patch rename to Spigot-Server-Patches/0382-Mob-Spawner-API-Enhancements.patch index 6493d7211a..f0ca17b638 100644 --- a/Spigot-Server-Patches/0383-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-Server-Patches/0382-Mob-Spawner-API-Enhancements.patch @@ -1,4 +1,4 @@ -From b4eb4e4936e8c5474b3428cd99f20c40c3cacd78 Mon Sep 17 00:00:00 2001 +From 60d615efa76e8bfa234a5e56b83c005bd50fc697 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Apr 2019 12:41:13 -0500 Subject: [PATCH] Mob Spawner API Enhancements diff --git a/Spigot-Server-Patches/0384-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0383-Per-Player-View-Distance-API-placeholders.patch similarity index 98% rename from Spigot-Server-Patches/0384-Per-Player-View-Distance-API-placeholders.patch rename to Spigot-Server-Patches/0383-Per-Player-View-Distance-API-placeholders.patch index 931d1550e3..29c335b444 100644 --- a/Spigot-Server-Patches/0384-Per-Player-View-Distance-API-placeholders.patch +++ b/Spigot-Server-Patches/0383-Per-Player-View-Distance-API-placeholders.patch @@ -1,4 +1,4 @@ -From 02027238ab11adbe72988a97d6f130f0c0e16d83 Mon Sep 17 00:00:00 2001 +From c73a49dd5113d4eee1f8db9938ddbd3d3a49969b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 6 May 2019 01:29:25 -0400 Subject: [PATCH] Per-Player View Distance API placeholders diff --git a/Spigot-Server-Patches/0385-Async-Chunk-placeholder.patch b/Spigot-Server-Patches/0384-Async-Chunk-placeholder.patch similarity index 97% rename from Spigot-Server-Patches/0385-Async-Chunk-placeholder.patch rename to Spigot-Server-Patches/0384-Async-Chunk-placeholder.patch index 58c5d2c1d4..009e35767f 100644 --- a/Spigot-Server-Patches/0385-Async-Chunk-placeholder.patch +++ b/Spigot-Server-Patches/0384-Async-Chunk-placeholder.patch @@ -1,4 +1,4 @@ -From ddd7bddce04baf2f9e368a655b9984cb5b4ab65d Mon Sep 17 00:00:00 2001 +From bf2cf6fce0635f9d5e7c70254df2d8e87d20bd2b Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 May 2019 12:29:24 -0700 Subject: [PATCH] Async Chunk placeholder diff --git a/Spigot-Server-Patches/0386-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0385-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 92% rename from Spigot-Server-Patches/0386-Fix-CB-call-to-changed-postToMainThread-method.patch rename to Spigot-Server-Patches/0385-Fix-CB-call-to-changed-postToMainThread-method.patch index 0b33d7ccf8..46fa1dbf07 100644 --- a/Spigot-Server-Patches/0386-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/Spigot-Server-Patches/0385-Fix-CB-call-to-changed-postToMainThread-method.patch @@ -1,4 +1,4 @@ -From 4d9037edbe6801f6f390bfd221e503404bcfd1b0 Mon Sep 17 00:00:00 2001 +From 1407072a69d2e05cd59d6ca1e6a98821fa7ffefb Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 10 May 2019 18:38:19 +0100 Subject: [PATCH] Fix CB call to changed postToMainThread method diff --git a/Spigot-Server-Patches/0387-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0386-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 96% rename from Spigot-Server-Patches/0387-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to Spigot-Server-Patches/0386-Fix-sounds-when-item-frames-are-modified-MC-123450.patch index fabb7da9be..e612fa408e 100644 --- a/Spigot-Server-Patches/0387-Fix-sounds-when-item-frames-are-modified-MC-123450.patch +++ b/Spigot-Server-Patches/0386-Fix-sounds-when-item-frames-are-modified-MC-123450.patch @@ -1,4 +1,4 @@ -From c01c3272a155b1f2230b7ebdbcb28b638b1b66a2 Mon Sep 17 00:00:00 2001 +From 430f4cb416f5bdad20843b5ad82884f328c18b4a Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 27 Apr 2019 20:00:43 +0100 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) diff --git a/Spigot-Server-Patches/0388-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0387-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch similarity index 97% rename from Spigot-Server-Patches/0388-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch rename to Spigot-Server-Patches/0387-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index 89224a719d..d343ec041e 100644 --- a/Spigot-Server-Patches/0388-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/Spigot-Server-Patches/0387-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -1,4 +1,4 @@ -From 801cb17b7da0c23110aa556ea58fe7b57b8fa667 Mon Sep 17 00:00:00 2001 +From 34999dd23b213717db26a3394c9786c06b9569c8 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 13 May 2019 21:10:59 -0700 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer diff --git a/Spigot-Server-Patches/0389-Elide-lock-in-DataWatcher.patch b/Spigot-Server-Patches/0388-Elide-lock-in-DataWatcher.patch similarity index 98% rename from Spigot-Server-Patches/0389-Elide-lock-in-DataWatcher.patch rename to Spigot-Server-Patches/0388-Elide-lock-in-DataWatcher.patch index 0ab7700ae5..98545c0053 100644 --- a/Spigot-Server-Patches/0389-Elide-lock-in-DataWatcher.patch +++ b/Spigot-Server-Patches/0388-Elide-lock-in-DataWatcher.patch @@ -1,4 +1,4 @@ -From 957af026b82e6d162fab7366a73ff1903765ad30 Mon Sep 17 00:00:00 2001 +From 9a63accf40739afe2ad4551bf6e2ac7e4eb9c4f2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 11 May 2019 08:19:27 -0700 Subject: [PATCH] Elide lock in DataWatcher diff --git a/Spigot-Server-Patches/0390-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0389-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch similarity index 96% rename from Spigot-Server-Patches/0390-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch rename to Spigot-Server-Patches/0389-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch index 011553a1f9..8ca4e2b482 100644 --- a/Spigot-Server-Patches/0390-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0389-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From 8204aa5fffdbbb1ca68007a8ef1d810b42f5fbb1 Mon Sep 17 00:00:00 2001 +From ff7a203e4718519b882f42c9249ba0533b0095aa Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Sep 2018 21:49:53 -0400 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks diff --git a/Spigot-Server-Patches/0391-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0390-Duplicate-UUID-Resolve-Option.patch similarity index 99% rename from Spigot-Server-Patches/0391-Duplicate-UUID-Resolve-Option.patch rename to Spigot-Server-Patches/0390-Duplicate-UUID-Resolve-Option.patch index c37e3f3b5e..7088d1214c 100644 --- a/Spigot-Server-Patches/0391-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0390-Duplicate-UUID-Resolve-Option.patch @@ -1,4 +1,4 @@ -From 00c905e8f9463fb48355510fd7912327126e0b62 Mon Sep 17 00:00:00 2001 +From 50110b70eb4b23d4d3519e78343b95b13b38f7ac Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 14:27:34 -0400 Subject: [PATCH] Duplicate UUID Resolve Option diff --git a/Spigot-Server-Patches/0392-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0391-improve-CraftWorld-isChunkLoaded.patch similarity index 96% rename from Spigot-Server-Patches/0392-improve-CraftWorld-isChunkLoaded.patch rename to Spigot-Server-Patches/0391-improve-CraftWorld-isChunkLoaded.patch index d4c1a45308..408c182938 100644 --- a/Spigot-Server-Patches/0392-improve-CraftWorld-isChunkLoaded.patch +++ b/Spigot-Server-Patches/0391-improve-CraftWorld-isChunkLoaded.patch @@ -1,4 +1,4 @@ -From bd24bc43e9c308690d278c4a73ac6b85526e7e94 Mon Sep 17 00:00:00 2001 +From ed20d3017f7a979ae81b57a087119147df5b27a5 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 21 May 2019 02:34:04 +0100 Subject: [PATCH] improve CraftWorld#isChunkLoaded diff --git a/Spigot-Server-Patches/0393-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0392-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 99% rename from Spigot-Server-Patches/0393-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to Spigot-Server-Patches/0392-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 80aa02c0b0..ac9df364ad 100644 --- a/Spigot-Server-Patches/0393-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0392-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From b72f3b3fdf5470f62e2f7dc93edccfb421a0b3cf Mon Sep 17 00:00:00 2001 +From 60f3741a0bdd4680cbcacab20e299a26e6f91c42 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 diff --git a/Spigot-Server-Patches/0394-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0393-Fix-some-generation-concurrency-issues.patch similarity index 99% rename from Spigot-Server-Patches/0394-Fix-some-generation-concurrency-issues.patch rename to Spigot-Server-Patches/0393-Fix-some-generation-concurrency-issues.patch index 642e35f00d..6f0a1659c3 100644 --- a/Spigot-Server-Patches/0394-Fix-some-generation-concurrency-issues.patch +++ b/Spigot-Server-Patches/0393-Fix-some-generation-concurrency-issues.patch @@ -1,4 +1,4 @@ -From 6f4479dbad5aa869ef6f46e2e17b722a1b780718 Mon Sep 17 00:00:00 2001 +From 17d05aa6301af9a703e4c69765952d19a0b97e95 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 24 May 2019 07:53:16 +0100 Subject: [PATCH] Fix some generation concurrency issues diff --git a/Spigot-Server-Patches/0395-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0394-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch similarity index 93% rename from Spigot-Server-Patches/0395-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch rename to Spigot-Server-Patches/0394-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch index ac8f34c532..467f11841b 100644 --- a/Spigot-Server-Patches/0395-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch +++ b/Spigot-Server-Patches/0394-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch @@ -1,4 +1,4 @@ -From 60f4e8b4c5cd2276462973d309330d6a903114a4 Mon Sep 17 00:00:00 2001 +From 54f4930b7cd6600236f396fef373e1a237e74d01 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 27 May 2019 17:35:39 -0500 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative diff --git a/Spigot-Server-Patches/0396-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0395-ChunkMapDistance-CME.patch similarity index 95% rename from Spigot-Server-Patches/0396-ChunkMapDistance-CME.patch rename to Spigot-Server-Patches/0395-ChunkMapDistance-CME.patch index 1b58910be0..a7a81b416a 100644 --- a/Spigot-Server-Patches/0396-ChunkMapDistance-CME.patch +++ b/Spigot-Server-Patches/0395-ChunkMapDistance-CME.patch @@ -1,4 +1,4 @@ -From 80ad0034e5f2a575baacc12b988f8beb51a5d4ba Mon Sep 17 00:00:00 2001 +From 75d7f6aa1662e91a24593022180ba867cbbabca0 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 29 May 2019 04:01:22 +0100 Subject: [PATCH] ChunkMapDistance CME diff --git a/Spigot-Server-Patches/0397-Actually-Limit-Natural-Spawns-To-Limit.patch b/Spigot-Server-Patches/0396-Actually-Limit-Natural-Spawns-To-Limit.patch similarity index 98% rename from Spigot-Server-Patches/0397-Actually-Limit-Natural-Spawns-To-Limit.patch rename to Spigot-Server-Patches/0396-Actually-Limit-Natural-Spawns-To-Limit.patch index fed1ffbab8..bde7911b33 100644 --- a/Spigot-Server-Patches/0397-Actually-Limit-Natural-Spawns-To-Limit.patch +++ b/Spigot-Server-Patches/0396-Actually-Limit-Natural-Spawns-To-Limit.patch @@ -1,4 +1,4 @@ -From e4d85a99c9962df1e8894e4dbc5f3a9c69dc2646 Mon Sep 17 00:00:00 2001 +From 2e16ef9a17c49d1325ec3bbb880a912afc03d762 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Sun, 2 Jun 2019 01:22:02 -0400 Subject: [PATCH] Actually-Limit-Natural-Spawns-To-Limit diff --git a/Spigot-Server-Patches/0398-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0397-Implement-CraftBlockSoundGroup.patch similarity index 98% rename from Spigot-Server-Patches/0398-Implement-CraftBlockSoundGroup.patch rename to Spigot-Server-Patches/0397-Implement-CraftBlockSoundGroup.patch index 93279bba01..40cb9292f6 100644 --- a/Spigot-Server-Patches/0398-Implement-CraftBlockSoundGroup.patch +++ b/Spigot-Server-Patches/0397-Implement-CraftBlockSoundGroup.patch @@ -1,4 +1,4 @@ -From 8fd5fc42f1bbc2be9e6bc5c8780fec111a9558ef Mon Sep 17 00:00:00 2001 +From 220ea5e21e7221f25a82fbd23124246fca285558 Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:48:51 -0700 Subject: [PATCH] Implement CraftBlockSoundGroup diff --git a/Spigot-Server-Patches/0399-Chunk-debug-command.patch b/Spigot-Server-Patches/0398-Chunk-debug-command.patch similarity index 99% rename from Spigot-Server-Patches/0399-Chunk-debug-command.patch rename to Spigot-Server-Patches/0398-Chunk-debug-command.patch index 129ed1d241..ab48f4deac 100644 --- a/Spigot-Server-Patches/0399-Chunk-debug-command.patch +++ b/Spigot-Server-Patches/0398-Chunk-debug-command.patch @@ -1,4 +1,4 @@ -From 9705f0ddcff34e0463203c2348481f714c9cd650 Mon Sep 17 00:00:00 2001 +From fff0d1d37878fe9cf31980df2db36cc80037d815 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Jun 2019 13:00:55 -0700 Subject: [PATCH] Chunk debug command diff --git a/Spigot-Server-Patches/0400-incremental-chunk-saving.patch b/Spigot-Server-Patches/0399-incremental-chunk-saving.patch similarity index 99% rename from Spigot-Server-Patches/0400-incremental-chunk-saving.patch rename to Spigot-Server-Patches/0399-incremental-chunk-saving.patch index 272a4ce755..677232c933 100644 --- a/Spigot-Server-Patches/0400-incremental-chunk-saving.patch +++ b/Spigot-Server-Patches/0399-incremental-chunk-saving.patch @@ -1,4 +1,4 @@ -From 5693970605167ed65dea700efc6ad5705f910742 Mon Sep 17 00:00:00 2001 +From 2cc99dff418c4fe9f531d9ebdfba29b78b30dcb8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 9 Jun 2019 03:53:22 +0100 Subject: [PATCH] incremental chunk saving diff --git a/Spigot-Server-Patches/0401-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0400-Catch-exceptions-from-dispenser-entity-spawns.patch similarity index 95% rename from Spigot-Server-Patches/0401-Catch-exceptions-from-dispenser-entity-spawns.patch rename to Spigot-Server-Patches/0400-Catch-exceptions-from-dispenser-entity-spawns.patch index 8844915fd1..ab7395949d 100644 --- a/Spigot-Server-Patches/0401-Catch-exceptions-from-dispenser-entity-spawns.patch +++ b/Spigot-Server-Patches/0400-Catch-exceptions-from-dispenser-entity-spawns.patch @@ -1,4 +1,4 @@ -From d5d42eb2d3052b8b9a7f68d7d5da09ee600c3606 Mon Sep 17 00:00:00 2001 +From 99d2f6b48bc76d65b79f71a609e62f8f35ca65a4 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 10 Jun 2019 09:36:40 +0100 Subject: [PATCH] Catch exceptions from dispenser entity spawns diff --git a/Spigot-Server-Patches/0402-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0401-Fix-World-isChunkGenerated-calls.patch similarity index 99% rename from Spigot-Server-Patches/0402-Fix-World-isChunkGenerated-calls.patch rename to Spigot-Server-Patches/0401-Fix-World-isChunkGenerated-calls.patch index d3f27ddcd3..8e38277cb9 100644 --- a/Spigot-Server-Patches/0402-Fix-World-isChunkGenerated-calls.patch +++ b/Spigot-Server-Patches/0401-Fix-World-isChunkGenerated-calls.patch @@ -1,4 +1,4 @@ -From 36177cdd8e155472e050b34c132841485abe31a8 Mon Sep 17 00:00:00 2001 +From 8ec38f6eb4de25ddb05562621e41e3abb073b949 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 08:54:33 -0700 Subject: [PATCH] Fix World#isChunkGenerated calls diff --git a/Spigot-Server-Patches/0403-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0402-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 95% rename from Spigot-Server-Patches/0403-Show-blockstate-location-if-we-failed-to-read-it.patch rename to Spigot-Server-Patches/0402-Show-blockstate-location-if-we-failed-to-read-it.patch index 570449eb6e..8ed4666504 100644 --- a/Spigot-Server-Patches/0403-Show-blockstate-location-if-we-failed-to-read-it.patch +++ b/Spigot-Server-Patches/0402-Show-blockstate-location-if-we-failed-to-read-it.patch @@ -1,4 +1,4 @@ -From 8313014b2fa3ce58ec2100c96d600e07b061acc6 Mon Sep 17 00:00:00 2001 +From 7d45fd9fae46ad1b5794f5c37f2ff6484458b479 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 10:28:25 -0700 Subject: [PATCH] Show blockstate location if we failed to read it diff --git a/Spigot-Server-Patches/0404-Fix-MC-154214.patch b/Spigot-Server-Patches/0403-Fix-MC-154214.patch similarity index 97% rename from Spigot-Server-Patches/0404-Fix-MC-154214.patch rename to Spigot-Server-Patches/0403-Fix-MC-154214.patch index 3219ae1c56..f68cf99fcc 100644 --- a/Spigot-Server-Patches/0404-Fix-MC-154214.patch +++ b/Spigot-Server-Patches/0403-Fix-MC-154214.patch @@ -1,4 +1,4 @@ -From c4fafcc6d9f1697387135360d4ea453eb0fcd70f Mon Sep 17 00:00:00 2001 +From 2132645f7895a363f1c726ccbe3a15639ab1d998 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 16 Jun 2019 23:30:25 -0700 Subject: [PATCH] Fix MC-154214 diff --git a/Spigot-Server-Patches/0405-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0404-Log-other-thread-in-DataPaletteBlock-lock-failure.patch similarity index 97% rename from Spigot-Server-Patches/0405-Log-other-thread-in-DataPaletteBlock-lock-failure.patch rename to Spigot-Server-Patches/0404-Log-other-thread-in-DataPaletteBlock-lock-failure.patch index a5020f8495..4fa569d4ca 100644 --- a/Spigot-Server-Patches/0405-Log-other-thread-in-DataPaletteBlock-lock-failure.patch +++ b/Spigot-Server-Patches/0404-Log-other-thread-in-DataPaletteBlock-lock-failure.patch @@ -1,4 +1,4 @@ -From 092eb3f6427db8ae080883136eb16ecc510ed9d7 Mon Sep 17 00:00:00 2001 +From 3a9c341e260ea3e1be77c63e4d6c96dbca8dd4f2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 21 Jun 2019 14:42:48 -0700 Subject: [PATCH] Log other thread in DataPaletteBlock lock failure diff --git a/Spigot-Server-Patches/0406-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0405-Use-ChunkStatus-cache-when-saving-protochunks.patch similarity index 95% rename from Spigot-Server-Patches/0406-Use-ChunkStatus-cache-when-saving-protochunks.patch rename to Spigot-Server-Patches/0405-Use-ChunkStatus-cache-when-saving-protochunks.patch index 61fce20481..9e5a7149be 100644 --- a/Spigot-Server-Patches/0406-Use-ChunkStatus-cache-when-saving-protochunks.patch +++ b/Spigot-Server-Patches/0405-Use-ChunkStatus-cache-when-saving-protochunks.patch @@ -1,4 +1,4 @@ -From 29d327049da018e9c3b4cb5b001582e8fdbd8259 Mon Sep 17 00:00:00 2001 +From 3a6cd1b34c71328e9f0d7d47a4ba1d4cabf6d4ca Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 22 Jun 2019 04:20:47 -0700 Subject: [PATCH] Use ChunkStatus cache when saving protochunks diff --git a/Spigot-Server-Patches/0407-Fix-tracker-desync-issue.patch b/Spigot-Server-Patches/0406-Fix-tracker-desync-issue.patch similarity index 96% rename from Spigot-Server-Patches/0407-Fix-tracker-desync-issue.patch rename to Spigot-Server-Patches/0406-Fix-tracker-desync-issue.patch index 9cc2110bde..481fbbdf96 100644 --- a/Spigot-Server-Patches/0407-Fix-tracker-desync-issue.patch +++ b/Spigot-Server-Patches/0406-Fix-tracker-desync-issue.patch @@ -1,4 +1,4 @@ -From 3944ba91d8551e8ca5d4f0ec0a675107d3e08aca Mon Sep 17 00:00:00 2001 +From d2e5db30390561d1444452884f8d816b767a56c8 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 23 Jun 2019 19:11:27 -0700 Subject: [PATCH] Fix tracker desync issue