diff --git a/Spigot-Server-Patches/0012-Inverted-Daylight-Detector-Toggle.patch b/Spigot-Server-Patches/0011-Inverted-Daylight-Detector-Toggle.patch similarity index 97% rename from Spigot-Server-Patches/0012-Inverted-Daylight-Detector-Toggle.patch rename to Spigot-Server-Patches/0011-Inverted-Daylight-Detector-Toggle.patch index 5e1efecab8..4db9132e36 100644 --- a/Spigot-Server-Patches/0012-Inverted-Daylight-Detector-Toggle.patch +++ b/Spigot-Server-Patches/0011-Inverted-Daylight-Detector-Toggle.patch @@ -1,4 +1,4 @@ -From 4d27753cb0ac3a0478d4ed812756ebea206810ca Mon Sep 17 00:00:00 2001 +From c9b0f38fcb015f0c1b7e8fb73eb0c71f5ed31b61 Mon Sep 17 00:00:00 2001 From: gsand Date: Tue, 5 Aug 2014 17:31:07 -0500 Subject: [PATCH] Inverted Daylight Detector Toggle diff --git a/Spigot-Server-Patches/0011-Make-destroyed-boats-drop-the-boat-item.patch b/Spigot-Server-Patches/0011-Make-destroyed-boats-drop-the-boat-item.patch deleted file mode 100644 index 72fba42735..0000000000 --- a/Spigot-Server-Patches/0011-Make-destroyed-boats-drop-the-boat-item.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 2061a29a13433a363db267060f55d7190c5752d4 Mon Sep 17 00:00:00 2001 -From: Zach Brown -Date: Fri, 30 May 2014 19:42:50 -0500 -Subject: [PATCH] Make destroyed boats drop the boat item - - -diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java -index c9f2b13..5a9a527 100644 ---- a/src/main/java/net/minecraft/server/EntityBoat.java -+++ b/src/main/java/net/minecraft/server/EntityBoat.java -@@ -337,13 +337,19 @@ public class EntityBoat extends Entity { - if (!destroyEvent.isCancelled()) { - this.die(); - -- for (k = 0; k < 3; ++k) { -- this.a(Item.getItemOf(Blocks.WOOD), 1, 0.0F); -- } -+ // PaperSpigot start - Boats should drop boats!!!11 -+ //for (k = 0; k < 3; ++k) { -+ // this.a(Item.getItemOf(Blocks.WOOD), 1, 0.0F); -+ //} -+ -+ //for (k = 0; k < 2; ++k) { -+ // this.a(Items.STICK, 1, 0.0F); -+ //} - -- for (k = 0; k < 2; ++k) { -- this.a(Items.STICK, 1, 0.0F); -+ for (k = 0; k < 1; ++k) { -+ this.a(Items.BOAT, 1, 0.0F); - } -+ // PaperSpigot end - } - // CraftBukkit end - } -@@ -454,13 +460,19 @@ public class EntityBoat extends Entity { - - int l; - -- for (l = 0; l < 3; ++l) { -- this.a(Item.getItemOf(Blocks.WOOD), 1, 0.0F); -- } -+ // PaperSpigot start - Boats should drop boats!!!11 -+ //for (l = 0; l < 3; ++l) { -+ // this.a(Item.getItemOf(Blocks.WOOD), 1, 0.0F); -+ //} -+ -+ //for (l = 0; l < 2; ++l) { -+ // this.a(Items.STICK, 1, 0.0F); -+ //} - -- for (l = 0; l < 2; ++l) { -- this.a(Items.STICK, 1, 0.0F); -+ for (l = 0; l < 1; ++l) { -+ this.a(Items.BOAT, 1, 0.0F); - } -+ // PaperSpigot end - } - // CraftBukkit end - } --- -1.9.1 - diff --git a/Spigot-Server-Patches/0013-Add-1.8-recipes-for-stone-variants.patch b/Spigot-Server-Patches/0012-Add-1.8-recipes-for-stone-variants.patch similarity index 97% rename from Spigot-Server-Patches/0013-Add-1.8-recipes-for-stone-variants.patch rename to Spigot-Server-Patches/0012-Add-1.8-recipes-for-stone-variants.patch index 239ae8127b..5b2678e8b8 100644 --- a/Spigot-Server-Patches/0013-Add-1.8-recipes-for-stone-variants.patch +++ b/Spigot-Server-Patches/0012-Add-1.8-recipes-for-stone-variants.patch @@ -1,4 +1,4 @@ -From ea2ab58dbe50e2e9fb276de0e41d67daebfdc692 Mon Sep 17 00:00:00 2001 +From 524020b85b36ea7e052ecb8a3d789d859b84660b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 10 Jun 2014 18:22:19 -0500 Subject: [PATCH] Add 1.8 recipes for stone variants diff --git a/Spigot-Server-Patches/0014-Ability-to-disable-asynccatcher.patch b/Spigot-Server-Patches/0013-Ability-to-disable-asynccatcher.patch similarity index 96% rename from Spigot-Server-Patches/0014-Ability-to-disable-asynccatcher.patch rename to Spigot-Server-Patches/0013-Ability-to-disable-asynccatcher.patch index c442becfff..a6842aae19 100644 --- a/Spigot-Server-Patches/0014-Ability-to-disable-asynccatcher.patch +++ b/Spigot-Server-Patches/0013-Ability-to-disable-asynccatcher.patch @@ -1,4 +1,4 @@ -From 1ef0a28bb134bad8a4cab88ebb2669baad054bf6 Mon Sep 17 00:00:00 2001 +From 78b47c601829196323f63810551203efb2620d88 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 5 Aug 2014 17:39:04 -0500 Subject: [PATCH] Ability to disable asynccatcher diff --git a/Spigot-Server-Patches/0015-Fix-redstone-lag-issues.patch b/Spigot-Server-Patches/0014-Fix-redstone-lag-issues.patch similarity index 94% rename from Spigot-Server-Patches/0015-Fix-redstone-lag-issues.patch rename to Spigot-Server-Patches/0014-Fix-redstone-lag-issues.patch index be3538b4eb..769f153c77 100644 --- a/Spigot-Server-Patches/0015-Fix-redstone-lag-issues.patch +++ b/Spigot-Server-Patches/0014-Fix-redstone-lag-issues.patch @@ -1,4 +1,4 @@ -From e1365873f29fd564719f3edda9818253495dd854 Mon Sep 17 00:00:00 2001 +From 4db0e372257fed81cb8d2d465a81efc04131d18f Mon Sep 17 00:00:00 2001 From: Iceee Date: Thu, 12 Jun 2014 13:37:35 -0500 Subject: [PATCH] Fix redstone lag issues diff --git a/Spigot-Server-Patches/0016-Do-not-remove-player-in-world-change.patch b/Spigot-Server-Patches/0015-Do-not-remove-player-in-world-change.patch similarity index 96% rename from Spigot-Server-Patches/0016-Do-not-remove-player-in-world-change.patch rename to Spigot-Server-Patches/0015-Do-not-remove-player-in-world-change.patch index 48391239ed..057fc8480e 100644 --- a/Spigot-Server-Patches/0016-Do-not-remove-player-in-world-change.patch +++ b/Spigot-Server-Patches/0015-Do-not-remove-player-in-world-change.patch @@ -1,4 +1,4 @@ -From 6bc5365f98ebcf49bdf6722b3c09e772472d88f1 Mon Sep 17 00:00:00 2001 +From 82f4ed7a6fe9063beefe686c260e01c703313633 Mon Sep 17 00:00:00 2001 From: T00thpick1 Date: Mon, 23 Jun 2014 21:37:24 -0500 Subject: [PATCH] Do not remove player in world change diff --git a/Spigot-Server-Patches/0017-Fix-directional-TNT-bias.patch b/Spigot-Server-Patches/0016-Fix-directional-TNT-bias.patch similarity index 93% rename from Spigot-Server-Patches/0017-Fix-directional-TNT-bias.patch rename to Spigot-Server-Patches/0016-Fix-directional-TNT-bias.patch index 11518672ba..6304094c83 100644 --- a/Spigot-Server-Patches/0017-Fix-directional-TNT-bias.patch +++ b/Spigot-Server-Patches/0016-Fix-directional-TNT-bias.patch @@ -1,11 +1,11 @@ -From 5976ecf2a73580d4526173250e84235e7688f509 Mon Sep 17 00:00:00 2001 +From dd64547b4501439260882f51130504ecd449e651 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 11 Jul 2014 03:54:06 -0500 Subject: [PATCH] Fix directional TNT bias diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 13cbc79..8ca4300 100644 +index 2214660..1f98f8d 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -19,11 +19,11 @@ public class EntityTNTPrimed extends Entity { diff --git a/Spigot-Server-Patches/0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch b/Spigot-Server-Patches/0017-Fix-zombie-sieges-and-their-spawn-mechanics.patch similarity index 96% rename from Spigot-Server-Patches/0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch rename to Spigot-Server-Patches/0017-Fix-zombie-sieges-and-their-spawn-mechanics.patch index 192515d758..f54eb8752f 100644 --- a/Spigot-Server-Patches/0018-Fix-zombie-sieges-and-their-spawn-mechanics.patch +++ b/Spigot-Server-Patches/0017-Fix-zombie-sieges-and-their-spawn-mechanics.patch @@ -1,4 +1,4 @@ -From 39e9a4a5740484b1ade5cbb41cc445613cda057b Mon Sep 17 00:00:00 2001 +From 9a0edbdf905d6b3068a5fff20af4522dac3d9301 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 24 Jun 2014 22:55:30 -0500 Subject: [PATCH] Fix zombie sieges and their spawn mechanics diff --git a/Spigot-Server-Patches/0019-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0018-Configurable-fishing-time-ranges.patch similarity index 95% rename from Spigot-Server-Patches/0019-Configurable-fishing-time-ranges.patch rename to Spigot-Server-Patches/0018-Configurable-fishing-time-ranges.patch index 182c0e1d82..7e069c9804 100644 --- a/Spigot-Server-Patches/0019-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0018-Configurable-fishing-time-ranges.patch @@ -1,11 +1,11 @@ -From 117d035fae9747b3caa7d77448cebb4f1828bb8d Mon Sep 17 00:00:00 2001 +From 07dca9a9864ad7237634a4ca23ed229ea0ba5b5b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 5 Aug 2014 17:49:02 -0500 Subject: [PATCH] Configurable fishing time ranges diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 197dca1..7d0fda6 100644 +index 9d4ea60..0fc1e85 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -315,7 +315,8 @@ public class EntityFishingHook extends Entity { diff --git a/Spigot-Server-Patches/0020-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0019-Allow-nerfed-mobs-to-jump.patch similarity index 93% rename from Spigot-Server-Patches/0020-Allow-nerfed-mobs-to-jump.patch rename to Spigot-Server-Patches/0019-Allow-nerfed-mobs-to-jump.patch index 74432f5258..2f784e14d0 100644 --- a/Spigot-Server-Patches/0020-Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/0019-Allow-nerfed-mobs-to-jump.patch @@ -1,4 +1,4 @@ -From 8ba29cb16f8d0f9bcbcafbd398f66aaf72326b23 Mon Sep 17 00:00:00 2001 +From 109aa46544af611045286e27a6653995eff5f58b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 29 Jun 2014 13:32:36 -0500 Subject: [PATCH] Allow nerfed mobs to jump diff --git a/Spigot-Server-Patches/0021-Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/0020-Toggle-for-player-interact-limiter.patch similarity index 95% rename from Spigot-Server-Patches/0021-Toggle-for-player-interact-limiter.patch rename to Spigot-Server-Patches/0020-Toggle-for-player-interact-limiter.patch index c62aaac2a0..a68f98ed00 100644 --- a/Spigot-Server-Patches/0021-Toggle-for-player-interact-limiter.patch +++ b/Spigot-Server-Patches/0020-Toggle-for-player-interact-limiter.patch @@ -1,11 +1,11 @@ -From 834a42d90501c4711a915d35b1a5df45212296dc Mon Sep 17 00:00:00 2001 +From d9da9e413d37e05c22ac1568c4ac65ad9df12b20 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 5 Aug 2014 17:56:02 -0500 Subject: [PATCH] Toggle for player interact limiter diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 188393c..0987b90 100644 +index 10faa8c..26ce4ed 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -581,7 +581,8 @@ public class PlayerConnection implements PacketPlayInListener { diff --git a/Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0021-Player-Exhaustion-Multipliers.patch similarity index 97% rename from Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch rename to Spigot-Server-Patches/0021-Player-Exhaustion-Multipliers.patch index aa5e7b1708..9a8fa9c1a3 100644 --- a/Spigot-Server-Patches/0022-Player-Exhaustion-Multipliers.patch +++ b/Spigot-Server-Patches/0021-Player-Exhaustion-Multipliers.patch @@ -1,4 +1,4 @@ -From 413a2db4e6968e7c3f618f7abdc6aa7c6641340b Mon Sep 17 00:00:00 2001 +From e7e389c145935280c12f237ba33e2ede2f89b10b Mon Sep 17 00:00:00 2001 From: gsand Date: Sun, 17 Aug 2014 16:40:54 -0500 Subject: [PATCH] Player Exhaustion Multipliers diff --git a/Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0022-Add-configurable-despawn-distances-for-living-entiti.patch similarity index 97% rename from Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch rename to Spigot-Server-Patches/0022-Add-configurable-despawn-distances-for-living-entiti.patch index 7a13e9ed21..fc0f9214ce 100644 --- a/Spigot-Server-Patches/0023-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0022-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,4 +1,4 @@ -From e624fffa541916f7aca5bda6885d8f02b5a7c597 Mon Sep 17 00:00:00 2001 +From e3736087c549f4992576f0ed4bfaad5d8ce9776e Mon Sep 17 00:00:00 2001 From: Suddenly Date: Mon, 7 Jul 2014 04:11:34 +0100 Subject: [PATCH] Add configurable despawn distances for living entities diff --git a/Spigot-Server-Patches/0024-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0023-Allow-for-toggling-of-spawn-chunks.patch similarity index 96% rename from Spigot-Server-Patches/0024-Allow-for-toggling-of-spawn-chunks.patch rename to Spigot-Server-Patches/0023-Allow-for-toggling-of-spawn-chunks.patch index b76e67ef71..d8375c1eb3 100644 --- a/Spigot-Server-Patches/0024-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0023-Allow-for-toggling-of-spawn-chunks.patch @@ -1,4 +1,4 @@ -From 02810be39c90969e1bddb98ce902d19063d53171 Mon Sep 17 00:00:00 2001 +From 5846639b4009856d9ed0400fa2d242fb586be668 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Thu, 10 Jul 2014 16:57:10 +0100 Subject: [PATCH] Allow for toggling of spawn chunks diff --git a/Spigot-Server-Patches/0025-Better-EULA-handling.patch b/Spigot-Server-Patches/0024-Better-EULA-handling.patch similarity index 98% rename from Spigot-Server-Patches/0025-Better-EULA-handling.patch rename to Spigot-Server-Patches/0024-Better-EULA-handling.patch index 4ecaf4e73c..b88f9df454 100644 --- a/Spigot-Server-Patches/0025-Better-EULA-handling.patch +++ b/Spigot-Server-Patches/0024-Better-EULA-handling.patch @@ -1,4 +1,4 @@ -From 4784e3e92058a9092fbbcc9d8b6a023ef6c31623 Mon Sep 17 00:00:00 2001 +From 55cca3b8a7074e826b20d9cd004400ad6aced9d6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 8 Jul 2014 22:39:41 -0500 Subject: [PATCH] Better EULA handling diff --git a/Spigot-Server-Patches/0026-Fix-random-position-generator-tendency-to-move-north.patch b/Spigot-Server-Patches/0025-Fix-random-position-generator-tendency-to-move-north.patch similarity index 98% rename from Spigot-Server-Patches/0026-Fix-random-position-generator-tendency-to-move-north.patch rename to Spigot-Server-Patches/0025-Fix-random-position-generator-tendency-to-move-north.patch index f879a9cb15..de32e39c4b 100644 --- a/Spigot-Server-Patches/0026-Fix-random-position-generator-tendency-to-move-north.patch +++ b/Spigot-Server-Patches/0025-Fix-random-position-generator-tendency-to-move-north.patch @@ -1,4 +1,4 @@ -From 8b0d449cb76d89090aae4723793e9d58a5301d72 Mon Sep 17 00:00:00 2001 +From a9b4a5ea623ce31c33c2362459589ce7888137a6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Jul 2014 21:52:19 -0500 Subject: [PATCH] Fix random position generator tendency to move north west diff --git a/Spigot-Server-Patches/0027-Drop-falling-block-entities-that-are-above-the-speci.patch b/Spigot-Server-Patches/0026-Drop-falling-block-entities-that-are-above-the-speci.patch similarity index 97% rename from Spigot-Server-Patches/0027-Drop-falling-block-entities-that-are-above-the-speci.patch rename to Spigot-Server-Patches/0026-Drop-falling-block-entities-that-are-above-the-speci.patch index 21d9e5e8fd..225464190e 100644 --- a/Spigot-Server-Patches/0027-Drop-falling-block-entities-that-are-above-the-speci.patch +++ b/Spigot-Server-Patches/0026-Drop-falling-block-entities-that-are-above-the-speci.patch @@ -1,4 +1,4 @@ -From 282c195a7be0f610136d9d068558399d6a4df4ab Mon Sep 17 00:00:00 2001 +From 309b3c0831fda8cce0efb4d8787a3de214c2647c Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 5 Aug 2014 18:39:57 -0500 Subject: [PATCH] Drop falling block entities that are above the specified diff --git a/Spigot-Server-Patches/0028-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0027-Configurable-speed-for-water-flowing-over-lava.patch similarity index 97% rename from Spigot-Server-Patches/0028-Configurable-speed-for-water-flowing-over-lava.patch rename to Spigot-Server-Patches/0027-Configurable-speed-for-water-flowing-over-lava.patch index 493d80b80c..1dd0883e3e 100644 --- a/Spigot-Server-Patches/0028-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0027-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,4 +1,4 @@ -From 0fca3bbe6aed83859a5b107f58c74ee936f5736f Mon Sep 17 00:00:00 2001 +From 897c5080d8ebb7ebbd3e9724d516a881f63d4997 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sun, 3 Aug 2014 21:20:42 -0500 Subject: [PATCH] Configurable speed for water flowing over lava diff --git a/Spigot-Server-Patches/0029-Center-TNT-grid-sample-points.patch b/Spigot-Server-Patches/0028-Center-TNT-grid-sample-points.patch similarity index 96% rename from Spigot-Server-Patches/0029-Center-TNT-grid-sample-points.patch rename to Spigot-Server-Patches/0028-Center-TNT-grid-sample-points.patch index 48ff483d1e..419815b5f7 100644 --- a/Spigot-Server-Patches/0029-Center-TNT-grid-sample-points.patch +++ b/Spigot-Server-Patches/0028-Center-TNT-grid-sample-points.patch @@ -1,4 +1,4 @@ -From 8260d6efa8936d75822c4b324ecae9e4ac299033 Mon Sep 17 00:00:00 2001 +From 8cad240c921709616da608af0737c1d7507dbca7 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Wed, 6 Aug 2014 18:17:41 -0500 Subject: [PATCH] Center TNT grid sample points diff --git a/Spigot-Server-Patches/0030-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0029-Player-affects-spawning-API.patch similarity index 99% rename from Spigot-Server-Patches/0030-Player-affects-spawning-API.patch rename to Spigot-Server-Patches/0029-Player-affects-spawning-API.patch index 63305972a4..9df865651e 100644 --- a/Spigot-Server-Patches/0030-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0029-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From e825ea4fb252c3e02b6f32af9b1e08e27c328172 Mon Sep 17 00:00:00 2001 +From 63eabb4da69bdf01854b63c4ee9af7a744a1a9a1 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Sep 2014 22:02:02 -0500 Subject: [PATCH] Player affects spawning API diff --git a/Spigot-Server-Patches/0031-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch b/Spigot-Server-Patches/0030-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch similarity index 93% rename from Spigot-Server-Patches/0031-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch rename to Spigot-Server-Patches/0030-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch index 89fcde26fa..3e94480f5f 100644 --- a/Spigot-Server-Patches/0031-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch +++ b/Spigot-Server-Patches/0030-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch @@ -1,4 +1,4 @@ -From f37e6f3216b169882a186764475131f3af1481ab Mon Sep 17 00:00:00 2001 +From 86853911cac991344a4c79a4cee9de10b8651ed3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 19 Aug 2014 14:21:37 -0500 Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and diff --git a/Spigot-Server-Patches/0032-RIP-metrics.patch b/Spigot-Server-Patches/0031-RIP-metrics.patch similarity index 99% rename from Spigot-Server-Patches/0032-RIP-metrics.patch rename to Spigot-Server-Patches/0031-RIP-metrics.patch index 885ee19293..8ce0337950 100644 --- a/Spigot-Server-Patches/0032-RIP-metrics.patch +++ b/Spigot-Server-Patches/0031-RIP-metrics.patch @@ -1,4 +1,4 @@ -From dd86a4e2b6efc65d344357aa91d81245346fb0d7 Mon Sep 17 00:00:00 2001 +From dbcc9a05f4b14d5d5e6d77c7d3bba53d134d575c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 19 Aug 2014 14:25:40 -0500 Subject: [PATCH] RIP metrics @@ -657,7 +657,7 @@ index d9c3b63..0000000 -} \ No newline at end of file diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 3d089dc..211fb6e 100644 +index 3459d87..9fbf21f 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -48,7 +48,6 @@ public class SpigotConfig diff --git a/Spigot-Server-Patches/0033-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0032-Remove-invalid-mob-spawner-tile-entities.patch similarity index 96% rename from Spigot-Server-Patches/0033-Remove-invalid-mob-spawner-tile-entities.patch rename to Spigot-Server-Patches/0032-Remove-invalid-mob-spawner-tile-entities.patch index 266f53824d..ec254ee47b 100644 --- a/Spigot-Server-Patches/0033-Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/0032-Remove-invalid-mob-spawner-tile-entities.patch @@ -1,4 +1,4 @@ -From 4e8f6f02b5c941a718f1a60e31a198e3ac717cad Mon Sep 17 00:00:00 2001 +From 0c4d3daad8180e670e800360fe2f25d15f79b544 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 19 Aug 2014 14:51:28 -0500 Subject: [PATCH] Remove invalid mob spawner tile entities diff --git a/Spigot-Server-Patches/0034-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0033-Optimize-TileEntity-Ticking.patch similarity index 99% rename from Spigot-Server-Patches/0034-Optimize-TileEntity-Ticking.patch rename to Spigot-Server-Patches/0033-Optimize-TileEntity-Ticking.patch index cbde9ffd03..936cfe14bc 100644 --- a/Spigot-Server-Patches/0034-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0033-Optimize-TileEntity-Ticking.patch @@ -1,4 +1,4 @@ -From 6e7a139066c3fd9fa5274045d80aede527b636ab Mon Sep 17 00:00:00 2001 +From f7a916d804a0d98856017ad2cd6904c34db9f19f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Aug 2014 21:35:11 -0400 Subject: [PATCH] Optimize TileEntity Ticking @@ -103,7 +103,7 @@ index 33c228b..3bf2af0 100644 public List players = new ArrayList(); diff --git a/src/main/java/org/spigotmc/WorldTileEntityList.java b/src/main/java/org/spigotmc/WorldTileEntityList.java new file mode 100644 -index 0000000..4e6b762 +index 0000000..e7fd3d3 --- /dev/null +++ b/src/main/java/org/spigotmc/WorldTileEntityList.java @@ -0,0 +1,174 @@ diff --git a/Spigot-Server-Patches/0035-Move-sound-handling-out-of-the-chest-tick-loop.patch b/Spigot-Server-Patches/0034-Move-sound-handling-out-of-the-chest-tick-loop.patch similarity index 98% rename from Spigot-Server-Patches/0035-Move-sound-handling-out-of-the-chest-tick-loop.patch rename to Spigot-Server-Patches/0034-Move-sound-handling-out-of-the-chest-tick-loop.patch index 34ebf7bdc0..bcc91c1309 100644 --- a/Spigot-Server-Patches/0035-Move-sound-handling-out-of-the-chest-tick-loop.patch +++ b/Spigot-Server-Patches/0034-Move-sound-handling-out-of-the-chest-tick-loop.patch @@ -1,4 +1,4 @@ -From 459bd528d5385f71580b40a3cd894c1bd8197520 Mon Sep 17 00:00:00 2001 +From a887cb0c9a96e9f90b3c2b31850fe06bd019c0d5 Mon Sep 17 00:00:00 2001 From: Iceee Date: Mon, 11 Aug 2014 23:03:47 -0500 Subject: [PATCH] Move sound handling out of the chest tick loop diff --git a/Spigot-Server-Patches/0036-Remove-specific-entities-that-fly-through-an-unloade.patch b/Spigot-Server-Patches/0035-Remove-specific-entities-that-fly-through-an-unloade.patch similarity index 98% rename from Spigot-Server-Patches/0036-Remove-specific-entities-that-fly-through-an-unloade.patch rename to Spigot-Server-Patches/0035-Remove-specific-entities-that-fly-through-an-unloade.patch index 4c3e51cc23..628d01db8e 100644 --- a/Spigot-Server-Patches/0036-Remove-specific-entities-that-fly-through-an-unloade.patch +++ b/Spigot-Server-Patches/0035-Remove-specific-entities-that-fly-through-an-unloade.patch @@ -1,4 +1,4 @@ -From e9abda4da1c1e4c264b6f7e9ae5e861e5006a6e9 Mon Sep 17 00:00:00 2001 +From 2d0a853d87d4c3b51d32cb8e1d8ba78da32a1b41 Mon Sep 17 00:00:00 2001 From: Iceee Date: Fri, 29 Aug 2014 20:33:52 -0500 Subject: [PATCH] Remove specific entities that fly through an unloaded chunk diff --git a/Spigot-Server-Patches/0037-Configurable-strength-and-weakness-effect-modifiers.patch b/Spigot-Server-Patches/0036-Configurable-strength-and-weakness-effect-modifiers.patch similarity index 96% rename from Spigot-Server-Patches/0037-Configurable-strength-and-weakness-effect-modifiers.patch rename to Spigot-Server-Patches/0036-Configurable-strength-and-weakness-effect-modifiers.patch index 04b70e36a5..9ac5ef2be1 100644 --- a/Spigot-Server-Patches/0037-Configurable-strength-and-weakness-effect-modifiers.patch +++ b/Spigot-Server-Patches/0036-Configurable-strength-and-weakness-effect-modifiers.patch @@ -1,4 +1,4 @@ -From 78ba8b100ca7bc2d828c055e28cc37e2660dbe56 Mon Sep 17 00:00:00 2001 +From d44dc1fcfe556710513b393b70f2626e705a41e2 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 31 Aug 2014 12:13:32 -0500 Subject: [PATCH] Configurable strength and weakness effect modifiers @@ -43,5 +43,5 @@ index 25a94a6..a7b18e4 100644 + } } -- -1.9.4.msysgit.1 +1.9.1 diff --git a/Spigot-Server-Patches/0038-Temporary-fix-for-rails-dupe.patch b/Spigot-Server-Patches/0037-Temporary-fix-for-rails-dupe.patch similarity index 94% rename from Spigot-Server-Patches/0038-Temporary-fix-for-rails-dupe.patch rename to Spigot-Server-Patches/0037-Temporary-fix-for-rails-dupe.patch index af10b6316c..52352e3894 100644 --- a/Spigot-Server-Patches/0038-Temporary-fix-for-rails-dupe.patch +++ b/Spigot-Server-Patches/0037-Temporary-fix-for-rails-dupe.patch @@ -1,4 +1,4 @@ -From 344248bcdb3a81dca026e29d05ac86f141bb20b0 Mon Sep 17 00:00:00 2001 +From 2dd27493a7bfd7ab89aec74f16473575e64f93e6 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Sun, 31 Aug 2014 18:12:10 +0100 Subject: [PATCH] Temporary fix for rails dupe diff --git a/Spigot-Server-Patches/0039-PaperSpigot-protocol-warning.patch b/Spigot-Server-Patches/0038-PaperSpigot-protocol-warning.patch similarity index 95% rename from Spigot-Server-Patches/0039-PaperSpigot-protocol-warning.patch rename to Spigot-Server-Patches/0038-PaperSpigot-protocol-warning.patch index cac659ea73..63aecc56dd 100644 --- a/Spigot-Server-Patches/0039-PaperSpigot-protocol-warning.patch +++ b/Spigot-Server-Patches/0038-PaperSpigot-protocol-warning.patch @@ -1,4 +1,4 @@ -From 79c45681c2eba1a6a46e4b68c02139a356c06ac6 Mon Sep 17 00:00:00 2001 +From ca6ee3b8411b8059ae664b8e5178cf179b49f80c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 21 Sep 2014 22:10:16 -0500 Subject: [PATCH] PaperSpigot protocol warning diff --git a/Spigot-Server-Patches/0040-Backwards-compatible-PacketPlayOutEntityTeleport-con.patch b/Spigot-Server-Patches/0039-Backwards-compatible-PacketPlayOutEntityTeleport-con.patch similarity index 95% rename from Spigot-Server-Patches/0040-Backwards-compatible-PacketPlayOutEntityTeleport-con.patch rename to Spigot-Server-Patches/0039-Backwards-compatible-PacketPlayOutEntityTeleport-con.patch index e192118d65..f05bfbba87 100644 --- a/Spigot-Server-Patches/0040-Backwards-compatible-PacketPlayOutEntityTeleport-con.patch +++ b/Spigot-Server-Patches/0039-Backwards-compatible-PacketPlayOutEntityTeleport-con.patch @@ -1,4 +1,4 @@ -From d93d9459ceaa2f5a46874bee309edc3409df721b Mon Sep 17 00:00:00 2001 +From 8b4d0c8819ed092045e579c6cdfb854e44af037f Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sat, 13 Sep 2014 02:23:56 -0700 Subject: [PATCH] Backwards compatible PacketPlayOutEntityTeleport constructor diff --git a/Spigot-Server-Patches/0041-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0040-Further-improve-server-tick-loop.patch similarity index 99% rename from Spigot-Server-Patches/0041-Further-improve-server-tick-loop.patch rename to Spigot-Server-Patches/0040-Further-improve-server-tick-loop.patch index 717b790658..a6fc8f133e 100644 --- a/Spigot-Server-Patches/0041-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0040-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From 157babb3ad74bf4f148b50f07f0112775b845130 Mon Sep 17 00:00:00 2001 +From c6bcae3d4cf7234371b1a75dceba995b8a82713f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Oct 2014 15:56:39 -0500 Subject: [PATCH] Further improve server tick loop diff --git a/Spigot-Server-Patches/0042-Improve-Network-Manager-packet-handling.patch b/Spigot-Server-Patches/0041-Improve-Network-Manager-packet-handling.patch similarity index 97% rename from Spigot-Server-Patches/0042-Improve-Network-Manager-packet-handling.patch rename to Spigot-Server-Patches/0041-Improve-Network-Manager-packet-handling.patch index 70d7c42668..fce9b1f7be 100644 --- a/Spigot-Server-Patches/0042-Improve-Network-Manager-packet-handling.patch +++ b/Spigot-Server-Patches/0041-Improve-Network-Manager-packet-handling.patch @@ -1,4 +1,4 @@ -From 2ee5580338ca7624f1425f8f7626ea4f93c9ca38 Mon Sep 17 00:00:00 2001 +From 76e7fcd0a61b789ca55fb33bb95be63375ed7f23 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Oct 2014 16:01:51 -0500 Subject: [PATCH] Improve Network Manager packet handling diff --git a/Spigot-Server-Patches/0043-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0042-Only-refresh-abilities-if-needed.patch similarity index 94% rename from Spigot-Server-Patches/0043-Only-refresh-abilities-if-needed.patch rename to Spigot-Server-Patches/0042-Only-refresh-abilities-if-needed.patch index 0e936cf85a..c5a69fbb9d 100644 --- a/Spigot-Server-Patches/0043-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0042-Only-refresh-abilities-if-needed.patch @@ -1,4 +1,4 @@ -From 33b18cbf6cb34aaa872507e4c20dc731ec877916 Mon Sep 17 00:00:00 2001 +From 08fbd413515b6fdb8bb299485d9bd60bbe62c24b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Oct 2014 16:04:28 -0500 Subject: [PATCH] Only refresh abilities if needed diff --git a/Spigot-Server-Patches/0044-Player-lookup-improvements.patch b/Spigot-Server-Patches/0043-Player-lookup-improvements.patch similarity index 99% rename from Spigot-Server-Patches/0044-Player-lookup-improvements.patch rename to Spigot-Server-Patches/0043-Player-lookup-improvements.patch index f51c2fa4b2..c1beef2c29 100644 --- a/Spigot-Server-Patches/0044-Player-lookup-improvements.patch +++ b/Spigot-Server-Patches/0043-Player-lookup-improvements.patch @@ -1,4 +1,4 @@ -From 882a1d79c385949277aade9a1d35aa0cfd339c0d Mon Sep 17 00:00:00 2001 +From 6011f2fe47906285314092df74e56b75b73722a7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Oct 2014 16:26:55 -0500 Subject: [PATCH] Player lookup improvements diff --git a/Spigot-Server-Patches/0045-Improve-autosave-mechanism.patch b/Spigot-Server-Patches/0044-Improve-autosave-mechanism.patch similarity index 97% rename from Spigot-Server-Patches/0045-Improve-autosave-mechanism.patch rename to Spigot-Server-Patches/0044-Improve-autosave-mechanism.patch index 3a7e099142..eb40a9b274 100644 --- a/Spigot-Server-Patches/0045-Improve-autosave-mechanism.patch +++ b/Spigot-Server-Patches/0044-Improve-autosave-mechanism.patch @@ -1,4 +1,4 @@ -From d5ecea59249849d642ab6a6612650528627f2b2f Mon Sep 17 00:00:00 2001 +From 38ddbe06c98a3f5e48671e7f11d1542a08406291 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Oct 2014 16:30:48 -0500 Subject: [PATCH] Improve autosave mechanism diff --git a/Spigot-Server-Patches/0045-Configurable-game-mechanics-changes.patch b/Spigot-Server-Patches/0045-Configurable-game-mechanics-changes.patch new file mode 100644 index 0000000000..94c1d4f43b --- /dev/null +++ b/Spigot-Server-Patches/0045-Configurable-game-mechanics-changes.patch @@ -0,0 +1,174 @@ +From e6ea911ae0a814b801ce8c2b0b011963893686f3 Mon Sep 17 00:00:00 2001 +From: gsand +Date: Fri, 24 Oct 2014 22:09:58 -0500 +Subject: [PATCH] Configurable game mechanics changes + + +diff --git a/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java +index b6b4146..a0b960a 100644 +--- a/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java ++++ b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java +@@ -61,7 +61,7 @@ public abstract class BlockMinecartTrackAbstract extends Block { + } + + public boolean canPlace(World world, int i, int j, int k) { +- return World.a((IBlockAccess) world, i, j - 1, k); ++ return checkPlace(world, i, j, k); // PaperSpigot - Moved, pass it all along + } + + public void onPlace(World world, int i, int j, int k) { +@@ -84,25 +84,27 @@ public abstract class BlockMinecartTrackAbstract extends Block { + + boolean flag = false; + +- if (!World.a((IBlockAccess) world, i, j - 1, k)) { ++ // PaperSpigot start - Replace !World.a with our own check - Less picky rails ++ if (!checkPlace(world, i, j, k)) { + flag = true; + } + +- if (i1 == 2 && !World.a((IBlockAccess) world, i + 1, j, k)) { ++ if (i1 == 2 && !checkPlace(world, i, j, k)) { + flag = true; + } + +- if (i1 == 3 && !World.a((IBlockAccess) world, i - 1, j, k)) { ++ if (i1 == 3 && !checkPlace(world, i, j, k)) { + flag = true; + } + +- if (i1 == 4 && !World.a((IBlockAccess) world, i, j, k - 1)) { ++ if (i1 == 4 && !checkPlace(world, i, j, k)) { + flag = true; + } + +- if (i1 == 5 && !World.a((IBlockAccess) world, i, j, k + 1)) { ++ if (i1 == 5 && !checkPlace(world, i, j, k)) { + flag = true; + } ++ // PaperSpigot end + + if (flag) { + // PaperSpigot start - Rails dupe workaround +@@ -146,4 +148,18 @@ public abstract class BlockMinecartTrackAbstract extends Block { + world.applyPhysics(i, j - 1, k, block); + } + } ++ ++ /** ++ * PaperSpigot - Customizable rail placement on extra blocks ++ */ ++ private boolean checkPlace(World world, int i, int j, int k) { ++ Block block = World.getBlock(world, i, j - 1, k); ++ if (world.paperSpigotConfig.lessPickyRails) { ++ if (block instanceof BlockFence) { ++ return true; ++ } ++ } ++ ++ return World.canPlace(world, block, i, j - 1, k); ++ } + } +diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java +index c9f2b13..7c4c303 100644 +--- a/src/main/java/net/minecraft/server/EntityBoat.java ++++ b/src/main/java/net/minecraft/server/EntityBoat.java +@@ -337,13 +337,7 @@ public class EntityBoat extends Entity { + if (!destroyEvent.isCancelled()) { + this.die(); + +- for (k = 0; k < 3; ++k) { +- this.a(Item.getItemOf(Blocks.WOOD), 1, 0.0F); +- } +- +- for (k = 0; k < 2; ++k) { +- this.a(Items.STICK, 1, 0.0F); +- } ++ breakNaturally(); // PaperSpigot - Customizable boat drops + } + // CraftBukkit end + } +@@ -452,15 +446,7 @@ public class EntityBoat extends Entity { + if (!destroyEvent.isCancelled()) { + this.die(); + +- int l; +- +- for (l = 0; l < 3; ++l) { +- this.a(Item.getItemOf(Blocks.WOOD), 1, 0.0F); +- } +- +- for (l = 0; l < 2; ++l) { +- this.a(Items.STICK, 1, 0.0F); +- } ++ breakNaturally(); // PaperSpigot - Customizable boat drops + } + // CraftBukkit end + } +@@ -495,4 +481,21 @@ public class EntityBoat extends Entity { + public int i() { + return this.datawatcher.getInt(18); + } ++ ++ /** ++ * PaperSpigot - Handles boat drops depending on the user's config setting ++ */ ++ public void breakNaturally() { ++ if (this.world.paperSpigotConfig.boatsDropBoats) { ++ this.a(Items.BOAT, 1, 0.0F); ++ } else { ++ for (int k = 0; k < 3; ++k) { ++ this.a(Item.getItemOf(Blocks.WOOD), 1, 0.0F); ++ } ++ ++ for (int k = 0; k < 2; ++k) { ++ this.a(Items.STICK, 1, 0.0F); ++ } ++ } ++ } + } +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index 1977c6c..db41b8b 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -3155,4 +3155,20 @@ public abstract class World implements IBlockAccess { + iworldaccess.b(); + } + } ++ ++ /** ++ * PaperSpigot - Gets block at location ++ */ ++ public static Block getBlock(IBlockAccess iblockaccess, int i, int j, int k) { ++ return iblockaccess.getType(i, j, k); ++ } ++ ++ /** ++ * PaperSpigot - Checks if block placement is allowed (used in BlockMinecartTrackAbstract and similar) ++ */ ++ public static boolean canPlace(IBlockAccess iblockaccess, Block block, int i, int j, int k) { ++ int l = iblockaccess.getData(i, j, k); ++ ++ return block.getMaterial().k() && block.d() ? true : (block instanceof BlockStairs ? (l & 4) == 4 : (block instanceof BlockStepAbstract ? (l & 8) == 8 : (block instanceof BlockHopper ? true : (block instanceof BlockSnow ? (l & 7) == 7 : false)))); ++ } + } +diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +index a59fd42..6b9e127 100644 +--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java ++++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +@@ -188,4 +188,12 @@ public class PaperSpigotWorldConfig + removeUnloadedTNTEntities = getBoolean("remove-unloaded.tnt-entities", true); + removeUnloadedFallingBlocks = getBoolean("remove-unloaded.falling-blocks", true); + } ++ ++ public boolean boatsDropBoats; ++ public boolean lessPickyRails; ++ private void mechanicsChanges() ++ { ++ boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false ); ++ lessPickyRails = getBoolean( "game-mechanics.less-picky-rail-placement", false ); ++ } + } +-- +1.9.1 +