diff --git a/Spigot-Server-Patches/0013-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch similarity index 95% rename from Spigot-Server-Patches/0013-Configurable-fishing-time-ranges.patch rename to Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch index 30bd033b8d..596c6e69f0 100644 --- a/Spigot-Server-Patches/0013-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch @@ -1,4 +1,4 @@ -From 0ecae352d8b5b7e106d8473acb4677f553bcc50c Mon Sep 17 00:00:00 2001 +From 3411a63f46a535c76039274fc976b2c6eee6fd8b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 21:00:13 -0600 Subject: [PATCH] Configurable fishing time ranges @@ -18,7 +18,7 @@ index c2bfb1f..28d698d 100644 } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index c8b428c..1d8448c 100644 +index 014b8d9..b7afd3e 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -106,4 +106,12 @@ public class PaperSpigotWorldConfig diff --git a/Spigot-Server-Patches/0012-Do-not-remove-player-in-world-change.patch b/Spigot-Server-Patches/0012-Do-not-remove-player-in-world-change.patch deleted file mode 100644 index 0b4c5deeda..0000000000 --- a/Spigot-Server-Patches/0012-Do-not-remove-player-in-world-change.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0d6c8bb4db762171aa4466e1d26a2b285fdc23df Mon Sep 17 00:00:00 2001 -From: T00thpick1 -Date: Sat, 7 Mar 2015 20:54:33 -0600 -Subject: [PATCH] Do not remove player in world change - - -diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index c7d26ce..d93b00c 100644 ---- a/src/main/java/net/minecraft/server/PlayerList.java -+++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -507,7 +507,7 @@ public abstract class PlayerList { - entityplayer.u().getTracker().untrackPlayer(entityplayer); - // entityplayer.u().getTracker().untrackEntity(entityplayer); // CraftBukkit - entityplayer.u().getPlayerChunkMap().removePlayer(entityplayer); -- this.players.remove(entityplayer); -+ //this.players.remove(entityplayer); // PaperSpigot - Don't remove player in world change. Fixes BUKKIT-4561, BUKKIT-4082, and BUKKIT-2094 - this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer); - BlockPosition blockposition = entityplayer.getBed(); - boolean flag1 = entityplayer.isRespawnForced(); -@@ -601,7 +601,7 @@ public abstract class PlayerList { - - if (!entityplayer.playerConnection.isDisconnected()) { - worldserver.getPlayerChunkMap().addPlayer(entityplayer1); -- worldserver.addEntity(entityplayer1); -+ //worldserver.addEntity(entityplayer1); // PaperSpigot - Don't remove player in world change. Fixes BUKKIT-4561, BUKKIT-4082, and BUKKIT-2094 - this.players.add(entityplayer1); - this.j.put(entityplayer1.getUniqueID(), entityplayer1); - } --- -1.9.1 - diff --git a/Spigot-Server-Patches/0014-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch similarity index 93% rename from Spigot-Server-Patches/0014-Allow-nerfed-mobs-to-jump.patch rename to Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch index 79c9cfce66..c618e73eb1 100644 --- a/Spigot-Server-Patches/0014-Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch @@ -1,4 +1,4 @@ -From e9811e3e812eb16f55045df9e643d1dc302d7a1c Mon Sep 17 00:00:00 2001 +From 2263b5efd50e99d43fbf7c7428a1c4b2fd31b9ef Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 21:03:06 -0600 Subject: [PATCH] Allow nerfed mobs to jump diff --git a/Spigot-Server-Patches/0015-Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/0014-Toggle-for-player-interact-limiter.patch similarity index 95% rename from Spigot-Server-Patches/0015-Toggle-for-player-interact-limiter.patch rename to Spigot-Server-Patches/0014-Toggle-for-player-interact-limiter.patch index ac7a5c19e3..3ecc79054f 100644 --- a/Spigot-Server-Patches/0015-Toggle-for-player-interact-limiter.patch +++ b/Spigot-Server-Patches/0014-Toggle-for-player-interact-limiter.patch @@ -1,11 +1,11 @@ -From c153d5c158a9b9f8c11469555ac1fc8967dea55d Mon Sep 17 00:00:00 2001 +From 8ac9188726669d17232df053a2a70f055552cf2b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 21:07:10 -0600 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 7f5044d..a5f86d3 100644 +index 2b30b39..3889421 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -636,7 +636,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList diff --git a/Spigot-Server-Patches/0016-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0015-Player-Exhaustion-Multipliers.patch similarity index 97% rename from Spigot-Server-Patches/0016-Player-Exhaustion-Multipliers.patch rename to Spigot-Server-Patches/0015-Player-Exhaustion-Multipliers.patch index 92dea62097..bfd6a226d5 100644 --- a/Spigot-Server-Patches/0016-Player-Exhaustion-Multipliers.patch +++ b/Spigot-Server-Patches/0015-Player-Exhaustion-Multipliers.patch @@ -1,4 +1,4 @@ -From ec63672d6c3a3879d5ddaefb117a3310961478ee Mon Sep 17 00:00:00 2001 +From 063a8a59cfd31b7f11ea2f371ed03d0e9bfdd947 Mon Sep 17 00:00:00 2001 From: gsand Date: Sat, 7 Mar 2015 21:35:14 -0600 Subject: [PATCH] Player Exhaustion Multipliers diff --git a/Spigot-Server-Patches/0017-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0016-Add-configurable-despawn-distances-for-living-entiti.patch similarity index 96% rename from Spigot-Server-Patches/0017-Add-configurable-despawn-distances-for-living-entiti.patch rename to Spigot-Server-Patches/0016-Add-configurable-despawn-distances-for-living-entiti.patch index 7d33fff3a5..78ef86ed02 100644 --- a/Spigot-Server-Patches/0017-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0016-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,4 +1,4 @@ -From 288bc1583961b89530659d9e968bac8fea1cb02e Mon Sep 17 00:00:00 2001 +From 9c4907b8c468bebd5b2d977a22333bd756a611bc Mon Sep 17 00:00:00 2001 From: Suddenly Date: Sat, 7 Mar 2015 21:40:48 -0600 Subject: [PATCH] Add configurable despawn distances for living entities @@ -26,7 +26,7 @@ index b580217..4f49ed0 100644 } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index ac2f470..0bdfa44 100644 +index ac2f470..7ad9bb3 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -122,4 +122,21 @@ public class PaperSpigotWorldConfig diff --git a/Spigot-Server-Patches/0018-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0017-Allow-for-toggling-of-spawn-chunks.patch similarity index 96% rename from Spigot-Server-Patches/0018-Allow-for-toggling-of-spawn-chunks.patch rename to Spigot-Server-Patches/0017-Allow-for-toggling-of-spawn-chunks.patch index b91cd6cc5b..1d058e0671 100644 --- a/Spigot-Server-Patches/0018-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0017-Allow-for-toggling-of-spawn-chunks.patch @@ -1,4 +1,4 @@ -From e2a98f102da3b5823b45e9d17d179f766d905721 Mon Sep 17 00:00:00 2001 +From 7a1085b97d3e2cd5529876d6441556fe08d4b3d4 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Sat, 7 Mar 2015 21:50:40 -0600 Subject: [PATCH] Allow for toggling of spawn chunks diff --git a/Spigot-Server-Patches/0019-Drop-falling-block-entities-that-are-above-the-speci.patch b/Spigot-Server-Patches/0018-Drop-falling-block-entities-that-are-above-the-speci.patch similarity index 95% rename from Spigot-Server-Patches/0019-Drop-falling-block-entities-that-are-above-the-speci.patch rename to Spigot-Server-Patches/0018-Drop-falling-block-entities-that-are-above-the-speci.patch index 5505898bf1..2d8fb01d49 100644 --- a/Spigot-Server-Patches/0019-Drop-falling-block-entities-that-are-above-the-speci.patch +++ b/Spigot-Server-Patches/0018-Drop-falling-block-entities-that-are-above-the-speci.patch @@ -1,4 +1,4 @@ -From 1926d5b0e32bea76d0dc80f0ff385a308e99265d Mon Sep 17 00:00:00 2001 +From b4dd019aed5d8da6314dbd840cf89a775f068f1b Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sat, 7 Mar 2015 22:03:47 -0600 Subject: [PATCH] Drop falling block entities that are above the specified @@ -28,7 +28,7 @@ index ce91553..ef93776 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index b740016..4cf8676 100644 +index 8d707f7..ebe0a4f 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -146,4 +146,14 @@ public class PaperSpigotWorldConfig diff --git a/Spigot-Server-Patches/0020-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0019-Configurable-speed-for-water-flowing-over-lava.patch similarity index 96% rename from Spigot-Server-Patches/0020-Configurable-speed-for-water-flowing-over-lava.patch rename to Spigot-Server-Patches/0019-Configurable-speed-for-water-flowing-over-lava.patch index 8285befba5..e452a2389d 100644 --- a/Spigot-Server-Patches/0020-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0019-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,4 +1,4 @@ -From 0c31964584bae44bf1ebae9887513715c45f2d3d Mon Sep 17 00:00:00 2001 +From 32dcf754f5c4ce1e23e62fcc8e86b8557b0721b8 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sat, 7 Mar 2015 22:17:03 -0600 Subject: [PATCH] Configurable speed for water flowing over lava @@ -42,7 +42,7 @@ index 842a27a..449b12f 100644 + } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 4cf8676..e415e15 100644 +index ebe0a4f..41a80da 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -156,4 +156,11 @@ public class PaperSpigotWorldConfig diff --git a/Spigot-Server-Patches/0021-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch similarity index 99% rename from Spigot-Server-Patches/0021-Player-affects-spawning-API.patch rename to Spigot-Server-Patches/0020-Player-affects-spawning-API.patch index 0839d12bfb..fb21fd0a50 100644 --- a/Spigot-Server-Patches/0021-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 06ac3e7a3f45b556f5e23131f432620560ed13f4 Mon Sep 17 00:00:00 2001 +From 0b07ded341b1681cb2cee003c84fbb5f764705ce Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 7 Mar 2015 22:52:21 -0600 Subject: [PATCH] Player affects spawning API diff --git a/Spigot-Server-Patches/0022-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch b/Spigot-Server-Patches/0021-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch similarity index 90% rename from Spigot-Server-Patches/0022-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch rename to Spigot-Server-Patches/0021-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch index 9565bab91e..cc76206f2d 100644 --- a/Spigot-Server-Patches/0022-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch +++ b/Spigot-Server-Patches/0021-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch @@ -1,4 +1,4 @@ -From c655d292ef72c3ba8482b9579f0bd498f43604ee Mon Sep 17 00:00:00 2001 +From 866eff9b3494a65ad776257b09a4826e0ffc4de0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 22:55:25 -0600 Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and @@ -6,7 +6,7 @@ Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e211647..ac8d1a7 100644 +index 88640a5..b9b8bba 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1018,7 +1018,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/Spigot-Server-Patches/0023-RIP-metrics.patch b/Spigot-Server-Patches/0022-RIP-metrics.patch similarity index 99% rename from Spigot-Server-Patches/0023-RIP-metrics.patch rename to Spigot-Server-Patches/0022-RIP-metrics.patch index e07cc55f6b..4f4c4c99e8 100644 --- a/Spigot-Server-Patches/0023-RIP-metrics.patch +++ b/Spigot-Server-Patches/0022-RIP-metrics.patch @@ -1,4 +1,4 @@ -From dc843ffc9374210bbdbef3871117c59e8aa2cf2e Mon Sep 17 00:00:00 2001 +From d8b7ac10997877efad844eb952c8bea62a5fceff Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 7 Mar 2015 22:57:07 -0600 Subject: [PATCH] RIP metrics diff --git a/Spigot-Server-Patches/0024-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0023-Remove-invalid-mob-spawner-tile-entities.patch similarity index 97% rename from Spigot-Server-Patches/0024-Remove-invalid-mob-spawner-tile-entities.patch rename to Spigot-Server-Patches/0023-Remove-invalid-mob-spawner-tile-entities.patch index 47d0194b88..1110c5a18b 100644 --- a/Spigot-Server-Patches/0024-Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/0023-Remove-invalid-mob-spawner-tile-entities.patch @@ -1,4 +1,4 @@ -From 390efb6681ac43fcc4cafc409a4f92b541e7a351 Mon Sep 17 00:00:00 2001 +From cca0cf4d9897633eccc132aa8668eb7c030d0a9c Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sun, 8 Mar 2015 01:06:14 -0600 Subject: [PATCH] Remove invalid mob spawner tile entities diff --git a/Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0024-Optimize-TileEntity-Ticking.patch similarity index 99% rename from Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch rename to Spigot-Server-Patches/0024-Optimize-TileEntity-Ticking.patch index fe271d09d7..962cf8fe3a 100644 --- a/Spigot-Server-Patches/0025-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0024-Optimize-TileEntity-Ticking.patch @@ -1,4 +1,4 @@ -From 567fda34866e5f559f4649798c8db63358d5e8cb Mon Sep 17 00:00:00 2001 +From afcd29c0fb52110b9aa263f54f21c206ca55b333 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 01:56:22 -0600 Subject: [PATCH] Optimize TileEntity Ticking diff --git a/Spigot-Server-Patches/0026-Move-sound-handling-out-of-the-chest-tick-loop.patch b/Spigot-Server-Patches/0025-Move-sound-handling-out-of-the-chest-tick-loop.patch similarity index 99% rename from Spigot-Server-Patches/0026-Move-sound-handling-out-of-the-chest-tick-loop.patch rename to Spigot-Server-Patches/0025-Move-sound-handling-out-of-the-chest-tick-loop.patch index 7cd82d22e4..69118b348d 100644 --- a/Spigot-Server-Patches/0026-Move-sound-handling-out-of-the-chest-tick-loop.patch +++ b/Spigot-Server-Patches/0025-Move-sound-handling-out-of-the-chest-tick-loop.patch @@ -1,4 +1,4 @@ -From 3c8a5a4a7370224e942ade00b02f474f9eae7f48 Mon Sep 17 00:00:00 2001 +From b241364542febefab32e12ba3079bdf53dd1eb0b Mon Sep 17 00:00:00 2001 From: Iceee Date: Sun, 8 Mar 2015 03:16:39 -0500 Subject: [PATCH] Move sound handling out of the chest tick loop diff --git a/Spigot-Server-Patches/0027-Remove-certain-entities-that-fly-through-unloaded-ch.patch b/Spigot-Server-Patches/0026-Remove-certain-entities-that-fly-through-unloaded-ch.patch similarity index 98% rename from Spigot-Server-Patches/0027-Remove-certain-entities-that-fly-through-unloaded-ch.patch rename to Spigot-Server-Patches/0026-Remove-certain-entities-that-fly-through-unloaded-ch.patch index 41c0ea3871..a116bb82a4 100644 --- a/Spigot-Server-Patches/0027-Remove-certain-entities-that-fly-through-unloaded-ch.patch +++ b/Spigot-Server-Patches/0026-Remove-certain-entities-that-fly-through-unloaded-ch.patch @@ -1,4 +1,4 @@ -From bce1f0246609ac7585ce26ba615ae0c6ba64c53b Mon Sep 17 00:00:00 2001 +From 14d9eb1bb9fd025d44c9383e57096e00f66cc6e1 Mon Sep 17 00:00:00 2001 From: Iceee Date: Sun, 8 Mar 2015 03:34:15 -0500 Subject: [PATCH] Remove certain entities that fly through unloaded chunks diff --git a/Spigot-Server-Patches/0028-Configurable-strength-and-weakness-effect-modifiers.patch b/Spigot-Server-Patches/0027-Configurable-strength-and-weakness-effect-modifiers.patch similarity index 96% rename from Spigot-Server-Patches/0028-Configurable-strength-and-weakness-effect-modifiers.patch rename to Spigot-Server-Patches/0027-Configurable-strength-and-weakness-effect-modifiers.patch index 6124a5e3b3..37cabbfefb 100644 --- a/Spigot-Server-Patches/0028-Configurable-strength-and-weakness-effect-modifiers.patch +++ b/Spigot-Server-Patches/0027-Configurable-strength-and-weakness-effect-modifiers.patch @@ -1,4 +1,4 @@ -From 8e9936e9bb7d39767e2f08ffacec8ab5bd0876f2 Mon Sep 17 00:00:00 2001 +From 113e9f7f45f54115339cf463c3e6696e331e479b Mon Sep 17 00:00:00 2001 From: gsand Date: Sun, 8 Mar 2015 03:41:33 -0500 Subject: [PATCH] Configurable strength and weakness effect modifiers diff --git a/Spigot-Server-Patches/0029-Temporary-fix-for-rails-dupe.patch b/Spigot-Server-Patches/0028-Temporary-fix-for-rails-dupe.patch similarity index 94% rename from Spigot-Server-Patches/0029-Temporary-fix-for-rails-dupe.patch rename to Spigot-Server-Patches/0028-Temporary-fix-for-rails-dupe.patch index b9457fbcd8..dc5f12297f 100644 --- a/Spigot-Server-Patches/0029-Temporary-fix-for-rails-dupe.patch +++ b/Spigot-Server-Patches/0028-Temporary-fix-for-rails-dupe.patch @@ -1,4 +1,4 @@ -From 343facd4d7480a320e76434e3861d45bae4b4b41 Mon Sep 17 00:00:00 2001 +From 8c9305592b06bbdb8eafcdc2ce97f7e95dc0115b Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Sun, 8 Mar 2015 03:45:49 -0500 Subject: [PATCH] Temporary fix for rails dupe diff --git a/Spigot-Server-Patches/0030-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0029-Further-improve-server-tick-loop.patch similarity index 99% rename from Spigot-Server-Patches/0030-Further-improve-server-tick-loop.patch rename to Spigot-Server-Patches/0029-Further-improve-server-tick-loop.patch index bad728a187..653eb6fb80 100644 --- a/Spigot-Server-Patches/0030-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0029-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From 4c9d2a549ef6b87993ae719b2f6d412014ef0093 Mon Sep 17 00:00:00 2001 +From a26a02fd43b1d4bba8335252b6e607cf2689f599 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 03:47:32 -0500 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ac8d1a7..d9c386e 100644 +index b9b8bba..9a9de19 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -115,17 +115,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs diff --git a/Spigot-Server-Patches/0031-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0030-Only-refresh-abilities-if-needed.patch similarity index 91% rename from Spigot-Server-Patches/0031-Only-refresh-abilities-if-needed.patch rename to Spigot-Server-Patches/0030-Only-refresh-abilities-if-needed.patch index b3feb73736..325420bc81 100644 --- a/Spigot-Server-Patches/0031-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0030-Only-refresh-abilities-if-needed.patch @@ -1,11 +1,11 @@ -From 626395696a01106645f4109cb146982aa461c230 Mon Sep 17 00:00:00 2001 +From abf69c7aee5dbfab5cc1f9543d85e9bbaf944ce7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Nov 2014 13:20:22 -0600 Subject: [PATCH] Only refresh abilities if needed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 571e066..53d7874 100644 +index 5d5f987..20287d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1146,12 +1146,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0032-Player-lookup-improvements.patch b/Spigot-Server-Patches/0031-Player-lookup-improvements.patch similarity index 98% rename from Spigot-Server-Patches/0032-Player-lookup-improvements.patch rename to Spigot-Server-Patches/0031-Player-lookup-improvements.patch index 08e34f2fe9..7a3333b6fd 100644 --- a/Spigot-Server-Patches/0032-Player-lookup-improvements.patch +++ b/Spigot-Server-Patches/0031-Player-lookup-improvements.patch @@ -1,4 +1,4 @@ -From 8b952f990dc321b91a929ad3b421227b5da923e5 Mon Sep 17 00:00:00 2001 +From a9057aa9345228c4025b27078d2ee70bdee4e459 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 04:03:56 -0500 Subject: [PATCH] Player lookup improvements @@ -13,7 +13,7 @@ By using a map based approach for player lookups, player lookup should be consistent in performance regardless of how many players are online. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index d93b00c..063cd81 100644 +index c7d26ce..18c6641 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -49,6 +49,31 @@ public abstract class PlayerList { @@ -153,7 +153,7 @@ index 6aa57ae..6150255 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 53d7874..0e6d96c 100644 +index 20287d2..af71b8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -104,13 +104,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0033-Configurable-game-mechanics-changes.patch b/Spigot-Server-Patches/0032-Configurable-game-mechanics-changes.patch similarity index 98% rename from Spigot-Server-Patches/0033-Configurable-game-mechanics-changes.patch rename to Spigot-Server-Patches/0032-Configurable-game-mechanics-changes.patch index ccf77bde44..082255cba5 100644 --- a/Spigot-Server-Patches/0033-Configurable-game-mechanics-changes.patch +++ b/Spigot-Server-Patches/0032-Configurable-game-mechanics-changes.patch @@ -1,4 +1,4 @@ -From 53a6285f845766bdf8fb86fa3cb7dcbc0549070a Mon Sep 17 00:00:00 2001 +From 66292f7e9fb064cda6d087b23a5569f19a4c3175 Mon Sep 17 00:00:00 2001 From: gsand Date: Sun, 8 Mar 2015 04:10:02 -0500 Subject: [PATCH] Configurable game mechanics changes diff --git a/Spigot-Server-Patches/0034-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0033-Add-async-chunk-load-API.patch similarity index 93% rename from Spigot-Server-Patches/0034-Add-async-chunk-load-API.patch rename to Spigot-Server-Patches/0033-Add-async-chunk-load-API.patch index aac07ffd00..9cd34dded1 100644 --- a/Spigot-Server-Patches/0034-Add-async-chunk-load-API.patch +++ b/Spigot-Server-Patches/0033-Add-async-chunk-load-API.patch @@ -1,11 +1,11 @@ -From 20f44a91c23ff03618ac22e7b3e297be34128947 Mon Sep 17 00:00:00 2001 +From f0be1406d6177779cc38e5818fe8948fad68aaaf Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 6 Nov 2014 18:29:20 -0600 Subject: [PATCH] Add async chunk load API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 2bbe104..d8401c4 100644 +index 7a1f2c7..4c55e68 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -120,6 +120,24 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0035-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch b/Spigot-Server-Patches/0034-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch similarity index 97% rename from Spigot-Server-Patches/0035-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch rename to Spigot-Server-Patches/0034-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch index 8a0d3a09d9..beebedd855 100644 --- a/Spigot-Server-Patches/0035-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch +++ b/Spigot-Server-Patches/0034-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch @@ -1,4 +1,4 @@ -From 2f1eb19113992c67333285f2af81f6198897b3eb Mon Sep 17 00:00:00 2001 +From ec24a84a17c631de797f9e995f67bb0ede42dda1 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sun, 30 Nov 2014 18:58:07 -0600 Subject: [PATCH] Allow specified ItemStacks to retain their invalid data diff --git a/Spigot-Server-Patches/0036-Add-TNT-source-location-API.patch b/Spigot-Server-Patches/0035-Add-TNT-source-location-API.patch similarity index 99% rename from Spigot-Server-Patches/0036-Add-TNT-source-location-API.patch rename to Spigot-Server-Patches/0035-Add-TNT-source-location-API.patch index 341c2266be..76e218a3c5 100644 --- a/Spigot-Server-Patches/0036-Add-TNT-source-location-API.patch +++ b/Spigot-Server-Patches/0035-Add-TNT-source-location-API.patch @@ -1,4 +1,4 @@ -From cbb32a3e84c597db603360864d67295ec7dd2728 Mon Sep 17 00:00:00 2001 +From 32751125c3a98428353caa172d8295e3e8630d3e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 04:23:41 -0500 Subject: [PATCH] Add TNT source location API diff --git a/Spigot-Server-Patches/0037-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0036-Prevent-tile-entity-and-entity-crashes.patch similarity index 98% rename from Spigot-Server-Patches/0037-Prevent-tile-entity-and-entity-crashes.patch rename to Spigot-Server-Patches/0036-Prevent-tile-entity-and-entity-crashes.patch index f7595fefde..5e0241df0c 100644 --- a/Spigot-Server-Patches/0037-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0036-Prevent-tile-entity-and-entity-crashes.patch @@ -1,4 +1,4 @@ -From 4f48af740265cfcab39c9d8c8a013ee0e3ba101a Mon Sep 17 00:00:00 2001 +From ac5c2cf4282f96547d2c96251ec2bb6865f1af6e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 04:37:23 -0500 Subject: [PATCH] Prevent tile entity and entity crashes diff --git a/Spigot-Server-Patches/0038-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0037-Configurable-top-of-nether-void-damage.patch similarity index 96% rename from Spigot-Server-Patches/0038-Configurable-top-of-nether-void-damage.patch rename to Spigot-Server-Patches/0037-Configurable-top-of-nether-void-damage.patch index 2a7d0c4d04..91abfba7f3 100644 --- a/Spigot-Server-Patches/0038-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0037-Configurable-top-of-nether-void-damage.patch @@ -1,4 +1,4 @@ -From 2ee7ab93b17fd721016e8891dbe6b42859019592 Mon Sep 17 00:00:00 2001 +From bf77b5dc899e2b259abc934f6af93cc4acc111e3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 23 Feb 2015 14:57:28 -0600 Subject: [PATCH] Configurable top of nether void damage diff --git a/Spigot-Server-Patches/0039-Enderman-drop-the-block-they-re-holding-when-they-di.patch b/Spigot-Server-Patches/0038-Enderman-drop-the-block-they-re-holding-when-they-di.patch similarity index 93% rename from Spigot-Server-Patches/0039-Enderman-drop-the-block-they-re-holding-when-they-di.patch rename to Spigot-Server-Patches/0038-Enderman-drop-the-block-they-re-holding-when-they-di.patch index fd75f8909c..8084c7ceff 100644 --- a/Spigot-Server-Patches/0039-Enderman-drop-the-block-they-re-holding-when-they-di.patch +++ b/Spigot-Server-Patches/0038-Enderman-drop-the-block-they-re-holding-when-they-di.patch @@ -1,4 +1,4 @@ -From 82519270768b7b9abc1c721eeca22a6b0714f855 Mon Sep 17 00:00:00 2001 +From 89d4f3637d8965b1c72c460a8939ff529e9f1609 Mon Sep 17 00:00:00 2001 From: Zach Date: Fri, 13 Feb 2015 14:49:30 -0600 Subject: [PATCH] Enderman drop the block they're holding when they die diff --git a/Spigot-Server-Patches/0040-PaperSpigot-TNT-Changes.patch b/Spigot-Server-Patches/0039-PaperSpigot-TNT-Changes.patch similarity index 98% rename from Spigot-Server-Patches/0040-PaperSpigot-TNT-Changes.patch rename to Spigot-Server-Patches/0039-PaperSpigot-TNT-Changes.patch index 73d7299b53..45212382ed 100644 --- a/Spigot-Server-Patches/0040-PaperSpigot-TNT-Changes.patch +++ b/Spigot-Server-Patches/0039-PaperSpigot-TNT-Changes.patch @@ -1,4 +1,4 @@ -From ec5c9469d4ea7c4fa2c526e823ffc4a29ecdb436 Mon Sep 17 00:00:00 2001 +From 359beb44876591e93dfec57afbd13e75a43891ea Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 8 Mar 2015 04:52:37 -0500 Subject: [PATCH] PaperSpigot TNT Changes diff --git a/Spigot-Server-Patches/0041-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0040-Check-online-mode-before-converting-and-renaming-pla.patch similarity index 94% rename from Spigot-Server-Patches/0041-Check-online-mode-before-converting-and-renaming-pla.patch rename to Spigot-Server-Patches/0040-Check-online-mode-before-converting-and-renaming-pla.patch index bb2b87d77d..9955774720 100644 --- a/Spigot-Server-Patches/0041-Check-online-mode-before-converting-and-renaming-pla.patch +++ b/Spigot-Server-Patches/0040-Check-online-mode-before-converting-and-renaming-pla.patch @@ -1,4 +1,4 @@ -From f4fe33616c5bdeb316e1ff4752facc9918f5c41c Mon Sep 17 00:00:00 2001 +From f542fa5ba10ffa2a7ee41cd7db5d49c750ecd11a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 5 Mar 2015 15:30:06 -0600 Subject: [PATCH] Check online mode before converting and renaming player data