diff --git a/Spigot-Server-Patches/0424-Lag-compensate-eating.patch b/Spigot-Server-Patches/0425-Lag-compensate-eating.patch similarity index 89% rename from Spigot-Server-Patches/0424-Lag-compensate-eating.patch rename to Spigot-Server-Patches/0425-Lag-compensate-eating.patch index 4f9e7cc1e..6c05077df 100644 --- a/Spigot-Server-Patches/0424-Lag-compensate-eating.patch +++ b/Spigot-Server-Patches/0425-Lag-compensate-eating.patch @@ -1,4 +1,4 @@ -From 87c14a596917328424dc5f9319d8ca44f5d8c533 Mon Sep 17 00:00:00 2001 +From 2e82a885dd01c3c7c249ea01e95071e9a4ef631d Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Jan 2020 15:28:28 -0800 Subject: [PATCH] Lag compensate eating @@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating. Change to also use a time check instead if it passes. diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 80219f2df..1c93f1fbc 100644 +index 6184cced7..1b9551ae0 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -113,7 +113,7 @@ public abstract class EntityLiving extends Entity { @@ -19,7 +19,7 @@ index 80219f2df..1c93f1fbc 100644 protected int bm; private BlockPosition bE; private DamageSource bF; -@@ -2842,6 +2842,10 @@ public abstract class EntityLiving extends Entity { +@@ -2844,6 +2844,10 @@ public abstract class EntityLiving extends Entity { return ((Byte) this.datawatcher.get(EntityLiving.ao) & 2) > 0 ? EnumHand.OFF_HAND : EnumHand.MAIN_HAND; } @@ -30,7 +30,7 @@ index 80219f2df..1c93f1fbc 100644 private void o() { if (this.isHandRaised()) { if (ItemStack.d(this.b(this.getRaisedHand()), this.activeItem)) { -@@ -2850,7 +2854,14 @@ public abstract class EntityLiving extends Entity { +@@ -2852,7 +2856,14 @@ public abstract class EntityLiving extends Entity { this.b(this.activeItem, 5); } @@ -46,7 +46,7 @@ index 80219f2df..1c93f1fbc 100644 this.q(); } } else { -@@ -2900,7 +2911,10 @@ public abstract class EntityLiving extends Entity { +@@ -2902,7 +2913,10 @@ public abstract class EntityLiving extends Entity { if (!itemstack.isEmpty() && !this.isHandRaised() || forceUpdate) { // Paper use override flag this.activeItem = itemstack; @@ -58,7 +58,7 @@ index 80219f2df..1c93f1fbc 100644 if (!this.world.isClientSide) { this.c(1, true); this.c(2, enumhand == EnumHand.OFF_HAND); -@@ -2924,7 +2938,10 @@ public abstract class EntityLiving extends Entity { +@@ -2926,7 +2940,10 @@ public abstract class EntityLiving extends Entity { } } else if (!this.isHandRaised() && !this.activeItem.isEmpty()) { this.activeItem = ItemStack.a; @@ -70,7 +70,7 @@ index 80219f2df..1c93f1fbc 100644 } } -@@ -3046,7 +3063,10 @@ public abstract class EntityLiving extends Entity { +@@ -3048,7 +3065,10 @@ public abstract class EntityLiving extends Entity { } this.activeItem = ItemStack.a; diff --git a/Spigot-Server-Patches/0425-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0426-Optimize-call-to-getFluid-for-explosions.patch similarity index 94% rename from Spigot-Server-Patches/0425-Optimize-call-to-getFluid-for-explosions.patch rename to Spigot-Server-Patches/0426-Optimize-call-to-getFluid-for-explosions.patch index 272adcb05..1c5655205 100644 --- a/Spigot-Server-Patches/0425-Optimize-call-to-getFluid-for-explosions.patch +++ b/Spigot-Server-Patches/0426-Optimize-call-to-getFluid-for-explosions.patch @@ -1,4 +1,4 @@ -From 4fbc26ec66035fd45ddac8f746b15dd20c0a6a0b Mon Sep 17 00:00:00 2001 +From 2a0f2c0409f7add8fbf63f1fe36cdfbcbd3684ca Mon Sep 17 00:00:00 2001 From: BrodyBeckwith Date: Tue, 14 Jan 2020 17:49:03 -0500 Subject: [PATCH] Optimize call to getFluid for explosions diff --git a/Spigot-Server-Patches/0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0427-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 95% rename from Spigot-Server-Patches/0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to Spigot-Server-Patches/0427-Fix-last-firework-in-stack-not-having-effects-when-d.patch index 2ae00118d..07649e63f 100644 --- a/Spigot-Server-Patches/0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch +++ b/Spigot-Server-Patches/0427-Fix-last-firework-in-stack-not-having-effects-when-d.patch @@ -1,4 +1,4 @@ -From 9fc6ac16d10154e8a5c38be02d2625eee61a091f Mon Sep 17 00:00:00 2001 +From 6a1b5bebc34a1721a9686b9bf5d8229e7c715201 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 17 Jan 2020 18:44:55 -0800 Subject: [PATCH] Fix last firework in stack not having effects when dispensed diff --git a/Spigot-Server-Patches/0427-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0428-Activation-Range-Improvements.patch similarity index 99% rename from Spigot-Server-Patches/0427-Activation-Range-Improvements.patch rename to Spigot-Server-Patches/0428-Activation-Range-Improvements.patch index 58cc57a2c..6074832b4 100644 --- a/Spigot-Server-Patches/0427-Activation-Range-Improvements.patch +++ b/Spigot-Server-Patches/0428-Activation-Range-Improvements.patch @@ -1,4 +1,4 @@ -From 0ef41ed35dc8014ce9738976f227f37ca324e3aa Mon Sep 17 00:00:00 2001 +From 7ac06d699d63f2f3ec9b2364943c2ae6d7166678 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Activation Range Improvements @@ -274,7 +274,7 @@ index 92601c581..6e165a164 100644 isActive = false; } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index c2906f20a..885512396 100644 +index 58767972a..3ceeed3f9 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -180,6 +180,7 @@ public class SpigotWorldConfig diff --git a/Spigot-Server-Patches/0428-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0429-Add-effect-to-block-break-naturally.patch similarity index 95% rename from Spigot-Server-Patches/0428-Add-effect-to-block-break-naturally.patch rename to Spigot-Server-Patches/0429-Add-effect-to-block-break-naturally.patch index 22b2617a6..56cdc5637 100644 --- a/Spigot-Server-Patches/0428-Add-effect-to-block-break-naturally.patch +++ b/Spigot-Server-Patches/0429-Add-effect-to-block-break-naturally.patch @@ -1,4 +1,4 @@ -From 2e94cc6a5db7ef1811142ee532c3b7259565d1fe Mon Sep 17 00:00:00 2001 +From 25a422b6b9d4265c73f603e070518b6105ee460a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 12:25:07 -0600 Subject: [PATCH] Add effect to block break naturally diff --git a/Spigot-Server-Patches/0429-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0430-Tracking-Range-Improvements.patch similarity index 97% rename from Spigot-Server-Patches/0429-Tracking-Range-Improvements.patch rename to Spigot-Server-Patches/0430-Tracking-Range-Improvements.patch index 0352d28b3..06e448cdb 100644 --- a/Spigot-Server-Patches/0429-Tracking-Range-Improvements.patch +++ b/Spigot-Server-Patches/0430-Tracking-Range-Improvements.patch @@ -1,4 +1,4 @@ -From 88d240ff34b481034069835a79f3b2a537150183 Mon Sep 17 00:00:00 2001 +From bf942fbe7fb7f2dbb7bae951d724993390e05a8c Mon Sep 17 00:00:00 2001 From: kickash32 Date: Sat, 21 Dec 2019 15:22:09 -0500 Subject: [PATCH] Tracking Range Improvements diff --git a/Spigot-Server-Patches/0430-Fix-comparator-behavior-for-EntityPhanton-goal.patch b/Spigot-Server-Patches/0431-Fix-comparator-behavior-for-EntityPhanton-goal.patch similarity index 93% rename from Spigot-Server-Patches/0430-Fix-comparator-behavior-for-EntityPhanton-goal.patch rename to Spigot-Server-Patches/0431-Fix-comparator-behavior-for-EntityPhanton-goal.patch index d2ce2172f..d93e787c7 100644 --- a/Spigot-Server-Patches/0430-Fix-comparator-behavior-for-EntityPhanton-goal.patch +++ b/Spigot-Server-Patches/0431-Fix-comparator-behavior-for-EntityPhanton-goal.patch @@ -1,4 +1,4 @@ -From 6546f6bc44b3cbfb74ef5c6f77010d406c9f2a41 Mon Sep 17 00:00:00 2001 +From 0b73f7fd0181ed80b76fd44005e9fe83cf1e61f5 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 22 Jan 2020 21:00:21 +0000 Subject: [PATCH] Fix comparator behavior for EntityPhanton goal diff --git a/Spigot-Server-Patches/0431-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0432-Fix-items-vanishing-through-end-portal.patch similarity index 96% rename from Spigot-Server-Patches/0431-Fix-items-vanishing-through-end-portal.patch rename to Spigot-Server-Patches/0432-Fix-items-vanishing-through-end-portal.patch index 761f02c7f..eade3aedb 100644 --- a/Spigot-Server-Patches/0431-Fix-items-vanishing-through-end-portal.patch +++ b/Spigot-Server-Patches/0432-Fix-items-vanishing-through-end-portal.patch @@ -1,4 +1,4 @@ -From 1e8da59b31454797447e9b1e37a52d16461a7ed3 Mon Sep 17 00:00:00 2001 +From 5fdd01ee95c59e7e85042c83b9f2dd38e2b658eb Mon Sep 17 00:00:00 2001 From: AJMFactsheets Date: Wed, 22 Jan 2020 19:52:28 -0600 Subject: [PATCH] Fix items vanishing through end portal diff --git a/Spigot-Server-Patches/0432-Seed-based-feature-search.patch b/Spigot-Server-Patches/0433-Seed-based-feature-search.patch similarity index 98% rename from Spigot-Server-Patches/0432-Seed-based-feature-search.patch rename to Spigot-Server-Patches/0433-Seed-based-feature-search.patch index 50f91db3e..ec6e7436d 100644 --- a/Spigot-Server-Patches/0432-Seed-based-feature-search.patch +++ b/Spigot-Server-Patches/0433-Seed-based-feature-search.patch @@ -1,4 +1,4 @@ -From 4493014f9b0f3c1487873cde43f4ff9fcc03aef0 Mon Sep 17 00:00:00 2001 +From 26a819f39b9ff44bbcab563d6f839cd43691d40e Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Mon, 13 Jan 2020 15:40:32 +0100 Subject: [PATCH] Seed based feature search diff --git a/Spigot-Server-Patches/0433-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0434-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 96% rename from Spigot-Server-Patches/0433-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to Spigot-Server-Patches/0434-Bees-get-gravity-in-void.-Fixes-MC-167279.patch index 38efe9213..a020d20fe 100644 --- a/Spigot-Server-Patches/0433-Bees-get-gravity-in-void.-Fixes-MC-167279.patch +++ b/Spigot-Server-Patches/0434-Bees-get-gravity-in-void.-Fixes-MC-167279.patch @@ -1,4 +1,4 @@ -From e55cf10671e8ba7ac7887ad0fcc5325464705e4a Mon Sep 17 00:00:00 2001 +From d2a044d9e091d09b35265be50c646f57f2172bcd Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 Jan 2020 16:30:19 -0600 Subject: [PATCH] Bees get gravity in void. Fixes MC-167279 @@ -31,7 +31,7 @@ index 2b6ac2eeb..0496c0c5d 100644 this.h = ControllerMove.Operation.WAIT; this.a.setNoGravity(true); diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index f67d66b9a..6154c4470 100644 +index e039ec536..7fdfe9b92 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -36,7 +36,17 @@ public class EntityBee extends EntityAnimal implements EntityBird { diff --git a/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0435-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 98% rename from Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to Spigot-Server-Patches/0435-Optimise-getChunkAt-calls-for-loaded-chunks.patch index 3be3e2033..a7f7f62f4 100644 --- a/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/Spigot-Server-Patches/0435-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -1,4 +1,4 @@ -From 781858c6f0c1ad9d537df5969a011ceca070211f Mon Sep 17 00:00:00 2001 +From 2c3714b7548688e69abc5d4e16953ac36cf68bcf Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 25 Jan 2020 17:04:35 -0800 Subject: [PATCH] Optimise getChunkAt calls for loaded chunks diff --git a/Spigot-Server-Patches/0435-Be-more-tolerant-of-invalid-attributes.patch b/Spigot-Server-Patches/0436-Be-more-tolerant-of-invalid-attributes.patch similarity index 96% rename from Spigot-Server-Patches/0435-Be-more-tolerant-of-invalid-attributes.patch rename to Spigot-Server-Patches/0436-Be-more-tolerant-of-invalid-attributes.patch index 96a46e6cf..68784e461 100644 --- a/Spigot-Server-Patches/0435-Be-more-tolerant-of-invalid-attributes.patch +++ b/Spigot-Server-Patches/0436-Be-more-tolerant-of-invalid-attributes.patch @@ -1,4 +1,4 @@ -From e433847829248399e6cab3296dd39dcf8471cfbf Mon Sep 17 00:00:00 2001 +From 21b08a76566773d9fe0215ec49975d4b64d28f07 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 6 Feb 2020 19:20:27 -0600 Subject: [PATCH] Be more tolerant of invalid attributes