diff --git a/Spigot-Server-Patches/0075-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0074-Chunk-save-queue-improvements.patch similarity index 98% rename from Spigot-Server-Patches/0075-Chunk-save-queue-improvements.patch rename to Spigot-Server-Patches/0074-Chunk-save-queue-improvements.patch index 186e4bd3d7..d3b62fbd88 100644 --- a/Spigot-Server-Patches/0075-Chunk-save-queue-improvements.patch +++ b/Spigot-Server-Patches/0074-Chunk-save-queue-improvements.patch @@ -1,4 +1,4 @@ -From aff4b290456e97c2fbc14b5b99a8bcd186f1a693 Mon Sep 17 00:00:00 2001 +From fc2343fede3ec2a7b8e0beab74332e3a7c07c41e Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 4 Mar 2016 18:18:37 -0600 Subject: [PATCH] Chunk save queue improvements @@ -41,7 +41,7 @@ index 9ab6445..d01bca1 100644 + } } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 04a4b5d..c89d533 100644 +index 8e4076d..73b8b8b 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -12,14 +12,17 @@ import java.util.Map; diff --git a/Spigot-Server-Patches/0074-Re-add-Spigot-s-hopper-check-feature.patch b/Spigot-Server-Patches/0074-Re-add-Spigot-s-hopper-check-feature.patch deleted file mode 100644 index e6d31c12ec..0000000000 --- a/Spigot-Server-Patches/0074-Re-add-Spigot-s-hopper-check-feature.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 420cb861f8b6dad37dd2700405637935cd23a682 Mon Sep 17 00:00:00 2001 -From: Byteflux -Date: Sat, 12 Mar 2016 13:37:50 -0600 -Subject: [PATCH] Re-add Spigot's hopper-check feature - - -diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 308dfdd..48ea25c 100644 ---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -269,4 +269,9 @@ public class PaperWorldConfig { - private void nonPlayerEntitiesOnScoreboards() { - nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false); - } -+ -+ public boolean useHopperCheck; -+ private void useHopperCheck() { -+ useHopperCheck = getBoolean("use-hopper-check", false); -+ } - } -diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index d1ce2b9..197bdfe 100644 ---- a/src/main/java/net/minecraft/server/TileEntityHopper.java -+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java -@@ -187,6 +187,12 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi - this.update(); - return true; - } -+ -+ // Paper start -+ if (world.paperConfig.useHopperCheck && !this.o()) { -+ this.setCooldown(world.spigotConfig.hopperCheck); -+ } -+ // Paper end - } - return false; - } else { --- -2.9.0 - diff --git a/Spigot-Server-Patches/0076-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0075-Chunk-Save-Reattempt.patch similarity index 96% rename from Spigot-Server-Patches/0076-Chunk-Save-Reattempt.patch rename to Spigot-Server-Patches/0075-Chunk-Save-Reattempt.patch index d1a36fa93b..0010a66ca5 100644 --- a/Spigot-Server-Patches/0076-Chunk-Save-Reattempt.patch +++ b/Spigot-Server-Patches/0075-Chunk-Save-Reattempt.patch @@ -1,4 +1,4 @@ -From a71fb1acf842874b674263765f8685d47ae4aafa Mon Sep 17 00:00:00 2001 +From 09c3d37924ed5bec863e09c7591700d4c93e9e0e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Mar 2013 23:46:10 -0500 Subject: [PATCH] Chunk Save Reattempt @@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks. diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index c89d533..940f4e9 100644 +index 73b8b8b..d68bd28 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -174,11 +174,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { diff --git a/Spigot-Server-Patches/0077-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0076-Default-loading-permissions.yml-before-plugins.patch similarity index 96% rename from Spigot-Server-Patches/0077-Default-loading-permissions.yml-before-plugins.patch rename to Spigot-Server-Patches/0076-Default-loading-permissions.yml-before-plugins.patch index b721a25bbb..ab9d4aff6b 100644 --- a/Spigot-Server-Patches/0077-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0076-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From 913b7a2ebb69c79d655cdba8b0402a996045cfe9 Mon Sep 17 00:00:00 2001 +From e2700ddea0cdb9c5baedbb0a8dad2f2179f759be 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 d01bca1..2e17397 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 274b83b..012d707 100644 +index 910ac7e..b9c5ae9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -307,6 +307,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0078-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0077-Allow-Reloading-of-Custom-Permissions.patch similarity index 93% rename from Spigot-Server-Patches/0078-Allow-Reloading-of-Custom-Permissions.patch rename to Spigot-Server-Patches/0077-Allow-Reloading-of-Custom-Permissions.patch index 56f6003995..91f648ccd9 100644 --- a/Spigot-Server-Patches/0078-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0077-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From a692352ea8fce1de2f01d97711e4a3b5dc7b4ec3 Mon Sep 17 00:00:00 2001 +From 7b978e01ccd8711bed786b41b9302bb1d4290d45 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 012d707..25dd732 100644 +index b9c5ae9..8a591ab 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1841,4 +1841,21 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0079-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0078-Remove-Metadata-on-reload.patch similarity index 91% rename from Spigot-Server-Patches/0079-Remove-Metadata-on-reload.patch rename to Spigot-Server-Patches/0078-Remove-Metadata-on-reload.patch index 1087231814..5d6c44d6e9 100644 --- a/Spigot-Server-Patches/0079-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0078-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From d09a45e281463742aa26b2f37f42411346161314 Mon Sep 17 00:00:00 2001 +From 05209debaec88abb32dc726e7b60b8f3021f657c 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 25dd732..de45d8b 100644 +index 8a591ab..8f08fa5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -730,6 +730,14 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0080-Undead-horse-leashing.patch b/Spigot-Server-Patches/0079-Undead-horse-leashing.patch similarity index 80% rename from Spigot-Server-Patches/0080-Undead-horse-leashing.patch rename to Spigot-Server-Patches/0079-Undead-horse-leashing.patch index b6181ef52d..63432012c9 100644 --- a/Spigot-Server-Patches/0080-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0079-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From 20309f9506d73253a2e1ec0055805ecde69f02fb Mon Sep 17 00:00:00 2001 +From 2d2f5317a0195e8eba7635ce037baf05c6e14f6d Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing @@ -6,12 +6,12 @@ Subject: [PATCH] Undead horse leashing default false to match vanilla, but option to allow undead horse types to be leashed. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 48ea25c..57e1fcf 100644 +index 308dfdd..55253d6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -274,4 +274,9 @@ public class PaperWorldConfig { - private void useHopperCheck() { - useHopperCheck = getBoolean("use-hopper-check", false); +@@ -269,4 +269,9 @@ public class PaperWorldConfig { + private void nonPlayerEntitiesOnScoreboards() { + nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false); } + + public boolean allowLeashingUndeadHorse = false; diff --git a/Spigot-Server-Patches/0081-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0080-Fix-Furnace-cook-time-bug.patch similarity index 94% rename from Spigot-Server-Patches/0081-Fix-Furnace-cook-time-bug.patch rename to Spigot-Server-Patches/0080-Fix-Furnace-cook-time-bug.patch index 8678566dbd..8560f3ac3b 100644 --- a/Spigot-Server-Patches/0081-Fix-Furnace-cook-time-bug.patch +++ b/Spigot-Server-Patches/0080-Fix-Furnace-cook-time-bug.patch @@ -1,4 +1,4 @@ -From f8841a72c02e9282be1739d120943ae0c00279d4 Mon Sep 17 00:00:00 2001 +From 2a84e2d7242ff8c813cb8afabb05db08a9239546 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:24:53 -0400 Subject: [PATCH] Fix Furnace cook time bug diff --git a/Spigot-Server-Patches/0082-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0081-Handle-Item-Meta-Inconsistencies.patch similarity index 99% rename from Spigot-Server-Patches/0082-Handle-Item-Meta-Inconsistencies.patch rename to Spigot-Server-Patches/0081-Handle-Item-Meta-Inconsistencies.patch index db5d3b5a47..94f6d416c2 100644 --- a/Spigot-Server-Patches/0082-Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/0081-Handle-Item-Meta-Inconsistencies.patch @@ -1,4 +1,4 @@ -From 7f4112d646d99c9b3b8c02f8956b3186eb3cbb61 Mon Sep 17 00:00:00 2001 +From 09d029f665f56b85ab440b31391ffbf75bf404a5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies diff --git a/Spigot-Server-Patches/0083-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0082-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 92% rename from Spigot-Server-Patches/0083-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to Spigot-Server-Patches/0082-Configurable-Non-Player-Arrow-Despawn-Rate.patch index 4dd271249d..0734a76972 100644 --- a/Spigot-Server-Patches/0083-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0082-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From d041dc5744a8c53ce8ae8803331ed26d69c7b4b0 Mon Sep 17 00:00:00 2001 +From 2b5b8fd3777fea8ced8a2f4b1f4b9911183c8fa9 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 @@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate Can set a much shorter despawn rate for arrows that players can not pick up. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 57e1fcf..3f8a47b 100644 +index 55253d6..f528fd1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -279,4 +279,13 @@ public class PaperWorldConfig { +@@ -274,4 +274,13 @@ public class PaperWorldConfig { private void allowLeashingUndeadHorse() { allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false); } diff --git a/Spigot-Server-Patches/0084-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0083-Add-World-Util-Methods.patch similarity index 97% rename from Spigot-Server-Patches/0084-Add-World-Util-Methods.patch rename to Spigot-Server-Patches/0083-Add-World-Util-Methods.patch index 36f8c9a823..6cb8046b83 100644 --- a/Spigot-Server-Patches/0084-Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/0083-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From c4a425cbbbb658a9efb4969c4b959e700379fdf5 Mon Sep 17 00:00:00 2001 +From c49dc8b884a9576492347c1a6dabbc30ef685595 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/World.java b/src/main/java/net/minecraft/server/World.java -index d54ff64..12f6761 100644 +index 48c0e14..a3bce9a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -153,6 +153,12 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0085-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0084-Optimized-Light-Level-Comparisons.patch similarity index 99% rename from Spigot-Server-Patches/0085-Optimized-Light-Level-Comparisons.patch rename to Spigot-Server-Patches/0084-Optimized-Light-Level-Comparisons.patch index decdf64a21..bc6359f060 100644 --- a/Spigot-Server-Patches/0085-Optimized-Light-Level-Comparisons.patch +++ b/Spigot-Server-Patches/0084-Optimized-Light-Level-Comparisons.patch @@ -1,4 +1,4 @@ -From 91c2e62925acb46c336de017322ee57ab965c3c0 Mon Sep 17 00:00:00 2001 +From dfa581d6e4d69f851765dc7be7739f5f812c228f Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 21:22:56 -0400 Subject: [PATCH] Optimized Light Level Comparisons diff --git a/Spigot-Server-Patches/0086-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0085-Pass-world-to-Village-creation.patch similarity index 95% rename from Spigot-Server-Patches/0086-Pass-world-to-Village-creation.patch rename to Spigot-Server-Patches/0085-Pass-world-to-Village-creation.patch index c9f914de33..da310745e5 100644 --- a/Spigot-Server-Patches/0086-Pass-world-to-Village-creation.patch +++ b/Spigot-Server-Patches/0085-Pass-world-to-Village-creation.patch @@ -1,4 +1,4 @@ -From 11a94ee75fa7051513d0447c5dd2e6bc43e440ab Mon Sep 17 00:00:00 2001 +From f5b65114209cfe77109f54a144a5af824c4ab7f8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 19 Mar 2016 15:16:54 -0400 Subject: [PATCH] Pass world to Village creation diff --git a/Spigot-Server-Patches/0087-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0086-Custom-replacement-for-eaten-items.patch similarity index 95% rename from Spigot-Server-Patches/0087-Custom-replacement-for-eaten-items.patch rename to Spigot-Server-Patches/0086-Custom-replacement-for-eaten-items.patch index 9554c6c8c9..8ed532c292 100644 --- a/Spigot-Server-Patches/0087-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0086-Custom-replacement-for-eaten-items.patch @@ -1,4 +1,4 @@ -From afaf65e2a6361203102bc9eb70d47c782a9134e7 Mon Sep 17 00:00:00 2001 +From 3ab439efa030a2b5b9f9170663966ce97ccc6aa8 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 @@ -34,5 +34,5 @@ index 89e6ef5..ad320c2 100644 } -- -2.9.0.windows.1 +2.9.0 diff --git a/Spigot-Server-Patches/0088-Set-health-before-death-event.patch b/Spigot-Server-Patches/0087-Set-health-before-death-event.patch similarity index 96% rename from Spigot-Server-Patches/0088-Set-health-before-death-event.patch rename to Spigot-Server-Patches/0087-Set-health-before-death-event.patch index 8d7c690bfc..0139be38f5 100644 --- a/Spigot-Server-Patches/0088-Set-health-before-death-event.patch +++ b/Spigot-Server-Patches/0087-Set-health-before-death-event.patch @@ -1,4 +1,4 @@ -From a6d981de32a11967e9073a6f8530a05c3c5d5dde Mon Sep 17 00:00:00 2001 +From 1f03283a0c21e6511450ed1dc5fe9617b8c22787 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 19 Jul 2015 16:51:38 -0400 Subject: [PATCH] Set health before death event diff --git a/Spigot-Server-Patches/0089-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0088-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 96% rename from Spigot-Server-Patches/0089-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to Spigot-Server-Patches/0088-handle-NaN-health-absorb-values-and-repair-bad-data.patch index baa71db51b..fc884d4fa3 100644 --- a/Spigot-Server-Patches/0089-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0088-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,4 +1,4 @@ -From a67ad017f95353466c65435997ddad3ef5776248 Mon Sep 17 00:00:00 2001 +From 34eca3f612837f249380d60d7b6ae2fc2cb5cc3b 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 @@ -56,5 +56,5 @@ index e372761..d6b2974 100644 } -- -2.9.0.windows.1 +2.9.0 diff --git a/Spigot-Server-Patches/0090-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0089-Catch-Async-PlayerChunkMap-operations.patch similarity index 93% rename from Spigot-Server-Patches/0090-Catch-Async-PlayerChunkMap-operations.patch rename to Spigot-Server-Patches/0089-Catch-Async-PlayerChunkMap-operations.patch index 0374450e54..4499736102 100644 --- a/Spigot-Server-Patches/0090-Catch-Async-PlayerChunkMap-operations.patch +++ b/Spigot-Server-Patches/0089-Catch-Async-PlayerChunkMap-operations.patch @@ -1,4 +1,4 @@ -From e3ba0fd0099369577e52fad29db661e97692ee11 Mon Sep 17 00:00:00 2001 +From 2981829cfa78bbae1675dbea13ec8c08c3d8da45 Mon Sep 17 00:00:00 2001 From: Daniel Ennis Date: Sun, 20 Mar 2016 15:22:42 -0400 Subject: [PATCH] Catch Async PlayerChunkMap operations diff --git a/Spigot-Server-Patches/0091-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0090-Support-offline-mode-in-whitelist-command-as-well.patch similarity index 98% rename from Spigot-Server-Patches/0091-Support-offline-mode-in-whitelist-command-as-well.patch rename to Spigot-Server-Patches/0090-Support-offline-mode-in-whitelist-command-as-well.patch index 5ca911cc99..cd2855725c 100644 --- a/Spigot-Server-Patches/0091-Support-offline-mode-in-whitelist-command-as-well.patch +++ b/Spigot-Server-Patches/0090-Support-offline-mode-in-whitelist-command-as-well.patch @@ -1,4 +1,4 @@ -From 9b45817648bcf287ebb160f0fde6bc5c71c965b9 Mon Sep 17 00:00:00 2001 +From ecf329a1fbe4583de3e4ec9f0e07004db9c960d6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 21 Mar 2016 00:19:18 -0500 Subject: [PATCH] Support offline mode in whitelist command as well diff --git a/Spigot-Server-Patches/0092-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0091-Fix-SkullCache-case-bug.patch similarity index 94% rename from Spigot-Server-Patches/0092-Fix-SkullCache-case-bug.patch rename to Spigot-Server-Patches/0091-Fix-SkullCache-case-bug.patch index 32fc9d4314..51ef23bf6e 100644 --- a/Spigot-Server-Patches/0092-Fix-SkullCache-case-bug.patch +++ b/Spigot-Server-Patches/0091-Fix-SkullCache-case-bug.patch @@ -1,4 +1,4 @@ -From 567933cffee3dee78675df9fefb8dc3818e26cc6 Mon Sep 17 00:00:00 2001 +From 8ab22bafccd2e2e4c48e3f1a7ad4e7cd728bf1da Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jan 2016 21:48:24 -0500 Subject: [PATCH] Fix SkullCache case bug diff --git a/Spigot-Server-Patches/0093-Waving-banner-workaround.patch b/Spigot-Server-Patches/0092-Waving-banner-workaround.patch similarity index 95% rename from Spigot-Server-Patches/0093-Waving-banner-workaround.patch rename to Spigot-Server-Patches/0092-Waving-banner-workaround.patch index c6ccdd5668..68802459e1 100644 --- a/Spigot-Server-Patches/0093-Waving-banner-workaround.patch +++ b/Spigot-Server-Patches/0092-Waving-banner-workaround.patch @@ -1,4 +1,4 @@ -From 0754b1047b0b70fc03196ae2754d6b87355061b5 Mon Sep 17 00:00:00 2001 +From 6f283d5d1557aaa49bb6a9e1cee6835f59a5e1da Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 19 Mar 2016 22:25:11 +0100 Subject: [PATCH] Waving banner workaround diff --git a/Spigot-Server-Patches/0094-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0093-Use-a-Shared-Random-for-Entities.patch similarity index 95% rename from Spigot-Server-Patches/0094-Use-a-Shared-Random-for-Entities.patch rename to Spigot-Server-Patches/0093-Use-a-Shared-Random-for-Entities.patch index d3a23cb560..7db6bd353b 100644 --- a/Spigot-Server-Patches/0094-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0093-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From 95cd62455ffa927843a8833c9d2b9bbb80d2998c Mon Sep 17 00:00:00 2001 +From 82647f8664165a4de75aadaf2f5fd2d5381fb670 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 diff --git a/Spigot-Server-Patches/0095-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0094-Don-t-teleport-dead-entities.patch similarity index 93% rename from Spigot-Server-Patches/0095-Don-t-teleport-dead-entities.patch rename to Spigot-Server-Patches/0094-Don-t-teleport-dead-entities.patch index 73459195b2..265fbda4cd 100644 --- a/Spigot-Server-Patches/0095-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0094-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From 14040aaa93730c538cd6b521cf1ed838475a21d6 Mon Sep 17 00:00:00 2001 +From d4bfe7c6ef08e98c0fbf19c0ae777ab2a9208245 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:55:23 -0400 Subject: [PATCH] Don't teleport dead entities diff --git a/Spigot-Server-Patches/0096-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0095-Optimize-Chunk-Access.patch similarity index 94% rename from Spigot-Server-Patches/0096-Optimize-Chunk-Access.patch rename to Spigot-Server-Patches/0095-Optimize-Chunk-Access.patch index e5f17f13f8..999d55b35d 100644 --- a/Spigot-Server-Patches/0096-Optimize-Chunk-Access.patch +++ b/Spigot-Server-Patches/0095-Optimize-Chunk-Access.patch @@ -1,4 +1,4 @@ -From 11f18326b98f9ebe0906aee6bad03a02e9ab6f95 Mon Sep 17 00:00:00 2001 +From 76004dc47689f92b507e3921fb05f2959e793918 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 27 Aug 2015 01:15:02 -0400 Subject: [PATCH] Optimize Chunk Access @@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT Optimize this look up by using a Last Access cache. diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index d814670..36515cd 100644 +index 299cc91..9077696 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -26,7 +26,27 @@ public class ChunkProviderServer implements IChunkProvider { diff --git a/Spigot-Server-Patches/0097-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0096-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 90% rename from Spigot-Server-Patches/0097-Configurable-spawn-chances-for-skeleton-horses.patch rename to Spigot-Server-Patches/0096-Configurable-spawn-chances-for-skeleton-horses.patch index a89445e0e8..b74e7eb11a 100644 --- a/Spigot-Server-Patches/0097-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0096-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,14 +1,14 @@ -From 6f05d463f21dfc2c75c1f508dae7efe5ab405859 Mon Sep 17 00:00:00 2001 +From 37849503dd781ad0afeb4096add22308691508e3 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3f8a47b..5652108 100644 +index f528fd1..1b996ba 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -288,4 +288,12 @@ public class PaperWorldConfig { +@@ -283,4 +283,12 @@ public class PaperWorldConfig { } log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate); } @@ -22,7 +22,7 @@ index 3f8a47b..5652108 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index bc6ddc7..9eec243 100644 +index 60696ea..72a604a 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -431,7 +431,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { diff --git a/Spigot-Server-Patches/0098-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0097-Optimize-isValidLocation-getType-and-getBlockData-fo.patch similarity index 99% rename from Spigot-Server-Patches/0098-Optimize-isValidLocation-getType-and-getBlockData-fo.patch rename to Spigot-Server-Patches/0097-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 3b73e66214..1a2a95cc7b 100644 --- a/Spigot-Server-Patches/0098-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0097-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -1,4 +1,4 @@ -From 0b1264d59ec8b3a917574f35aed221aaa3e592c5 Mon Sep 17 00:00:00 2001 +From 2782f0fbc0c4a40216b1ce0591f3b21b839b7bc2 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 diff --git a/Spigot-Server-Patches/0099-Use-correct-item-in-arrow-pickup-event.patch b/Spigot-Server-Patches/0098-Use-correct-item-in-arrow-pickup-event.patch similarity index 96% rename from Spigot-Server-Patches/0099-Use-correct-item-in-arrow-pickup-event.patch rename to Spigot-Server-Patches/0098-Use-correct-item-in-arrow-pickup-event.patch index e1804b2641..5247f37000 100644 --- a/Spigot-Server-Patches/0099-Use-correct-item-in-arrow-pickup-event.patch +++ b/Spigot-Server-Patches/0098-Use-correct-item-in-arrow-pickup-event.patch @@ -1,4 +1,4 @@ -From 998ca2697fc4262c3146a8b1286795e8ad979a3c Mon Sep 17 00:00:00 2001 +From da4991273ded9806e86a36f9e87b3cff0768bbdd Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 22 Mar 2016 16:00:16 -0400 Subject: [PATCH] Use correct item in arrow pickup event diff --git a/Spigot-Server-Patches/0100-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0099-Fix-cooked-fish-legacy-import.patch similarity index 94% rename from Spigot-Server-Patches/0100-Fix-cooked-fish-legacy-import.patch rename to Spigot-Server-Patches/0099-Fix-cooked-fish-legacy-import.patch index 86fc3e7636..f538eb0cc5 100644 --- a/Spigot-Server-Patches/0100-Fix-cooked-fish-legacy-import.patch +++ b/Spigot-Server-Patches/0099-Fix-cooked-fish-legacy-import.patch @@ -1,4 +1,4 @@ -From 59b4657819f58356f60016f3c27ef2de3eb3bf90 Mon Sep 17 00:00:00 2001 +From eaa0d207c201b635cb0d461a7fc88c7e05a306b4 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 04:32:08 -0500 Subject: [PATCH] Fix cooked fish legacy import diff --git a/Spigot-Server-Patches/0101-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch b/Spigot-Server-Patches/0100-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch similarity index 98% rename from Spigot-Server-Patches/0101-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch rename to Spigot-Server-Patches/0100-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch index 14236aaacd..b3a517f1e1 100644 --- a/Spigot-Server-Patches/0101-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch +++ b/Spigot-Server-Patches/0100-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch @@ -1,4 +1,4 @@ -From 9fda9b975db0dc3d25ccd4b859d75bfd93ff2bea Mon Sep 17 00:00:00 2001 +From 5981293c0b82225d853afa9535fba868f4b58665 Mon Sep 17 00:00:00 2001 From: DemonWav Date: Sat, 26 Mar 2016 21:36:05 -0500 Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator diff --git a/Spigot-Server-Patches/0102-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0101-Access-items-by-EquipmentSlot.patch similarity index 97% rename from Spigot-Server-Patches/0102-Access-items-by-EquipmentSlot.patch rename to Spigot-Server-Patches/0101-Access-items-by-EquipmentSlot.patch index f3bcc8b274..2d8e03db56 100644 --- a/Spigot-Server-Patches/0102-Access-items-by-EquipmentSlot.patch +++ b/Spigot-Server-Patches/0101-Access-items-by-EquipmentSlot.patch @@ -1,4 +1,4 @@ -From e8b05a60fea474060dc708b1ffae37cd0d31f07e Mon Sep 17 00:00:00 2001 +From 46a65354e4c97fd90db2c37c7aa04c030c4b51d2 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 diff --git a/Spigot-Server-Patches/0103-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0102-Check-async-remove-unused-vars-GH-159.patch similarity index 95% rename from Spigot-Server-Patches/0103-Check-async-remove-unused-vars-GH-159.patch rename to Spigot-Server-Patches/0102-Check-async-remove-unused-vars-GH-159.patch index bdfbe637a9..d8d0a82053 100644 --- a/Spigot-Server-Patches/0103-Check-async-remove-unused-vars-GH-159.patch +++ b/Spigot-Server-Patches/0102-Check-async-remove-unused-vars-GH-159.patch @@ -1,4 +1,4 @@ -From 18ca179be8e89fec0c5cd64332d1bfe1c2992db6 Mon Sep 17 00:00:00 2001 +From 7ef0019c92436a06b26d1d981ff5d9de40b471c2 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 27 Mar 2016 20:24:05 -0500 Subject: [PATCH] Check async, remove unused vars, GH-159 @@ -28,5 +28,5 @@ index b3edaee..ea0a145 100644 if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) { BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(); -- -2.9.0.windows.1 +2.9.0 diff --git a/Spigot-Server-Patches/0104-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0103-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch similarity index 94% rename from Spigot-Server-Patches/0104-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch rename to Spigot-Server-Patches/0103-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch index b68a501f7e..2927a8c317 100644 --- a/Spigot-Server-Patches/0104-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch +++ b/Spigot-Server-Patches/0103-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch @@ -1,4 +1,4 @@ -From 679ac3739ff04c06dc2c499424a6d0212395709b Mon Sep 17 00:00:00 2001 +From b929da4abcfbe4e644f9611943d23599a22a577d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone @@ -11,10 +11,10 @@ Defaulting this to false will provide substantial performance improvement by saving millions of event calls on redstone heavy servers. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 5652108..a97eee7 100644 +index 1b996ba..ca0673e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -296,4 +296,9 @@ public class PaperWorldConfig { +@@ -291,4 +291,9 @@ public class PaperWorldConfig { skeleHorseSpawnChance = 0.05D; // Vanilla } } @@ -25,7 +25,7 @@ index 5652108..a97eee7 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 54d1442..d5422ff 100644 +index b683c3e..0c7558f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -558,7 +558,7 @@ public abstract class World implements IBlockAccess { @@ -38,7 +38,7 @@ index 54d1442..d5422ff 100644 this.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9eec243..3377f97 100644 +index 72a604a..d448277 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -33,6 +33,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; diff --git a/Spigot-Server-Patches/0105-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0104-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 91% rename from Spigot-Server-Patches/0105-Entity-AddTo-RemoveFrom-World-Events.patch rename to Spigot-Server-Patches/0104-Entity-AddTo-RemoveFrom-World-Events.patch index 9e0fd195e6..4459472eb9 100644 --- a/Spigot-Server-Patches/0105-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0104-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,11 +1,11 @@ -From 7d7731267ad9097ba4793192ab9b0d350d9f708c Mon Sep 17 00:00:00 2001 +From ab3f55e597d417d561f9925fc43ff0d092643760 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d5422ff..cfda7e2 100644 +index 0c7558f..a494569 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1120,6 +1120,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0106-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0105-Configurable-Chunk-Inhabited-Timer.patch similarity index 90% rename from Spigot-Server-Patches/0106-Configurable-Chunk-Inhabited-Timer.patch rename to Spigot-Server-Patches/0105-Configurable-Chunk-Inhabited-Timer.patch index b257ba8f6c..8683df231b 100644 --- a/Spigot-Server-Patches/0106-Configurable-Chunk-Inhabited-Timer.patch +++ b/Spigot-Server-Patches/0105-Configurable-Chunk-Inhabited-Timer.patch @@ -1,4 +1,4 @@ -From 43dbd3c0ac26aee92c2039f72f38663d55e108c7 Mon Sep 17 00:00:00 2001 +From 774fce04aeeca98f4f982041abfcb23d95e3cffd Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Timer @@ -9,10 +9,10 @@ aspects of vanilla gameplay to this factor. For people who want all chunks to be treated equally, you can disable the timer. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a97eee7..8966b4a 100644 +index ca0673e..7d60d5e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -301,4 +301,9 @@ public class PaperWorldConfig { +@@ -296,4 +296,9 @@ public class PaperWorldConfig { private void firePhysicsEventForRedstone() { firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone); } diff --git a/Spigot-Server-Patches/0107-EntityPathfindEvent.patch b/Spigot-Server-Patches/0106-EntityPathfindEvent.patch similarity index 96% rename from Spigot-Server-Patches/0107-EntityPathfindEvent.patch rename to Spigot-Server-Patches/0106-EntityPathfindEvent.patch index b1c3c091b6..4a1cd92a97 100644 --- a/Spigot-Server-Patches/0107-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0106-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From 9dd5a669d39313e875da0d995a621ae051f030be Mon Sep 17 00:00:00 2001 +From 434efe8e1de761b4b5f03eba30068a48eade6eb0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:22:26 -0400 Subject: [PATCH] EntityPathfindEvent diff --git a/Spigot-Server-Patches/0108-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0107-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch similarity index 97% rename from Spigot-Server-Patches/0108-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch rename to Spigot-Server-Patches/0107-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch index 4110f33660..4a99c07c45 100644 --- a/Spigot-Server-Patches/0108-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch +++ b/Spigot-Server-Patches/0107-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch @@ -1,4 +1,4 @@ -From f208c1991624aba4aff4fbec77a6b0ea6a5b3848 Mon Sep 17 00:00:00 2001 +From 83984746d42831aaa8967591b2b41d038414b945 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 22:03:09 -0400 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks diff --git a/Spigot-Server-Patches/0109-Minecart-drop-name-workaround.patch b/Spigot-Server-Patches/0108-Minecart-drop-name-workaround.patch similarity index 94% rename from Spigot-Server-Patches/0109-Minecart-drop-name-workaround.patch rename to Spigot-Server-Patches/0108-Minecart-drop-name-workaround.patch index 8ca27f9b6f..f9214f2acc 100644 --- a/Spigot-Server-Patches/0109-Minecart-drop-name-workaround.patch +++ b/Spigot-Server-Patches/0108-Minecart-drop-name-workaround.patch @@ -1,4 +1,4 @@ -From 6f1b42e1117b77a826bef99f49e7da1d8e22dd96 Mon Sep 17 00:00:00 2001 +From 53d91e9777d3e6d77a574fb718cb2c9e230792d7 Mon Sep 17 00:00:00 2001 From: Fabse Date: Mon, 28 Mar 2016 00:46:46 +0200 Subject: [PATCH] Minecart drop name workaround diff --git a/Spigot-Server-Patches/0110-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0109-Reduce-IO-ops-opening-a-new-region-file.patch similarity index 96% rename from Spigot-Server-Patches/0110-Reduce-IO-ops-opening-a-new-region-file.patch rename to Spigot-Server-Patches/0109-Reduce-IO-ops-opening-a-new-region-file.patch index 85573426a1..fd43b1dec2 100644 --- a/Spigot-Server-Patches/0110-Reduce-IO-ops-opening-a-new-region-file.patch +++ b/Spigot-Server-Patches/0109-Reduce-IO-ops-opening-a-new-region-file.patch @@ -1,4 +1,4 @@ -From 29345dd2c97756df84a4ecf03627e92d7d759897 Mon Sep 17 00:00:00 2001 +From 4f3972729ecb4d8907d6bd0abfe9e32425e98abc 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. diff --git a/Spigot-Server-Patches/0111-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0110-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 98% rename from Spigot-Server-Patches/0111-Sanitise-RegionFileCache-and-make-configurable.patch rename to Spigot-Server-Patches/0110-Sanitise-RegionFileCache-and-make-configurable.patch index c20b8b5a02..fd580fb687 100644 --- a/Spigot-Server-Patches/0111-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/Spigot-Server-Patches/0110-Sanitise-RegionFileCache-and-make-configurable.patch @@ -1,4 +1,4 @@ -From b6dd2dd92ace414736b3da9ad9959ef8bbe686f2 Mon Sep 17 00:00:00 2001 +From ab291bae71dad9b49b855648c8de79023920a594 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. diff --git a/Spigot-Server-Patches/0112-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0111-Add-getEntity-by-UUID-API.patch similarity index 96% rename from Spigot-Server-Patches/0112-Add-getEntity-by-UUID-API.patch rename to Spigot-Server-Patches/0111-Add-getEntity-by-UUID-API.patch index 58df3c4b7d..793bf30d90 100644 --- a/Spigot-Server-Patches/0112-Add-getEntity-by-UUID-API.patch +++ b/Spigot-Server-Patches/0111-Add-getEntity-by-UUID-API.patch @@ -1,4 +1,4 @@ -From a9b3cc4ebc0b81074485a105f06ec1e20eb3882d Mon Sep 17 00:00:00 2001 +From 7cf0e711c6c80eb556adeb298480439f15a9405f Mon Sep 17 00:00:00 2001 From: DemonWav Date: Wed, 30 Mar 2016 01:20:11 -0500 Subject: [PATCH] Add getEntity by UUID API @@ -53,5 +53,5 @@ index 8f08fa5..91d00dc 100644 // Paper end } -- -2.9.0.windows.1 +2.9.0 diff --git a/Spigot-Server-Patches/0113-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0112-Use-Optimized-Collections.patch similarity index 96% rename from Spigot-Server-Patches/0113-Use-Optimized-Collections.patch rename to Spigot-Server-Patches/0112-Use-Optimized-Collections.patch index 4dc1cd0055..8cec698547 100644 --- a/Spigot-Server-Patches/0113-Use-Optimized-Collections.patch +++ b/Spigot-Server-Patches/0112-Use-Optimized-Collections.patch @@ -1,4 +1,4 @@ -From 988e969f0fee60fce649abdf4a2b4cd65df96c1f Mon Sep 17 00:00:00 2001 +From b3c34e97f0d695b18c0cee6df10138d8c8d485be Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 02:13:24 -0400 Subject: [PATCH] Use Optimized Collections @@ -13,7 +13,7 @@ These collections are super fast as seen http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/ diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 36515cd..cc8602e 100644 +index 9077696..d4587c7 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -23,7 +23,7 @@ import org.bukkit.event.world.ChunkUnloadEvent; diff --git a/Spigot-Server-Patches/0114-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0113-Do-not-load-chunks-for-light-checks.patch similarity index 90% rename from Spigot-Server-Patches/0114-Do-not-load-chunks-for-light-checks.patch rename to Spigot-Server-Patches/0113-Do-not-load-chunks-for-light-checks.patch index 4429546b18..fea80f1e8d 100644 --- a/Spigot-Server-Patches/0114-Do-not-load-chunks-for-light-checks.patch +++ b/Spigot-Server-Patches/0113-Do-not-load-chunks-for-light-checks.patch @@ -1,4 +1,4 @@ -From c22e8ea925d50cfaca77e1f7345f24652aa61cf0 Mon Sep 17 00:00:00 2001 +From 9ab85f6bdb0237697f5686f7978aee997674191a 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 cfda7e2..8ba0d1f 100644 +index a494569..1dc8af1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -707,6 +707,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0115-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0114-Add-PlayerUseUnknownEntityEvent.patch similarity index 94% rename from Spigot-Server-Patches/0115-Add-PlayerUseUnknownEntityEvent.patch rename to Spigot-Server-Patches/0114-Add-PlayerUseUnknownEntityEvent.patch index 2222c49682..6a572f1e83 100644 --- a/Spigot-Server-Patches/0115-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0114-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From e230ff98a7ceeff5895c07851fed74161f1979aa Mon Sep 17 00:00:00 2001 +From 2943a23d314737435d4bb0578ad99ab3c151cf1d 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 2b23a5d..6464a84 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 cb1169c..06c4f12 100644 +index d5e06f0..b983540 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1616,6 +1616,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0116-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0115-Fix-reducedDebugInfo-not-initialized-on-client.patch similarity index 92% rename from Spigot-Server-Patches/0116-Fix-reducedDebugInfo-not-initialized-on-client.patch rename to Spigot-Server-Patches/0115-Fix-reducedDebugInfo-not-initialized-on-client.patch index 3330679612..459e7d4910 100644 --- a/Spigot-Server-Patches/0116-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0115-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,11 +1,11 @@ -From 3b42b3d60f48eafb32983f7c8fe3016ac0a8ff96 Mon Sep 17 00:00:00 2001 +From 35afe0d12467dfff5f128eacc110141c54415865 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/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 6e51c43..540e178 100644 +index b202c97..2ff205c 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -152,6 +152,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0117-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0116-Configurable-Grass-Spread-Tick-Rate.patch similarity index 92% rename from Spigot-Server-Patches/0117-Configurable-Grass-Spread-Tick-Rate.patch rename to Spigot-Server-Patches/0116-Configurable-Grass-Spread-Tick-Rate.patch index fa3bd92614..1af072d88b 100644 --- a/Spigot-Server-Patches/0117-Configurable-Grass-Spread-Tick-Rate.patch +++ b/Spigot-Server-Patches/0116-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,14 +1,14 @@ -From e847ad6495c01d38137b107e391045be96054600 Mon Sep 17 00:00:00 2001 +From 9aa856267caa2068b19700bf134c7be3480219b1 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 8966b4a..2374419 100644 +index 7d60d5e..486ada4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -306,4 +306,10 @@ public class PaperWorldConfig { +@@ -301,4 +301,10 @@ public class PaperWorldConfig { private void useInhabitedTime() { useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true); } diff --git a/Spigot-Server-Patches/0118-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0117-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 96% rename from Spigot-Server-Patches/0118-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to Spigot-Server-Patches/0117-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 6ffdf68ccb..bb65a4f7e7 100644 --- a/Spigot-Server-Patches/0118-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0117-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 4b139b9ba8d5e924fe08bc5f2e938683a65c8244 Mon Sep 17 00:00:00 2001 +From 12cc663c719ad4ee7818a5ecee48c84e4d67af62 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world This lets you disable it for some worlds and lower it for others. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 2374419..d6fef83 100644 +index 486ada4..203dafc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -312,4 +312,10 @@ public class PaperWorldConfig { +@@ -307,4 +307,10 @@ public class PaperWorldConfig { grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate)); log("Grass Spread Tick Rate: " + grassUpdateRate); } @@ -81,5 +81,5 @@ index 2606890..1994401 100644 loadChunk(chunkCoordX + x, chunkCoordZ + z); } else { -- -2.9.0.windows.1 +2.9.0 diff --git a/Spigot-Server-Patches/0119-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0118-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 88% rename from Spigot-Server-Patches/0119-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to Spigot-Server-Patches/0118-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index 620c1d343c..b37214c473 100644 --- a/Spigot-Server-Patches/0119-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0118-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,11 +1,11 @@ -From 502d5ac9425763d8f14067ff1692f4bb948bbde4 Mon Sep 17 00:00:00 2001 +From cfd8d89b541a964adfaf6212de5473647a1b10a5 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 2c6deef..539100b 100644 +index bb578d9..4452107 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -516,6 +516,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0120-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0119-Don-t-spam-reload-spawn-chunks-in-nether-end.patch similarity index 95% rename from Spigot-Server-Patches/0120-Don-t-spam-reload-spawn-chunks-in-nether-end.patch rename to Spigot-Server-Patches/0119-Don-t-spam-reload-spawn-chunks-in-nether-end.patch index 01bd0f06ba..159061bf0b 100644 --- a/Spigot-Server-Patches/0120-Don-t-spam-reload-spawn-chunks-in-nether-end.patch +++ b/Spigot-Server-Patches/0119-Don-t-spam-reload-spawn-chunks-in-nether-end.patch @@ -1,4 +1,4 @@ -From f1ca6b6520f378399d0a3945bca918c77ac6cc82 Mon Sep 17 00:00:00 2001 +From 9ecc819d5041374d6faab2ae9b1e585ee251b8ef Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 19:42:22 -0400 Subject: [PATCH] Don't spam reload spawn chunks in nether/end diff --git a/Spigot-Server-Patches/0121-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0120-Remove-Debug-checks-from-DataBits.patch similarity index 96% rename from Spigot-Server-Patches/0121-Remove-Debug-checks-from-DataBits.patch rename to Spigot-Server-Patches/0120-Remove-Debug-checks-from-DataBits.patch index 486c418062..188e903c66 100644 --- a/Spigot-Server-Patches/0121-Remove-Debug-checks-from-DataBits.patch +++ b/Spigot-Server-Patches/0120-Remove-Debug-checks-from-DataBits.patch @@ -1,4 +1,4 @@ -From 1dc1103e5ddaff90993bbd49d383d273c98b5db2 Mon Sep 17 00:00:00 2001 +From 327cd944a22ef905afc3abcf10d50d8c36077209 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 diff --git a/Spigot-Server-Patches/0122-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 92% rename from Spigot-Server-Patches/0122-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to Spigot-Server-Patches/0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index fa92162f74..473c60f2c5 100644 --- a/Spigot-Server-Patches/0122-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/0121-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -1,14 +1,14 @@ -From 720fe6133fb0d2a4f19f6fc93bb8cae93d00b570 Mon Sep 17 00:00:00 2001 +From 285bc08b9e9f49e83e80fcc91de4b1111f2aadcf 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d6fef83..35364c7 100644 +index 203dafc..66cd256 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -318,4 +318,9 @@ public class PaperWorldConfig { +@@ -313,4 +313,9 @@ public class PaperWorldConfig { keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16); log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16)); } @@ -19,7 +19,7 @@ index d6fef83..35364c7 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 06c4f12..2538cc5 100644 +index b983540..f7eaa6f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1346,7 +1346,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0123-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0122-Workaround-for-setting-passengers-on-players.patch similarity index 92% rename from Spigot-Server-Patches/0123-Workaround-for-setting-passengers-on-players.patch rename to Spigot-Server-Patches/0122-Workaround-for-setting-passengers-on-players.patch index 4b83b5ecb7..f5c8ff8b7d 100644 --- a/Spigot-Server-Patches/0123-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0122-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From 1ba823ed3a80809ac78a11b495c1ea3d54aa8d2d Mon Sep 17 00:00:00 2001 +From 879120d74b0d80e4506dbafce467791792fb33e9 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players SPIGOT-1915 & GH-114 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e941f5f..e20c4ef 100644 +index d6b2974..f2d1b21 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -582,6 +582,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0124-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch b/Spigot-Server-Patches/0123-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch similarity index 94% rename from Spigot-Server-Patches/0124-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch rename to Spigot-Server-Patches/0123-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch index 2db974de5e..5f72652c9e 100644 --- a/Spigot-Server-Patches/0124-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch +++ b/Spigot-Server-Patches/0123-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch @@ -1,4 +1,4 @@ -From 89cc41ddcc93c188ecdc21c2c817a18541fee80f Mon Sep 17 00:00:00 2001 +From 47a88a076b3eb494fcc42700e2bdba19dfe5fdbd Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Apr 2016 22:36:10 -0400 Subject: [PATCH] SPIGOT-1903: Update PlayerConnection on teleporting players @@ -19,7 +19,7 @@ index 3ed3732..eff088d 100644 float f1 = this.length; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2538cc5..390528c 100644 +index f7eaa6f..85c62cd 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -204,7 +204,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0125-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0124-Remove-unused-World-Tile-Entity-List.patch similarity index 98% rename from Spigot-Server-Patches/0125-Remove-unused-World-Tile-Entity-List.patch rename to Spigot-Server-Patches/0124-Remove-unused-World-Tile-Entity-List.patch index 4e8a8cc722..5da671ed82 100644 --- a/Spigot-Server-Patches/0125-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0124-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From 8f60410ed03e1a461223e48993998701602db8ee Mon Sep 17 00:00:00 2001 +From 679fdd271f10e128a499401f3285a0cb56311a73 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 diff --git a/Spigot-Server-Patches/0126-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0125-Don-t-tick-Skulls-unused-code.patch similarity index 92% rename from Spigot-Server-Patches/0126-Don-t-tick-Skulls-unused-code.patch rename to Spigot-Server-Patches/0125-Don-t-tick-Skulls-unused-code.patch index a9f72bee00..39ec3005b9 100644 --- a/Spigot-Server-Patches/0126-Don-t-tick-Skulls-unused-code.patch +++ b/Spigot-Server-Patches/0125-Don-t-tick-Skulls-unused-code.patch @@ -1,4 +1,4 @@ -From 32617ea374eb4534a7254475cf9ba2b13e2cfae2 Mon Sep 17 00:00:00 2001 +From d8060bbe35a6856ab2e43678d9dcb87af8ca0470 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 diff --git a/Spigot-Server-Patches/0127-Fix-some-players-not-being-kicked-on-shutdown.patch b/Spigot-Server-Patches/0126-Fix-some-players-not-being-kicked-on-shutdown.patch similarity index 91% rename from Spigot-Server-Patches/0127-Fix-some-players-not-being-kicked-on-shutdown.patch rename to Spigot-Server-Patches/0126-Fix-some-players-not-being-kicked-on-shutdown.patch index a5a6f1d474..3798a6eef1 100644 --- a/Spigot-Server-Patches/0127-Fix-some-players-not-being-kicked-on-shutdown.patch +++ b/Spigot-Server-Patches/0126-Fix-some-players-not-being-kicked-on-shutdown.patch @@ -1,11 +1,11 @@ -From 7831132f199ac9b62f9403905bf5becf3824d51a Mon Sep 17 00:00:00 2001 +From 04798fd5955d34414d732efc7dc29836aed90adc Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 29 Mar 2016 20:19:20 -0400 Subject: [PATCH] Fix some players not being kicked on shutdown diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 9865c4b..e6a4490 100644 +index 2ff205c..91e52f9 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1297,9 +1297,11 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0128-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch similarity index 96% rename from Spigot-Server-Patches/0128-Configurable-Player-Collision.patch rename to Spigot-Server-Patches/0127-Configurable-Player-Collision.patch index f594e6db3e..8640cd0870 100644 --- a/Spigot-Server-Patches/0128-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0127-Configurable-Player-Collision.patch @@ -1,4 +1,4 @@ -From a5ffdd4c67dcea575adf72616c30225d80ed31a1 Mon Sep 17 00:00:00 2001 +From e54e91c0d241e40804c85e1945598297d4581435 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision diff --git a/Spigot-Server-Patches/0129-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0128-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 96% rename from Spigot-Server-Patches/0129-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to Spigot-Server-Patches/0128-Add-handshake-event-to-allow-plugins-to-handle-clien.patch index db2747c9b8..6eac6d6cbd 100644 --- a/Spigot-Server-Patches/0129-Add-handshake-event-to-allow-plugins-to-handle-clien.patch +++ b/Spigot-Server-Patches/0128-Add-handshake-event-to-allow-plugins-to-handle-clien.patch @@ -1,4 +1,4 @@ -From 1c0510dc27ac8561fd19ace91b8e07b62359a56d Mon Sep 17 00:00:00 2001 +From 932b4c5f20a991af6cc4d4c72307846d3ae86934 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 13 Apr 2016 20:21:38 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 37c5fe5..acfcb80 100644 +index e6b6a5f..4924114 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener { diff --git a/Spigot-Server-Patches/0130-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0129-Water-mobs-should-only-spawn-in-the-water.patch similarity index 94% rename from Spigot-Server-Patches/0130-Water-mobs-should-only-spawn-in-the-water.patch rename to Spigot-Server-Patches/0129-Water-mobs-should-only-spawn-in-the-water.patch index e3c36b586c..7f8a236b25 100644 --- a/Spigot-Server-Patches/0130-Water-mobs-should-only-spawn-in-the-water.patch +++ b/Spigot-Server-Patches/0129-Water-mobs-should-only-spawn-in-the-water.patch @@ -1,4 +1,4 @@ -From 6aac550ebf2a897af86f4bbc51447b5a23fe7d0b Mon Sep 17 00:00:00 2001 +From 8c7bdea0775d23f2fc9f8c4990ea553a01db518c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 14 Apr 2016 17:48:56 -0500 Subject: [PATCH] Water mobs should only spawn in the water diff --git a/Spigot-Server-Patches/0131-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0130-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch similarity index 97% rename from Spigot-Server-Patches/0131-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch rename to Spigot-Server-Patches/0130-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch index b78f6f0c24..b9cfbff1fe 100644 --- a/Spigot-Server-Patches/0131-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch +++ b/Spigot-Server-Patches/0130-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch @@ -1,4 +1,4 @@ -From 620bc10becb8a69aa1e8b4b46f6f8bf0f1549ef7 Mon Sep 17 00:00:00 2001 +From 97e7f928c9973258f76b6859e90e5ac722d3a167 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 14 Apr 2016 21:01:39 -0400 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic @@ -56,5 +56,5 @@ index ea0a145..689d664 100644 Iterator iterator1 = this.b.iterator(); -- -2.9.0.windows.1 +2.9.0 diff --git a/Spigot-Server-Patches/0132-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0131-Configurable-RCON-IP-address.patch similarity index 93% rename from Spigot-Server-Patches/0132-Configurable-RCON-IP-address.patch rename to Spigot-Server-Patches/0131-Configurable-RCON-IP-address.patch index 9298bfffa2..6a43c5ef9a 100644 --- a/Spigot-Server-Patches/0132-Configurable-RCON-IP-address.patch +++ b/Spigot-Server-Patches/0131-Configurable-RCON-IP-address.patch @@ -1,4 +1,4 @@ -From 268412ca895a48808c55da85f821fca73aee1663 Mon Sep 17 00:00:00 2001 +From aa7c8f794c8b3e822a2654e35e854a06793a0cef Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Apr 2016 00:39:33 -0400 Subject: [PATCH] Configurable RCON IP address diff --git a/Spigot-Server-Patches/0133-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0132-Prevent-Fire-from-loading-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0133-Prevent-Fire-from-loading-chunks.patch rename to Spigot-Server-Patches/0132-Prevent-Fire-from-loading-chunks.patch index 74f8dc7102..cd5cd372dd 100644 --- a/Spigot-Server-Patches/0133-Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0132-Prevent-Fire-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 265813111c36cb9a5b4e4e3cbbb056843e6d08fe Mon Sep 17 00:00:00 2001 +From 2ebba064cb23a4a029c934eb31489ecde9d4515e 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 cb11099..951f0cf 100644 +index 1b91f58..c348221 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -162,6 +162,7 @@ public class BlockFire extends Block { diff --git a/Spigot-Server-Patches/0134-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0133-Implement-PlayerLocaleChangeEvent.patch similarity index 96% rename from Spigot-Server-Patches/0134-Implement-PlayerLocaleChangeEvent.patch rename to Spigot-Server-Patches/0133-Implement-PlayerLocaleChangeEvent.patch index 166db2cea9..3ec09c9e6d 100644 --- a/Spigot-Server-Patches/0134-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0133-Implement-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From 6f704a2371844fedc58d1c405720b925db4bc2b6 Mon Sep 17 00:00:00 2001 +From c66b249b8794962b07fbb6a62fb90ca4e2909f79 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent @@ -50,5 +50,5 @@ index f2d1b21..3b95336 100644 @Override -- -2.9.0.windows.1 +2.9.0 diff --git a/Spigot-Server-Patches/0135-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0134-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 94% rename from Spigot-Server-Patches/0135-EntityRegainHealthEvent-isFastRegen-API.patch rename to Spigot-Server-Patches/0134-EntityRegainHealthEvent-isFastRegen-API.patch index 97adeb3c53..366abc7052 100644 --- a/Spigot-Server-Patches/0135-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0134-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From aed3ba5574b80a82667f18b5ad45afa40b7aea01 Mon Sep 17 00:00:00 2001 +From edca212c630c31ac0237763ea0eee1ab0c7c6935 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 ff9096f..22333ea 100644 +index d66e766..526a608 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -741,10 +741,16 @@ public abstract class EntityLiving extends Entity { @@ -28,7 +28,7 @@ index ff9096f..22333ea 100644 if (!event.isCancelled()) { diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java -index af4f97e..df31391 100644 +index 3a7ce8d..46acda8 100644 --- a/src/main/java/net/minecraft/server/FoodMetaData.java +++ b/src/main/java/net/minecraft/server/FoodMetaData.java @@ -65,7 +65,7 @@ public class FoodMetaData { diff --git a/Spigot-Server-Patches/0136-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0135-Add-ability-to-configure-frosted_ice-properties.patch similarity index 94% rename from Spigot-Server-Patches/0136-Add-ability-to-configure-frosted_ice-properties.patch rename to Spigot-Server-Patches/0135-Add-ability-to-configure-frosted_ice-properties.patch index dd3abc51eb..587b6501e3 100644 --- a/Spigot-Server-Patches/0136-Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/0135-Add-ability-to-configure-frosted_ice-properties.patch @@ -1,14 +1,14 @@ -From 9c70f718778daa5d3acad4c64766d5dc547b11fc Mon Sep 17 00:00:00 2001 +From 0f139e290ef995b66d3e02c259c0145fe1e1bb43 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 35364c7..31b6dce 100644 +index 66cd256..ff43adf 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -323,4 +323,14 @@ public class PaperWorldConfig { +@@ -318,4 +318,14 @@ public class PaperWorldConfig { private void useVanillaScoreboardColoring() { useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false); } diff --git a/Spigot-Server-Patches/0137-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0136-Vehicle-Event-Cancellation-Changes.patch similarity index 98% rename from Spigot-Server-Patches/0137-Vehicle-Event-Cancellation-Changes.patch rename to Spigot-Server-Patches/0136-Vehicle-Event-Cancellation-Changes.patch index f74893ed14..92da6a3987 100644 --- a/Spigot-Server-Patches/0137-Vehicle-Event-Cancellation-Changes.patch +++ b/Spigot-Server-Patches/0136-Vehicle-Event-Cancellation-Changes.patch @@ -1,4 +1,4 @@ -From d3f148dd37236f33449d8ec4dbb8237b4eb2dc19 Mon Sep 17 00:00:00 2001 +From 7563254d185f9f3e5dbcceee91d50bb6cb11699e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 18:20:05 -0500 Subject: [PATCH] Vehicle Event Cancellation Changes diff --git a/Spigot-Server-Patches/0138-Arrow-pickup-rule-API.patch b/Spigot-Server-Patches/0137-Arrow-pickup-rule-API.patch similarity index 96% rename from Spigot-Server-Patches/0138-Arrow-pickup-rule-API.patch rename to Spigot-Server-Patches/0137-Arrow-pickup-rule-API.patch index efbd7b2782..a9e8c27d3a 100644 --- a/Spigot-Server-Patches/0138-Arrow-pickup-rule-API.patch +++ b/Spigot-Server-Patches/0137-Arrow-pickup-rule-API.patch @@ -1,4 +1,4 @@ -From 4a3c1ad5500406d3e6f6c221ef8a0a1c3b012202 Mon Sep 17 00:00:00 2001 +From d516471964dec4d3be6a8ad3c45ce9f2c5aa6ae4 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 4 Mar 2016 03:16:11 -0500 Subject: [PATCH] Arrow pickup rule API diff --git a/Spigot-Server-Patches/0139-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0138-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch similarity index 97% rename from Spigot-Server-Patches/0139-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch rename to Spigot-Server-Patches/0138-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch index dfd04bd03c..f223fec2d9 100644 --- a/Spigot-Server-Patches/0139-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch +++ b/Spigot-Server-Patches/0138-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch @@ -1,4 +1,4 @@ -From ba9bd41e146d01da235510663be86a00a5cf579e Mon Sep 17 00:00:00 2001 +From f002823fc5c12030ba743369eb1e94378e739785 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 24 Apr 2016 19:49:33 -0500 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement diff --git a/Spigot-Server-Patches/0140-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0139-Improve-Minecraft-Hopper-Performance.patch similarity index 86% rename from Spigot-Server-Patches/0140-Improve-Minecraft-Hopper-Performance.patch rename to Spigot-Server-Patches/0139-Improve-Minecraft-Hopper-Performance.patch index 26c9105ff2..7dcedaa51d 100644 --- a/Spigot-Server-Patches/0140-Improve-Minecraft-Hopper-Performance.patch +++ b/Spigot-Server-Patches/0139-Improve-Minecraft-Hopper-Performance.patch @@ -1,4 +1,4 @@ -From 8e86f7031c88407a8f3e9886b3ba6acde9ccf17c Mon Sep 17 00:00:00 2001 +From 8e260c809d1afee280d65923fb11060cfa9f816b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Improve Minecraft Hopper Performance @@ -27,18 +27,18 @@ index 9fa93ed..cd39fe5 100644 this.h = iblockdata.getBlock().toLegacyData(iblockdata); diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index 197bdfe..8717ae1 100644 +index d1ce2b9..0d521ca 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java -@@ -194,6 +194,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi +@@ -188,6 +188,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi + return true; } - // Paper end } + return false; } else { return false; -@@ -505,7 +506,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi +@@ -499,7 +500,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi boolean flag = false; if (itemstack1 == null) { @@ -48,7 +48,7 @@ index 197bdfe..8717ae1 100644 itemstack = null; flag = true; } else if (a(itemstack1, itemstack)) { -@@ -525,7 +528,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi +@@ -519,7 +522,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi tileentityhopper.setCooldown(tileentityhopper.world.spigotConfig.hopperTransfer); // Spigot } @@ -57,7 +57,7 @@ index 197bdfe..8717ae1 100644 } iinventory.update(); -@@ -600,6 +603,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi +@@ -594,6 +597,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi this.g = i; } diff --git a/Spigot-Server-Patches/0141-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0140-remove-null-possibility-for-getServer-singleton.patch similarity index 95% rename from Spigot-Server-Patches/0141-remove-null-possibility-for-getServer-singleton.patch rename to Spigot-Server-Patches/0140-remove-null-possibility-for-getServer-singleton.patch index 32c48b9b5b..30ef7a757a 100644 --- a/Spigot-Server-Patches/0141-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0140-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From 85d6076c686ce99de7e8d9b88f2958e1e63beeae Mon Sep 17 00:00:00 2001 +From dacca2062e728db236143b67b73b42384e293ea8 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 @@ -35,5 +35,5 @@ index 89b8595..0ebc566 100644 // CraftBukkit end } -- -2.9.0.windows.1 +2.9.0 diff --git a/Spigot-Server-Patches/0142-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0141-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 98% rename from Spigot-Server-Patches/0142-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to Spigot-Server-Patches/0141-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 299637e7b3..e0cd27eaff 100644 --- a/Spigot-Server-Patches/0142-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0141-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From 2a93008a600628a5df218771c20eeb641af1f49e Mon Sep 17 00:00:00 2001 +From d82a27a283eead01abc6d430db1858d92fcd5614 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 @@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index cddc7f4..6b0af31 100644 +index 35f4647..301313b 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -594,6 +594,12 @@ public abstract class EntityHuman extends EntityLiving { @@ -48,7 +48,7 @@ index 413925e..f505e3c 100644 Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8479c6e..98fe386 100644 +index 71c5596..1d47a117 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1157,6 +1157,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0143-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0142-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 99% rename from Spigot-Server-Patches/0143-LootTable-API-Replenishable-Lootables-Feature.patch rename to Spigot-Server-Patches/0142-LootTable-API-Replenishable-Lootables-Feature.patch index 061b69090c..0698f36fa1 100644 --- a/Spigot-Server-Patches/0143-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0142-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From 0e07bd7fe9f2f38d0339008bd2793aa6a24a73cd Mon Sep 17 00:00:00 2001 +From e3e59a3f8a478c2cb64be5034fd90c9fa8f7b010 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 @@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players do not suffer with "Every chest has been looted" diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 31b6dce..a1ccdf1 100644 +index ff43adf..85ec842 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -333,4 +333,26 @@ public class PaperWorldConfig { +@@ -328,4 +328,26 @@ public class PaperWorldConfig { this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax); this.log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax); } diff --git a/Spigot-Server-Patches/0144-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0143-Do-not-load-chunks-for-pathfinding.patch similarity index 88% rename from Spigot-Server-Patches/0144-Do-not-load-chunks-for-pathfinding.patch rename to Spigot-Server-Patches/0143-Do-not-load-chunks-for-pathfinding.patch index 3d653e3bde..b0aff0c44f 100644 --- a/Spigot-Server-Patches/0144-Do-not-load-chunks-for-pathfinding.patch +++ b/Spigot-Server-Patches/0143-Do-not-load-chunks-for-pathfinding.patch @@ -1,11 +1,11 @@ -From 317f5c917e682c5e8c4aab755556541a015f2e6e Mon Sep 17 00:00:00 2001 +From c164f08d8f17aea4a3b5e81f958cf73b00910770 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Jan 2016 00:13:19 -0500 Subject: [PATCH] Do not load chunks for pathfinding diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java -index a8fd64c..11c11cf 100644 +index 08b986f..786d1dd 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java +++ b/src/main/java/net/minecraft/server/ChunkCache.java @@ -25,7 +25,7 @@ public class ChunkCache implements IBlockAccess { diff --git a/Spigot-Server-Patches/0145-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0144-Entity-Tracking-Improvements.patch similarity index 98% rename from Spigot-Server-Patches/0145-Entity-Tracking-Improvements.patch rename to Spigot-Server-Patches/0144-Entity-Tracking-Improvements.patch index a03e08185c..99447ba4da 100644 --- a/Spigot-Server-Patches/0145-Entity-Tracking-Improvements.patch +++ b/Spigot-Server-Patches/0144-Entity-Tracking-Improvements.patch @@ -1,4 +1,4 @@ -From 8b396c2ea8d8042baef4042fc6fec5bb2fb6152f Mon Sep 17 00:00:00 2001 +From 902f690e113947532f0c08031184f7fec14fa556 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Jun 2013 01:24:00 -0400 Subject: [PATCH] Entity Tracking Improvements diff --git a/Spigot-Server-Patches/0146-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0145-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 96% rename from Spigot-Server-Patches/0146-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to Spigot-Server-Patches/0145-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index 209da4f1fa..777c28f5d8 100644 --- a/Spigot-Server-Patches/0146-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/0145-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,4 +1,4 @@ -From 7ac9506d355be738247bdc6cfc04894ce8ab7f8b Mon Sep 17 00:00:00 2001 +From 82896572dc9a1c06cf4187c6a1d2d9f4c697d91e 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/Spigot-Server-Patches/0147-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0146-Do-not-mark-chunks-as-active-for-neighbor-updates.patch similarity index 97% rename from Spigot-Server-Patches/0147-Do-not-mark-chunks-as-active-for-neighbor-updates.patch rename to Spigot-Server-Patches/0146-Do-not-mark-chunks-as-active-for-neighbor-updates.patch index 677422d048..3a7d4961da 100644 --- a/Spigot-Server-Patches/0147-Do-not-mark-chunks-as-active-for-neighbor-updates.patch +++ b/Spigot-Server-Patches/0146-Do-not-mark-chunks-as-active-for-neighbor-updates.patch @@ -1,4 +1,4 @@ -From 9d9f8c72a5dcc526b661b7f906279cfde77f0ddf Mon Sep 17 00:00:00 2001 +From 0e65ff66c8c94dc9c00b79e0a2135f9339d33f5a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 01:55:17 -0400 Subject: [PATCH] Do not mark chunks as active for neighbor updates diff --git a/Spigot-Server-Patches/0148-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0147-Fix-Chunk-Unload-Queue-Issues.patch similarity index 95% rename from Spigot-Server-Patches/0148-Fix-Chunk-Unload-Queue-Issues.patch rename to Spigot-Server-Patches/0147-Fix-Chunk-Unload-Queue-Issues.patch index 1a4b88f1ff..f4ed05cd16 100644 --- a/Spigot-Server-Patches/0148-Fix-Chunk-Unload-Queue-Issues.patch +++ b/Spigot-Server-Patches/0147-Fix-Chunk-Unload-Queue-Issues.patch @@ -1,4 +1,4 @@ -From babbc2a5f3b448c1f07439bae81567532f6bb24c Mon Sep 17 00:00:00 2001 +From 92791e6828546727d6ef0b510e719e54ec9a46bf Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 02:03:56 -0400 Subject: [PATCH] Fix Chunk Unload Queue Issues @@ -34,5 +34,5 @@ index d4587c7..804a0ca 100644 continue; } -- -2.9.0.windows.1 +2.9.0 diff --git a/Spigot-Server-Patches/0149-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0148-System-property-for-disabling-watchdoge.patch similarity index 93% rename from Spigot-Server-Patches/0149-System-property-for-disabling-watchdoge.patch rename to Spigot-Server-Patches/0148-System-property-for-disabling-watchdoge.patch index 76b3043f13..82cad2f606 100644 --- a/Spigot-Server-Patches/0149-System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/0148-System-property-for-disabling-watchdoge.patch @@ -1,4 +1,4 @@ -From 74b09046787728d12af571cf9ed96cb54ea3b3eb Mon Sep 17 00:00:00 2001 +From dcae4af3de8f9765d40e44cc94230d13249b9311 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 diff --git a/Spigot-Server-Patches/0150-Optimize-EAR.patch b/Spigot-Server-Patches/0149-Optimize-EAR.patch similarity index 97% rename from Spigot-Server-Patches/0150-Optimize-EAR.patch rename to Spigot-Server-Patches/0149-Optimize-EAR.patch index 5aa2063d88..aaea936568 100644 --- a/Spigot-Server-Patches/0150-Optimize-EAR.patch +++ b/Spigot-Server-Patches/0149-Optimize-EAR.patch @@ -1,4 +1,4 @@ -From 978ed103e4eaa5ba1b5ed1688cebf74407c6c6fb Mon Sep 17 00:00:00 2001 +From 9a999fd2a115d4b40ec75b099475b0a5fb20e098 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Optimize EAR diff --git a/Spigot-Server-Patches/0151-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0150-Optimize-UserCache-Thread-Safe.patch similarity index 97% rename from Spigot-Server-Patches/0151-Optimize-UserCache-Thread-Safe.patch rename to Spigot-Server-Patches/0150-Optimize-UserCache-Thread-Safe.patch index ce1008e0e9..97095427ed 100644 --- a/Spigot-Server-Patches/0151-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0150-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From 738cd6e34f6484356db8a62bf78ce72369689b67 Mon Sep 17 00:00:00 2001 +From 5a0164ee5a2819b509ad6848ec7aeac438d7f95f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 20:47:41 -0400 Subject: [PATCH] Optimize UserCache / Thread Safe @@ -96,5 +96,5 @@ index ccfc755..989758c 100644 } -- -2.9.0.windows.1 +2.9.0 diff --git a/Spigot-Server-Patches/0152-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0151-Avoid-blocking-on-Network-Manager-creation.patch similarity index 97% rename from Spigot-Server-Patches/0152-Avoid-blocking-on-Network-Manager-creation.patch rename to Spigot-Server-Patches/0151-Avoid-blocking-on-Network-Manager-creation.patch index 62d3282401..4b57159063 100644 --- a/Spigot-Server-Patches/0152-Avoid-blocking-on-Network-Manager-creation.patch +++ b/Spigot-Server-Patches/0151-Avoid-blocking-on-Network-Manager-creation.patch @@ -1,4 +1,4 @@ -From 65bb8c055d3f07c5df69406f9969f0f09f40a54c Mon Sep 17 00:00:00 2001 +From a4a3433307cd3424707cde90eb7446217e0c4426 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 diff --git a/Spigot-Server-Patches/0153-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0152-Optional-old-TNT-cannon-behaviors.patch similarity index 98% rename from Spigot-Server-Patches/0153-Optional-old-TNT-cannon-behaviors.patch rename to Spigot-Server-Patches/0152-Optional-old-TNT-cannon-behaviors.patch index 56ad6ef454..53e50700d4 100644 --- a/Spigot-Server-Patches/0153-Optional-old-TNT-cannon-behaviors.patch +++ b/Spigot-Server-Patches/0152-Optional-old-TNT-cannon-behaviors.patch @@ -1,14 +1,14 @@ -From 0b99c1d2c6975ae263684e303a29e592de348b90 Mon Sep 17 00:00:00 2001 +From 1c549e3bb8a05d3e9af84f9af79ebebab8713633 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional old TNT cannon behaviors diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a1ccdf1..40ede20 100644 +index 85ec842..cc5e299 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -355,4 +355,12 @@ public class PaperWorldConfig { +@@ -350,4 +350,12 @@ public class PaperWorldConfig { ); } } @@ -161,7 +161,7 @@ index 93671ed..661c4f9 100644 int i = aenumdirection.length; diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java -index 4e5b437..084d4ca 100644 +index bfb27ed..b1ba434 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -31,7 +31,11 @@ public class BlockTNT extends Block { @@ -264,7 +264,7 @@ index 797e078..e21769f 100644 } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index bab3cd6..491bb11 100644 +index a1392d6..4fd4371 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -279,4 +279,19 @@ public class EntityFallingBlock extends Entity { diff --git a/Spigot-Server-Patches/0154-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0153-Faster-redstone-torch-rapid-clock-removal.patch similarity index 96% rename from Spigot-Server-Patches/0154-Faster-redstone-torch-rapid-clock-removal.patch rename to Spigot-Server-Patches/0153-Faster-redstone-torch-rapid-clock-removal.patch index 28baf81a08..ee9b2a7b22 100644 --- a/Spigot-Server-Patches/0154-Faster-redstone-torch-rapid-clock-removal.patch +++ b/Spigot-Server-Patches/0153-Faster-redstone-torch-rapid-clock-removal.patch @@ -1,4 +1,4 @@ -From a8db9e77254e61637f9d6dc91d32ffae503a906f Mon Sep 17 00:00:00 2001 +From 9bd888b23873214255d8a861baed7f37031c2573 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 diff --git a/Spigot-Server-Patches/0155-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0154-Ensure-Chunks-never-ever-load-async.patch similarity index 97% rename from Spigot-Server-Patches/0155-Ensure-Chunks-never-ever-load-async.patch rename to Spigot-Server-Patches/0154-Ensure-Chunks-never-ever-load-async.patch index 40582c4367..6ff76b606b 100644 --- a/Spigot-Server-Patches/0155-Ensure-Chunks-never-ever-load-async.patch +++ b/Spigot-Server-Patches/0154-Ensure-Chunks-never-ever-load-async.patch @@ -1,4 +1,4 @@ -From 25592434ec7fe95f5483120367d14d1edea8bcd3 Mon Sep 17 00:00:00 2001 +From 92803c14313b5cfc5233b87681224509507ef209 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 27 May 2016 21:41:26 -0400 Subject: [PATCH] Ensure Chunks never ever load async diff --git a/Spigot-Server-Patches/0156-Add-server-name-parameter.patch b/Spigot-Server-Patches/0155-Add-server-name-parameter.patch similarity index 93% rename from Spigot-Server-Patches/0156-Add-server-name-parameter.patch rename to Spigot-Server-Patches/0155-Add-server-name-parameter.patch index c3bab44afb..68d498e523 100644 --- a/Spigot-Server-Patches/0156-Add-server-name-parameter.patch +++ b/Spigot-Server-Patches/0155-Add-server-name-parameter.patch @@ -1,4 +1,4 @@ -From 95181b1be4b40ab1f97c961e46e050b149058c06 Mon Sep 17 00:00:00 2001 +From e38184e39c84315c5fc2c50c76907d79a09ac5ef 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 diff --git a/Spigot-Server-Patches/0157-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0156-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch similarity index 97% rename from Spigot-Server-Patches/0157-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch rename to Spigot-Server-Patches/0156-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index 73611f868b..10a7853a24 100644 --- a/Spigot-Server-Patches/0157-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/Spigot-Server-Patches/0156-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From de41589e5bd952353fff7e4bfc4309b30248a425 Mon Sep 17 00:00:00 2001 +From 9b2cd4cee78850aa052dd8cc6d63cf0d45a79fc4 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 @@ -25,7 +25,7 @@ index 5c5452d..166d893 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 c7031fc..1556a24 100644 +index 48b5b2c..6749211 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -202,8 +202,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity { diff --git a/Spigot-Server-Patches/0158-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0157-Fix-FallingBlocks-being-stuck-on-fences.patch similarity index 97% rename from Spigot-Server-Patches/0158-Fix-FallingBlocks-being-stuck-on-fences.patch rename to Spigot-Server-Patches/0157-Fix-FallingBlocks-being-stuck-on-fences.patch index 1e692a57f2..f6cac09517 100644 --- a/Spigot-Server-Patches/0158-Fix-FallingBlocks-being-stuck-on-fences.patch +++ b/Spigot-Server-Patches/0157-Fix-FallingBlocks-being-stuck-on-fences.patch @@ -1,4 +1,4 @@ -From 610fa07bea7c553af786537d9db36131aff1c1e5 Mon Sep 17 00:00:00 2001 +From d11bdc71163cd991a87f8268bbf0a7f9ac06a9ff Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Fri, 3 Jun 2016 23:13:39 +0200 Subject: [PATCH] Fix FallingBlocks being stuck on fences @@ -27,7 +27,7 @@ index 8f22dab..d3a0d70 100644 public void a_(World world, BlockPosition blockposition) {} } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 491bb11..0d8c438 100644 +index 4fd4371..c4d90b0 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -2,7 +2,9 @@ package net.minecraft.server; diff --git a/Spigot-Server-Patches/0159-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch similarity index 96% rename from Spigot-Server-Patches/0159-Make-entities-look-for-hoppers.patch rename to Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch index 57d859e7ce..e949b99aae 100644 --- a/Spigot-Server-Patches/0159-Make-entities-look-for-hoppers.patch +++ b/Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch @@ -1,4 +1,4 @@ -From 44e70ca5f30e4f5521e805856fba34836f16bb58 Mon Sep 17 00:00:00 2001 +From 383580daebc049ec250ab08834a38b4a99be07f6 Mon Sep 17 00:00:00 2001 From: Techcable Date: Sat, 18 Jun 2016 01:01:37 -0500 Subject: [PATCH] Make entities look for hoppers @@ -78,10 +78,10 @@ index 0000000..5ff43e2 + double getZ(); +} diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 40ede20..0d2af96 100644 +index cc5e299..b811775 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -363,4 +363,9 @@ public class PaperWorldConfig { +@@ -358,4 +358,9 @@ public class PaperWorldConfig { log("Old Cannon Behaviors: This feature may not be working entirely properly at the moment"); } } @@ -237,7 +237,7 @@ index 804215a..e830d83 100644 + double G(); default double getZ() { return G(); } // Paper - OBFHELPER } diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index 8717ae1..cefd659 100644 +index 0d521ca..40cb778 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -170,6 +170,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -256,7 +256,7 @@ index 8717ae1..cefd659 100644 flag = a((IHopper) this) || flag; } -@@ -201,6 +203,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi +@@ -195,6 +197,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi } } @@ -271,7 +271,7 @@ index 8717ae1..cefd659 100644 private boolean q() { ItemStack[] aitemstack = this.items; int i = aitemstack.length; -@@ -344,8 +354,15 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi +@@ -338,8 +348,15 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi return true; } @@ -288,7 +288,7 @@ index 8717ae1..cefd659 100644 if (iinventory != null) { EnumDirection enumdirection = EnumDirection.DOWN; -@@ -376,8 +393,8 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi +@@ -370,8 +387,8 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi } } } @@ -299,7 +299,7 @@ index 8717ae1..cefd659 100644 while (iterator.hasNext()) { EntityItem entityitem = (EntityItem) iterator.next(); -@@ -541,18 +558,44 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi +@@ -535,18 +552,44 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi private IInventory I() { EnumDirection enumdirection = BlockHopper.e(this.u()); @@ -348,7 +348,7 @@ index 8717ae1..cefd659 100644 Object object = null; int i = MathHelper.floor(d0); int j = MathHelper.floor(d1); -@@ -572,7 +615,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi +@@ -566,7 +609,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi } } diff --git a/Spigot-Server-Patches/0160-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch b/Spigot-Server-Patches/0159-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch similarity index 94% rename from Spigot-Server-Patches/0160-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch rename to Spigot-Server-Patches/0159-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch index 670e9d27d7..3fc9aa11fc 100644 --- a/Spigot-Server-Patches/0160-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch +++ b/Spigot-Server-Patches/0159-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch @@ -1,4 +1,4 @@ -From ba5e8b5f94fadd4ed864bfe5fa20d774afacd116 Mon Sep 17 00:00:00 2001 +From e264dce82841fb275c6b8ad493f0575a22449fcd Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 01:49:22 -0400 Subject: [PATCH] Remove the item from the correct hand when spawn egg depletes @@ -18,7 +18,7 @@ index 6092346..c1e9cbf 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 22333ea..4e424aa 100644 +index 526a608..837bc25 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1407,6 +1407,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0161-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0160-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 97% rename from Spigot-Server-Patches/0161-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to Spigot-Server-Patches/0160-Delay-Chunk-Unloads-based-on-Player-Movement.patch index db39ceba21..989d92852e 100644 --- a/Spigot-Server-Patches/0161-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0160-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From 0341934c1b8dff5cc3be6e3093e23802fbc70162 Mon Sep 17 00:00:00 2001 +From 8c5533d2f02936af9b92553c6dae717de161f10a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement @@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s wasting cpu cycles on saving/unloading/reloading chunks repeatedly. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0d2af96..327a784 100644 +index b811775..60a7dec 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -364,6 +364,15 @@ public class PaperWorldConfig { +@@ -359,6 +359,15 @@ public class PaperWorldConfig { } } @@ -142,5 +142,5 @@ index 1994401..f62878d 100644 } -- -2.9.0.windows.1 +2.9.0 diff --git a/Spigot-Server-Patches/0162-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0161-Toggleable-Elytra-Wall-Damage.patch similarity index 91% rename from Spigot-Server-Patches/0162-Toggleable-Elytra-Wall-Damage.patch rename to Spigot-Server-Patches/0161-Toggleable-Elytra-Wall-Damage.patch index 5149961d1d..42c1c3e71d 100644 --- a/Spigot-Server-Patches/0162-Toggleable-Elytra-Wall-Damage.patch +++ b/Spigot-Server-Patches/0161-Toggleable-Elytra-Wall-Damage.patch @@ -1,4 +1,4 @@ -From d11dffe661160ffca87ac3040088bbae3033ca11 Mon Sep 17 00:00:00 2001 +From a0d46c98b0317cfaea271d536f0fa0cf8dc79167 Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Sat, 18 Jun 2016 23:13:59 -0700 Subject: [PATCH] Toggleable Elytra Wall Damage @@ -7,10 +7,10 @@ Instead of calculating the damage taken from hitting a wall, you can disable it in the config. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bc41b7e..e3fe8f4 100644 +index 60a7dec..ef08901 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -377,4 +377,9 @@ public class PaperWorldConfig { +@@ -372,4 +372,9 @@ public class PaperWorldConfig { private void isHopperPushBased() { isHopperPushBased = getBoolean("hopper.push-based", true); } @@ -21,7 +21,7 @@ index bc41b7e..e3fe8f4 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 4e424aa..af0127e 100644 +index 837bc25..7162a9e 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1615,6 +1615,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0163-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0162-Fix-Double-World-Add-issues.patch similarity index 96% rename from Spigot-Server-Patches/0163-Fix-Double-World-Add-issues.patch rename to Spigot-Server-Patches/0162-Fix-Double-World-Add-issues.patch index 55678e5420..70fad98eae 100644 --- a/Spigot-Server-Patches/0163-Fix-Double-World-Add-issues.patch +++ b/Spigot-Server-Patches/0162-Fix-Double-World-Add-issues.patch @@ -1,4 +1,4 @@ -From 9da78f3ccd27315e302b125de518bab9738738a5 Mon Sep 17 00:00:00 2001 +From 708ec78c486d50b760a68c5c6428386594eb726c 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/0164-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0163-Fix-Old-Sign-Conversion.patch similarity index 98% rename from Spigot-Server-Patches/0164-Fix-Old-Sign-Conversion.patch rename to Spigot-Server-Patches/0163-Fix-Old-Sign-Conversion.patch index 2ac3996b5c..edc6a9b38f 100644 --- a/Spigot-Server-Patches/0164-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0163-Fix-Old-Sign-Conversion.patch @@ -1,4 +1,4 @@ -From d96b5d305be2afc856d652f1f746f62011e74fec Mon Sep 17 00:00:00 2001 +From 86f0e7cbd8a6e8dea5171f523e8e721b8e905d13 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 17 Jun 2016 20:50:11 -0400 Subject: [PATCH] Fix Old Sign Conversion diff --git a/Spigot-Server-Patches/0165-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch b/Spigot-Server-Patches/0164-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch similarity index 98% rename from Spigot-Server-Patches/0165-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch rename to Spigot-Server-Patches/0164-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch index 89024a6cd4..0f259e75bf 100644 --- a/Spigot-Server-Patches/0165-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch +++ b/Spigot-Server-Patches/0164-Don-t-try-and-fix-TileEntities-as-they-are-removed.patch @@ -1,4 +1,4 @@ -From 0c57cddcc662b2ad9f8eeb4fa39b4294a736d05e Mon Sep 17 00:00:00 2001 +From c3cbec2dac54b188c30930c86de012cc2700423b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 25 Jun 2016 23:55:56 -0500 Subject: [PATCH] Don't try and fix TileEntities as they are removed @@ -93,7 +93,7 @@ index f7d9a7c..383eef2 100644 if (tileentity != null && this.M) { tileentity.y(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3377f97..269ae39 100644 +index d448277..bd43075 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -123,8 +123,16 @@ public class WorldServer extends World implements IAsyncTaskHandler {