diff --git a/Spigot-Server-Patches/0613-Fix-curing-villager-makes-equipment-disappear.patch b/Spigot-Server-Patches/0613-Fix-curing-villager-makes-equipment-disappear.patch deleted file mode 100644 index 25bd9b960a..0000000000 --- a/Spigot-Server-Patches/0613-Fix-curing-villager-makes-equipment-disappear.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Tue, 8 Dec 2020 22:06:56 -0600 -Subject: [PATCH] Fix curing villager makes equipment disappear - -This fixes the CB bug where curing a villager that is holding -equipment (weapons/armor) causes the items to disappear instead of drop -to the ground by forcing the items to drop instead of going to the drops -field for the EntityDeathEvent which does not fire for entity conversions. - -diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/EntityZombieVillager.java -index e137b1e17edd05d244a9d520bb4435f17d8c7daa..c03f4655dcca3d9635a7e13244b7977425a3f291 100644 ---- a/src/main/java/net/minecraft/world/entity/monster/EntityZombieVillager.java -+++ b/src/main/java/net/minecraft/world/entity/monster/EntityZombieVillager.java -@@ -222,7 +222,9 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo - double d0 = (double) this.e(enumitemslot); - - if (d0 > 1.0D) { -+ this.forceDrops = true; // Paper - fix SPIGOT-6207 - this.a(itemstack); -+ this.forceDrops = false; // Paper - fix SPIGOT-6207 - } - } - } diff --git a/Spigot-Server-Patches/0614-Limit-recipe-packets.patch b/Spigot-Server-Patches/0613-Limit-recipe-packets.patch similarity index 97% rename from Spigot-Server-Patches/0614-Limit-recipe-packets.patch rename to Spigot-Server-Patches/0613-Limit-recipe-packets.patch index 41f1e4f94b..4e2b6b0fdb 100644 --- a/Spigot-Server-Patches/0614-Limit-recipe-packets.patch +++ b/Spigot-Server-Patches/0613-Limit-recipe-packets.patch @@ -23,7 +23,7 @@ index 7d50aded88f5b7dfebaea1aebc86231f7b5c4e25..652d87fc5d566dba8018c81676329f0e public static boolean velocityOnlineMode; public static byte[] velocitySecretKey; diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index 9ec4316c8d517f8af9f36f586e833b5a3ad30895..c6b33b355b8e06d4ef6a8f542ab460c55af8c00e 100644 +index 2380b7c82d012e466172b32b04601f5c691ca0c5..25eaad51bc7a8593d47804ea2774382d4dd55080 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0615-Fix-CraftSound-backwards-compatibility.patch b/Spigot-Server-Patches/0614-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from Spigot-Server-Patches/0615-Fix-CraftSound-backwards-compatibility.patch rename to Spigot-Server-Patches/0614-Fix-CraftSound-backwards-compatibility.patch diff --git a/Spigot-Server-Patches/0616-MC-4-Fix-item-position-desync.patch b/Spigot-Server-Patches/0615-MC-4-Fix-item-position-desync.patch similarity index 100% rename from Spigot-Server-Patches/0616-MC-4-Fix-item-position-desync.patch rename to Spigot-Server-Patches/0615-MC-4-Fix-item-position-desync.patch diff --git a/Spigot-Server-Patches/0617-Player-Chunk-Load-Unload-Events.patch b/Spigot-Server-Patches/0616-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from Spigot-Server-Patches/0617-Player-Chunk-Load-Unload-Events.patch rename to Spigot-Server-Patches/0616-Player-Chunk-Load-Unload-Events.patch diff --git a/Spigot-Server-Patches/0618-Optimize-Dynamic-get-Missing-Keys.patch b/Spigot-Server-Patches/0617-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from Spigot-Server-Patches/0618-Optimize-Dynamic-get-Missing-Keys.patch rename to Spigot-Server-Patches/0617-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/Spigot-Server-Patches/0619-Expose-LivingEntity-hurt-direction.patch b/Spigot-Server-Patches/0618-Expose-LivingEntity-hurt-direction.patch similarity index 94% rename from Spigot-Server-Patches/0619-Expose-LivingEntity-hurt-direction.patch rename to Spigot-Server-Patches/0618-Expose-LivingEntity-hurt-direction.patch index 6aef15e6b9..551ec0e06f 100644 --- a/Spigot-Server-Patches/0619-Expose-LivingEntity-hurt-direction.patch +++ b/Spigot-Server-Patches/0618-Expose-LivingEntity-hurt-direction.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java -index 9a826ae0319dd52ca7d98ea5d7312fb773736ddb..800a8b8e1a49eb6ec920abaad4514a9a91a3542e 100644 +index 358bb6244b7b9e785c7dcc3725ee00cfbb917cec..deffd82dfca1d2eea6e5b8db9228015bf35ad0a3 100644 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java @@ -163,7 +163,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0620-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/Spigot-Server-Patches/0619-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 91% rename from Spigot-Server-Patches/0620-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to Spigot-Server-Patches/0619-Add-OBSTRUCTED-reason-to-BedEnterResult.patch index 22dc7f31e0..2a99fe8f73 100644 --- a/Spigot-Server-Patches/0620-Add-OBSTRUCTED-reason-to-BedEnterResult.patch +++ b/Spigot-Server-Patches/0619-Add-OBSTRUCTED-reason-to-BedEnterResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index be2aa53a45b98d6d6de0c464653264399510d630..89c6d1f05878d6c220090af82939cbba4fa2555f 100644 +index 2e4dc2fb42b10243ddacbf5af606910a5769ea01..cb577bd576ff099f183b1c9e5d60bd74276c7394 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -264,6 +264,10 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0621-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/Spigot-Server-Patches/0620-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from Spigot-Server-Patches/0621-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to Spigot-Server-Patches/0620-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/Spigot-Server-Patches/0622-added-PlayerTradeEvent.patch b/Spigot-Server-Patches/0621-added-PlayerTradeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0622-added-PlayerTradeEvent.patch rename to Spigot-Server-Patches/0621-added-PlayerTradeEvent.patch diff --git a/Spigot-Server-Patches/0623-Implement-TargetHitEvent.patch b/Spigot-Server-Patches/0622-Implement-TargetHitEvent.patch similarity index 100% rename from Spigot-Server-Patches/0623-Implement-TargetHitEvent.patch rename to Spigot-Server-Patches/0622-Implement-TargetHitEvent.patch diff --git a/Spigot-Server-Patches/0624-Additional-Block-Material-API-s.patch b/Spigot-Server-Patches/0623-Additional-Block-Material-API-s.patch similarity index 100% rename from Spigot-Server-Patches/0624-Additional-Block-Material-API-s.patch rename to Spigot-Server-Patches/0623-Additional-Block-Material-API-s.patch diff --git a/Spigot-Server-Patches/0625-Fix-harming-potion-dupe.patch b/Spigot-Server-Patches/0624-Fix-harming-potion-dupe.patch similarity index 100% rename from Spigot-Server-Patches/0625-Fix-harming-potion-dupe.patch rename to Spigot-Server-Patches/0624-Fix-harming-potion-dupe.patch diff --git a/Spigot-Server-Patches/0626-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/Spigot-Server-Patches/0625-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from Spigot-Server-Patches/0626-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to Spigot-Server-Patches/0625-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/Spigot-Server-Patches/0627-Optimized-tick-ready-check.patch b/Spigot-Server-Patches/0626-Optimized-tick-ready-check.patch similarity index 100% rename from Spigot-Server-Patches/0627-Optimized-tick-ready-check.patch rename to Spigot-Server-Patches/0626-Optimized-tick-ready-check.patch diff --git a/Spigot-Server-Patches/0628-Cache-burn-durations.patch b/Spigot-Server-Patches/0627-Cache-burn-durations.patch similarity index 100% rename from Spigot-Server-Patches/0628-Cache-burn-durations.patch rename to Spigot-Server-Patches/0627-Cache-burn-durations.patch diff --git a/Spigot-Server-Patches/0629-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/Spigot-Server-Patches/0628-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from Spigot-Server-Patches/0629-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to Spigot-Server-Patches/0628-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/Spigot-Server-Patches/0630-Implement-PlayerFlowerPotManipulateEvent.patch b/Spigot-Server-Patches/0629-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from Spigot-Server-Patches/0630-Implement-PlayerFlowerPotManipulateEvent.patch rename to Spigot-Server-Patches/0629-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/Spigot-Server-Patches/0631-Fix-interact-event-not-being-called-in-adventure.patch b/Spigot-Server-Patches/0630-Fix-interact-event-not-being-called-in-adventure.patch similarity index 95% rename from Spigot-Server-Patches/0631-Fix-interact-event-not-being-called-in-adventure.patch rename to Spigot-Server-Patches/0630-Fix-interact-event-not-being-called-in-adventure.patch index 9cd2def0ae..ce4dab1947 100644 --- a/Spigot-Server-Patches/0631-Fix-interact-event-not-being-called-in-adventure.patch +++ b/Spigot-Server-Patches/0630-Fix-interact-event-not-being-called-in-adventure.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure Call PlayerInteractEvent when left-clicking on a block in adventure mode diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index c6b33b355b8e06d4ef6a8f542ab460c55af8c00e..60b72fc3cf859fab80aba310882b0309fd68ff37 100644 +index 25eaad51bc7a8593d47804ea2774382d4dd55080..8009055a7c178dac97364e32d2e689539e45a412 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -1700,7 +1700,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0632-Zombie-API-breaking-doors.patch b/Spigot-Server-Patches/0631-Zombie-API-breaking-doors.patch similarity index 100% rename from Spigot-Server-Patches/0632-Zombie-API-breaking-doors.patch rename to Spigot-Server-Patches/0631-Zombie-API-breaking-doors.patch diff --git a/Spigot-Server-Patches/0633-Fix-nerfed-slime-when-splitting.patch b/Spigot-Server-Patches/0632-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from Spigot-Server-Patches/0633-Fix-nerfed-slime-when-splitting.patch rename to Spigot-Server-Patches/0632-Fix-nerfed-slime-when-splitting.patch diff --git a/Spigot-Server-Patches/0634-Add-EntityLoadCrossbowEvent.patch b/Spigot-Server-Patches/0633-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from Spigot-Server-Patches/0634-Add-EntityLoadCrossbowEvent.patch rename to Spigot-Server-Patches/0633-Add-EntityLoadCrossbowEvent.patch diff --git a/Spigot-Server-Patches/0635-Guardian-beam-workaround.patch b/Spigot-Server-Patches/0634-Guardian-beam-workaround.patch similarity index 100% rename from Spigot-Server-Patches/0635-Guardian-beam-workaround.patch rename to Spigot-Server-Patches/0634-Guardian-beam-workaround.patch diff --git a/Spigot-Server-Patches/0636-Added-WorldGameRuleChangeEvent.patch b/Spigot-Server-Patches/0635-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0636-Added-WorldGameRuleChangeEvent.patch rename to Spigot-Server-Patches/0635-Added-WorldGameRuleChangeEvent.patch diff --git a/Spigot-Server-Patches/0637-Added-ServerResourcesReloadedEvent.patch b/Spigot-Server-Patches/0636-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from Spigot-Server-Patches/0637-Added-ServerResourcesReloadedEvent.patch rename to Spigot-Server-Patches/0636-Added-ServerResourcesReloadedEvent.patch diff --git a/Spigot-Server-Patches/0638-Added-world-settings-for-mobs-picking-up-loot.patch b/Spigot-Server-Patches/0637-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from Spigot-Server-Patches/0638-Added-world-settings-for-mobs-picking-up-loot.patch rename to Spigot-Server-Patches/0637-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/Spigot-Server-Patches/0639-Implemented-BlockFailedDispenseEvent.patch b/Spigot-Server-Patches/0638-Implemented-BlockFailedDispenseEvent.patch similarity index 97% rename from Spigot-Server-Patches/0639-Implemented-BlockFailedDispenseEvent.patch rename to Spigot-Server-Patches/0638-Implemented-BlockFailedDispenseEvent.patch index ee3fc75f17..1ed974fb01 100644 --- a/Spigot-Server-Patches/0639-Implemented-BlockFailedDispenseEvent.patch +++ b/Spigot-Server-Patches/0638-Implemented-BlockFailedDispenseEvent.patch @@ -29,7 +29,7 @@ index ccab4714bf5a6be8afd92430874fd6f881d4f92f..223cc0ba06cf4b007049880daad881e5 } else { ItemStack itemstack = tileentitydispenser.getItem(i); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 89c6d1f05878d6c220090af82939cbba4fa2555f..228638d503cb6491e47920386994f2dfd6eb122e 100644 +index cb577bd576ff099f183b1c9e5d60bd74276c7394..93157e38f40af84341b8bb20598cf07118e723bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -4,6 +4,7 @@ import com.google.common.base.Function; diff --git a/Spigot-Server-Patches/0640-Added-PlayerLecternPageChangeEvent.patch b/Spigot-Server-Patches/0639-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0640-Added-PlayerLecternPageChangeEvent.patch rename to Spigot-Server-Patches/0639-Added-PlayerLecternPageChangeEvent.patch diff --git a/Spigot-Server-Patches/0641-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0640-Fire-event-on-GS4-query.patch similarity index 100% rename from Spigot-Server-Patches/0641-Fire-event-on-GS4-query.patch rename to Spigot-Server-Patches/0640-Fire-event-on-GS4-query.patch diff --git a/Spigot-Server-Patches/0642-Added-PlayerLoomPatternSelectEvent.patch b/Spigot-Server-Patches/0641-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from Spigot-Server-Patches/0642-Added-PlayerLoomPatternSelectEvent.patch rename to Spigot-Server-Patches/0641-Added-PlayerLoomPatternSelectEvent.patch diff --git a/Spigot-Server-Patches/0643-Configurable-door-breaking-difficulty.patch b/Spigot-Server-Patches/0642-Configurable-door-breaking-difficulty.patch similarity index 100% rename from Spigot-Server-Patches/0643-Configurable-door-breaking-difficulty.patch rename to Spigot-Server-Patches/0642-Configurable-door-breaking-difficulty.patch diff --git a/Spigot-Server-Patches/0644-Empty-commands-shall-not-be-dispatched.patch b/Spigot-Server-Patches/0643-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from Spigot-Server-Patches/0644-Empty-commands-shall-not-be-dispatched.patch rename to Spigot-Server-Patches/0643-Empty-commands-shall-not-be-dispatched.patch diff --git a/Spigot-Server-Patches/0645-Implement-API-to-expose-exact-interaction-point.patch b/Spigot-Server-Patches/0644-Implement-API-to-expose-exact-interaction-point.patch similarity index 97% rename from Spigot-Server-Patches/0645-Implement-API-to-expose-exact-interaction-point.patch rename to Spigot-Server-Patches/0644-Implement-API-to-expose-exact-interaction-point.patch index 1f195b4ea2..9843cfe9b8 100644 --- a/Spigot-Server-Patches/0645-Implement-API-to-expose-exact-interaction-point.patch +++ b/Spigot-Server-Patches/0644-Implement-API-to-expose-exact-interaction-point.patch @@ -18,7 +18,7 @@ index 5974cc9f895478eebd4922faa26d5a944064d7b6..1511cf54fea53577a2808b5d84417eee interactResult = event.useItemInHand() == Event.Result.DENY; interactPosition = blockposition.immutableCopy(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 228638d503cb6491e47920386994f2dfd6eb122e..40c56301f497f66f8e8f6c737a5c5c8a26d372df 100644 +index 93157e38f40af84341b8bb20598cf07118e723bc..d03a9c1946da672509c56416bab9c1878e37ddb7 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -68,7 +68,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParameters; diff --git a/Spigot-Server-Patches/0646-Remove-stale-POIs.patch b/Spigot-Server-Patches/0645-Remove-stale-POIs.patch similarity index 100% rename from Spigot-Server-Patches/0646-Remove-stale-POIs.patch rename to Spigot-Server-Patches/0645-Remove-stale-POIs.patch diff --git a/Spigot-Server-Patches/0647-Fix-villager-boat-exploit.patch b/Spigot-Server-Patches/0646-Fix-villager-boat-exploit.patch similarity index 100% rename from Spigot-Server-Patches/0647-Fix-villager-boat-exploit.patch rename to Spigot-Server-Patches/0646-Fix-villager-boat-exploit.patch diff --git a/Spigot-Server-Patches/0648-Entity-load-save-limit-per-chunk.patch b/Spigot-Server-Patches/0647-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from Spigot-Server-Patches/0648-Entity-load-save-limit-per-chunk.patch rename to Spigot-Server-Patches/0647-Entity-load-save-limit-per-chunk.patch diff --git a/Spigot-Server-Patches/0649-Add-sendOpLevel-API.patch b/Spigot-Server-Patches/0648-Add-sendOpLevel-API.patch similarity index 100% rename from Spigot-Server-Patches/0649-Add-sendOpLevel-API.patch rename to Spigot-Server-Patches/0648-Add-sendOpLevel-API.patch diff --git a/Spigot-Server-Patches/0650-Add-StructureLocateEvent.patch b/Spigot-Server-Patches/0649-Add-StructureLocateEvent.patch similarity index 100% rename from Spigot-Server-Patches/0650-Add-StructureLocateEvent.patch rename to Spigot-Server-Patches/0649-Add-StructureLocateEvent.patch diff --git a/Spigot-Server-Patches/0651-Collision-option-for-requiring-a-player-participant.patch b/Spigot-Server-Patches/0650-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from Spigot-Server-Patches/0651-Collision-option-for-requiring-a-player-participant.patch rename to Spigot-Server-Patches/0650-Collision-option-for-requiring-a-player-participant.patch diff --git a/Spigot-Server-Patches/0652-Make-ProjectileHitEvent-Cancellable.patch b/Spigot-Server-Patches/0651-Make-ProjectileHitEvent-Cancellable.patch similarity index 97% rename from Spigot-Server-Patches/0652-Make-ProjectileHitEvent-Cancellable.patch rename to Spigot-Server-Patches/0651-Make-ProjectileHitEvent-Cancellable.patch index 9ff6d74f21..abda75eef4 100644 --- a/Spigot-Server-Patches/0652-Make-ProjectileHitEvent-Cancellable.patch +++ b/Spigot-Server-Patches/0651-Make-ProjectileHitEvent-Cancellable.patch @@ -32,7 +32,7 @@ index 37b1febb45b900dfe4b225152e66bc4be83df220..9f2e7d345d98f50e6d47cbf4bb357148 if (movingobjectposition_enummovingobjecttype == MovingObjectPosition.EnumMovingObjectType.ENTITY) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 40c56301f497f66f8e8f6c737a5c5c8a26d372df..acb65ec8bd09b642c79bb8304bd82fb22a48608b 100644 +index d03a9c1946da672509c56416bab9c1878e37ddb7..22da2cc26fc526d7222f64c296eaf26cabd23626 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1298,9 +1298,9 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch b/Spigot-Server-Patches/0652-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch rename to Spigot-Server-Patches/0652-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/Spigot-Server-Patches/0654-Make-schedule-command-per-world.patch b/Spigot-Server-Patches/0653-Make-schedule-command-per-world.patch similarity index 100% rename from Spigot-Server-Patches/0654-Make-schedule-command-per-world.patch rename to Spigot-Server-Patches/0653-Make-schedule-command-per-world.patch diff --git a/Spigot-Server-Patches/0655-Configurable-max-leash-distance.patch b/Spigot-Server-Patches/0654-Configurable-max-leash-distance.patch similarity index 100% rename from Spigot-Server-Patches/0655-Configurable-max-leash-distance.patch rename to Spigot-Server-Patches/0654-Configurable-max-leash-distance.patch diff --git a/Spigot-Server-Patches/0656-Implement-BlockPreDispenseEvent.patch b/Spigot-Server-Patches/0655-Implement-BlockPreDispenseEvent.patch similarity index 96% rename from Spigot-Server-Patches/0656-Implement-BlockPreDispenseEvent.patch rename to Spigot-Server-Patches/0655-Implement-BlockPreDispenseEvent.patch index 6249fe789c..bf883f3f6a 100644 --- a/Spigot-Server-Patches/0656-Implement-BlockPreDispenseEvent.patch +++ b/Spigot-Server-Patches/0655-Implement-BlockPreDispenseEvent.patch @@ -17,7 +17,7 @@ index 966051ab3e720e5b3f0fb9ab852c8908c5f23f3b..9b92824f1c2797e321ced953d33d2c2f tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack)); } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index acb65ec8bd09b642c79bb8304bd82fb22a48608b..8330c04124c0c1f4f9c78ad43c34d4b00e6b42ed 100644 +index 22da2cc26fc526d7222f64c296eaf26cabd23626..47906539c3e6cd7f34c0880a0bab2a185d79b71c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -69,6 +69,7 @@ import net.minecraft.world.phys.MovingObjectPosition; diff --git a/Spigot-Server-Patches/0657-Added-Vanilla-Entity-Tags.patch b/Spigot-Server-Patches/0656-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from Spigot-Server-Patches/0657-Added-Vanilla-Entity-Tags.patch rename to Spigot-Server-Patches/0656-Added-Vanilla-Entity-Tags.patch diff --git a/Spigot-Server-Patches/0658-added-Wither-API.patch b/Spigot-Server-Patches/0657-added-Wither-API.patch similarity index 100% rename from Spigot-Server-Patches/0658-added-Wither-API.patch rename to Spigot-Server-Patches/0657-added-Wither-API.patch diff --git a/Spigot-Server-Patches/0659-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/Spigot-Server-Patches/0658-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from Spigot-Server-Patches/0659-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to Spigot-Server-Patches/0658-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/Spigot-Server-Patches/0660-Fix-console-spam-when-removing-chests-in-water.patch b/Spigot-Server-Patches/0659-Fix-console-spam-when-removing-chests-in-water.patch similarity index 100% rename from Spigot-Server-Patches/0660-Fix-console-spam-when-removing-chests-in-water.patch rename to Spigot-Server-Patches/0659-Fix-console-spam-when-removing-chests-in-water.patch diff --git a/Spigot-Server-Patches/0661-Add-toggle-for-always-placing-the-dragon-egg.patch b/Spigot-Server-Patches/0660-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from Spigot-Server-Patches/0661-Add-toggle-for-always-placing-the-dragon-egg.patch rename to Spigot-Server-Patches/0660-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/Spigot-Server-Patches/0662-Added-PlayerStonecutterRecipeSelectEvent.patch b/Spigot-Server-Patches/0661-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from Spigot-Server-Patches/0662-Added-PlayerStonecutterRecipeSelectEvent.patch rename to Spigot-Server-Patches/0661-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/Spigot-Server-Patches/0663-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/Spigot-Server-Patches/0662-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 99% rename from Spigot-Server-Patches/0663-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to Spigot-Server-Patches/0662-Add-dropLeash-variable-to-EntityUnleashEvent.patch index 5c4e0e0941..29161b0711 100644 --- a/Spigot-Server-Patches/0663-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/Spigot-Server-Patches/0662-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -138,7 +138,7 @@ index 8f6d2a6a388021f437ac5554e9ece8eca89e1f46..519f0cabadcf97a44a112fd963a8d3ab } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 8330c04124c0c1f4f9c78ad43c34d4b00e6b42ed..97f9ec2706a3cbda76731f84ef80d5a4ea36e713 100644 +index 47906539c3e6cd7f34c0880a0bab2a185d79b71c..32fd193d72521525972445199e02c2ae7a0e771a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1450,8 +1450,10 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0664-Skip-distance-map-update-when-spawning-disabled.patch b/Spigot-Server-Patches/0663-Skip-distance-map-update-when-spawning-disabled.patch similarity index 92% rename from Spigot-Server-Patches/0664-Skip-distance-map-update-when-spawning-disabled.patch rename to Spigot-Server-Patches/0663-Skip-distance-map-update-when-spawning-disabled.patch index c14b0de977..dc18792789 100644 --- a/Spigot-Server-Patches/0664-Skip-distance-map-update-when-spawning-disabled.patch +++ b/Spigot-Server-Patches/0663-Skip-distance-map-update-when-spawning-disabled.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Skip distance map update when spawning disabled. diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java -index f46f3ca87badefd668e70d792de5b3d3c0172a68..e542fe5fb63064e67c7fde8fad614826d6f3344c 100644 +index 326c52f9f2cc729fd52162aeae18ec9dae3a4eaf..c5e54c519e1f686761faa53b5e9579c514a65332 100644 --- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java @@ -825,7 +825,7 @@ public class ChunkProviderServer extends IChunkProvider { diff --git a/Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch b/Spigot-Server-Patches/0664-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch rename to Spigot-Server-Patches/0664-Reset-shield-blocking-on-dimension-change.patch diff --git a/Spigot-Server-Patches/0666-add-DragonEggFormEvent.patch b/Spigot-Server-Patches/0665-add-DragonEggFormEvent.patch similarity index 100% rename from Spigot-Server-Patches/0666-add-DragonEggFormEvent.patch rename to Spigot-Server-Patches/0665-add-DragonEggFormEvent.patch diff --git a/Spigot-Server-Patches/0667-EntityMoveEvent.patch b/Spigot-Server-Patches/0666-EntityMoveEvent.patch similarity index 95% rename from Spigot-Server-Patches/0667-EntityMoveEvent.patch rename to Spigot-Server-Patches/0666-EntityMoveEvent.patch index c68a52a6ba..83511a8ff8 100644 --- a/Spigot-Server-Patches/0667-EntityMoveEvent.patch +++ b/Spigot-Server-Patches/0666-EntityMoveEvent.patch @@ -25,7 +25,7 @@ index c4da751bed3014a5521ac0014b07c139b69b1187..5da58830459d2ff10e7fde28b4199569 this.methodProfiler.a(() -> { diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java -index 5da7d1df97e70248d01cb1c452b26cfba415a5b0..07396504fbabc2eb006f2b7f8e53faafe67d5672 100644 +index bf9bf8368b345bf0ac3b14a08e8342f7bd63dead..be7f210bd8be1e393c0c449274ff1a1b030d660e 100644 --- a/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java @@ -213,6 +213,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -37,7 +37,7 @@ index 5da7d1df97e70248d01cb1c452b26cfba415a5b0..07396504fbabc2eb006f2b7f8e53faaf return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java -index 800a8b8e1a49eb6ec920abaad4514a9a91a3542e..b0ee9e98d5f1e56c8d82e90dd7761c8ef79cfb1c 100644 +index deffd82dfca1d2eea6e5b8db9228015bf35ad0a3..21341eeb8148be119fbc1dd370c1beaf70a319e0 100644 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java @@ -10,6 +10,7 @@ import com.mojang.datafixers.util.Pair; diff --git a/Spigot-Server-Patches/0668-added-option-to-disable-pathfinding-updates-on-block.patch b/Spigot-Server-Patches/0667-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from Spigot-Server-Patches/0668-added-option-to-disable-pathfinding-updates-on-block.patch rename to Spigot-Server-Patches/0667-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/Spigot-Server-Patches/0669-Inline-shift-direction-fields.patch b/Spigot-Server-Patches/0668-Inline-shift-direction-fields.patch similarity index 100% rename from Spigot-Server-Patches/0669-Inline-shift-direction-fields.patch rename to Spigot-Server-Patches/0668-Inline-shift-direction-fields.patch diff --git a/Spigot-Server-Patches/0670-Allow-adding-items-to-BlockDropItemEvent.patch b/Spigot-Server-Patches/0669-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 95% rename from Spigot-Server-Patches/0670-Allow-adding-items-to-BlockDropItemEvent.patch rename to Spigot-Server-Patches/0669-Allow-adding-items-to-BlockDropItemEvent.patch index 5dbd9e55fd..53409ac8fa 100644 --- a/Spigot-Server-Patches/0670-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/Spigot-Server-Patches/0669-Allow-adding-items-to-BlockDropItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 97f9ec2706a3cbda76731f84ef80d5a4ea36e713..926440e846eff2c1aaa262aa2b3975b7dd225332 100644 +index 32fd193d72521525972445199e02c2ae7a0e771a..9084aa4b7c0059c995a3d1a89188379b52c9d620 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -383,13 +383,30 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0671-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/Spigot-Server-Patches/0670-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from Spigot-Server-Patches/0671-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to Spigot-Server-Patches/0670-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/Spigot-Server-Patches/0672-living-entity-allow-attribute-registration.patch b/Spigot-Server-Patches/0671-living-entity-allow-attribute-registration.patch similarity index 100% rename from Spigot-Server-Patches/0672-living-entity-allow-attribute-registration.patch rename to Spigot-Server-Patches/0671-living-entity-allow-attribute-registration.patch diff --git a/Spigot-Server-Patches/0673-fix-dead-slime-setSize-invincibility.patch b/Spigot-Server-Patches/0672-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from Spigot-Server-Patches/0673-fix-dead-slime-setSize-invincibility.patch rename to Spigot-Server-Patches/0672-fix-dead-slime-setSize-invincibility.patch diff --git a/Spigot-Server-Patches/0674-Merchant-getRecipes-should-return-an-immutable-list.patch b/Spigot-Server-Patches/0673-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from Spigot-Server-Patches/0674-Merchant-getRecipes-should-return-an-immutable-list.patch rename to Spigot-Server-Patches/0673-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/Spigot-Server-Patches/0675-misc-debugging-dumps.patch b/Spigot-Server-Patches/0674-misc-debugging-dumps.patch similarity index 100% rename from Spigot-Server-Patches/0675-misc-debugging-dumps.patch rename to Spigot-Server-Patches/0674-misc-debugging-dumps.patch diff --git a/Spigot-Server-Patches/0676-Add-support-for-hex-color-codes-in-console.patch b/Spigot-Server-Patches/0675-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from Spigot-Server-Patches/0676-Add-support-for-hex-color-codes-in-console.patch rename to Spigot-Server-Patches/0675-Add-support-for-hex-color-codes-in-console.patch diff --git a/Spigot-Server-Patches/0677-Clear-SyncLoadInfo.patch b/Spigot-Server-Patches/0676-Clear-SyncLoadInfo.patch similarity index 100% rename from Spigot-Server-Patches/0677-Clear-SyncLoadInfo.patch rename to Spigot-Server-Patches/0676-Clear-SyncLoadInfo.patch diff --git a/Spigot-Server-Patches/0678-Expose-Tracked-Players.patch b/Spigot-Server-Patches/0677-Expose-Tracked-Players.patch similarity index 100% rename from Spigot-Server-Patches/0678-Expose-Tracked-Players.patch rename to Spigot-Server-Patches/0677-Expose-Tracked-Players.patch diff --git a/Spigot-Server-Patches/0679-Remove-streams-from-SensorNearest.patch b/Spigot-Server-Patches/0678-Remove-streams-from-SensorNearest.patch similarity index 100% rename from Spigot-Server-Patches/0679-Remove-streams-from-SensorNearest.patch rename to Spigot-Server-Patches/0678-Remove-streams-from-SensorNearest.patch diff --git a/Spigot-Server-Patches/0680-do-not-create-unnecessary-copies-of-passenger-list.patch b/Spigot-Server-Patches/0679-do-not-create-unnecessary-copies-of-passenger-list.patch similarity index 100% rename from Spigot-Server-Patches/0680-do-not-create-unnecessary-copies-of-passenger-list.patch rename to Spigot-Server-Patches/0679-do-not-create-unnecessary-copies-of-passenger-list.patch diff --git a/Spigot-Server-Patches/0681-MC-29274-Fix-Wither-hostility-towards-players.patch b/Spigot-Server-Patches/0680-MC-29274-Fix-Wither-hostility-towards-players.patch similarity index 100% rename from Spigot-Server-Patches/0681-MC-29274-Fix-Wither-hostility-towards-players.patch rename to Spigot-Server-Patches/0680-MC-29274-Fix-Wither-hostility-towards-players.patch diff --git a/Spigot-Server-Patches/0682-Throw-proper-exception-on-empty-JsonList-file.patch b/Spigot-Server-Patches/0681-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from Spigot-Server-Patches/0682-Throw-proper-exception-on-empty-JsonList-file.patch rename to Spigot-Server-Patches/0681-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/Spigot-Server-Patches/0683-Improve-ServerGUI.patch b/Spigot-Server-Patches/0682-Improve-ServerGUI.patch similarity index 100% rename from Spigot-Server-Patches/0683-Improve-ServerGUI.patch rename to Spigot-Server-Patches/0682-Improve-ServerGUI.patch diff --git a/Spigot-Server-Patches/0684-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/Spigot-Server-Patches/0683-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from Spigot-Server-Patches/0684-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to Spigot-Server-Patches/0683-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/Spigot-Server-Patches/0685-fix-converting-txt-to-json-file.patch b/Spigot-Server-Patches/0684-fix-converting-txt-to-json-file.patch similarity index 100% rename from Spigot-Server-Patches/0685-fix-converting-txt-to-json-file.patch rename to Spigot-Server-Patches/0684-fix-converting-txt-to-json-file.patch diff --git a/Spigot-Server-Patches/0686-Add-worldborder-events.patch b/Spigot-Server-Patches/0685-Add-worldborder-events.patch similarity index 100% rename from Spigot-Server-Patches/0686-Add-worldborder-events.patch rename to Spigot-Server-Patches/0685-Add-worldborder-events.patch diff --git a/Spigot-Server-Patches/0687-added-PlayerNameEntityEvent.patch b/Spigot-Server-Patches/0686-added-PlayerNameEntityEvent.patch similarity index 100% rename from Spigot-Server-Patches/0687-added-PlayerNameEntityEvent.patch rename to Spigot-Server-Patches/0686-added-PlayerNameEntityEvent.patch diff --git a/Spigot-Server-Patches/0688-Prevent-grindstones-from-overstacking-items.patch b/Spigot-Server-Patches/0687-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from Spigot-Server-Patches/0688-Prevent-grindstones-from-overstacking-items.patch rename to Spigot-Server-Patches/0687-Prevent-grindstones-from-overstacking-items.patch diff --git a/Spigot-Server-Patches/0689-Add-recipe-to-cook-events.patch b/Spigot-Server-Patches/0688-Add-recipe-to-cook-events.patch similarity index 100% rename from Spigot-Server-Patches/0689-Add-recipe-to-cook-events.patch rename to Spigot-Server-Patches/0688-Add-recipe-to-cook-events.patch diff --git a/Spigot-Server-Patches/0690-Add-Block-isValidTool.patch b/Spigot-Server-Patches/0689-Add-Block-isValidTool.patch similarity index 100% rename from Spigot-Server-Patches/0690-Add-Block-isValidTool.patch rename to Spigot-Server-Patches/0689-Add-Block-isValidTool.patch diff --git a/Spigot-Server-Patches/0691-Allow-using-signs-inside-spawn-protection.patch b/Spigot-Server-Patches/0690-Allow-using-signs-inside-spawn-protection.patch similarity index 96% rename from Spigot-Server-Patches/0691-Allow-using-signs-inside-spawn-protection.patch rename to Spigot-Server-Patches/0690-Allow-using-signs-inside-spawn-protection.patch index d3bd4013aa..3d38f6e851 100644 --- a/Spigot-Server-Patches/0691-Allow-using-signs-inside-spawn-protection.patch +++ b/Spigot-Server-Patches/0690-Allow-using-signs-inside-spawn-protection.patch @@ -19,7 +19,7 @@ index 3e6132211912d29e34c94042b0819f11a3bd123e..921253a06daa414aed7dc6824effc65d + } } diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java -index 60b72fc3cf859fab80aba310882b0309fd68ff37..4a3f6f26da0d99ee2ff6942c2ff7d0595b53b684 100644 +index 8009055a7c178dac97364e32d2e689539e45a412..5ee56f3636b299280a7c2bc5a210c63250a47fb3 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -143,6 +143,7 @@ import net.minecraft.world.level.GameRules; diff --git a/Spigot-Server-Patches/0692-Implement-Keyed-on-World.patch b/Spigot-Server-Patches/0691-Implement-Keyed-on-World.patch similarity index 100% rename from Spigot-Server-Patches/0692-Implement-Keyed-on-World.patch rename to Spigot-Server-Patches/0691-Implement-Keyed-on-World.patch diff --git a/Spigot-Server-Patches/0693-Add-fast-alternative-constructor-for-Vector3f.patch b/Spigot-Server-Patches/0692-Add-fast-alternative-constructor-for-Vector3f.patch similarity index 100% rename from Spigot-Server-Patches/0693-Add-fast-alternative-constructor-for-Vector3f.patch rename to Spigot-Server-Patches/0692-Add-fast-alternative-constructor-for-Vector3f.patch diff --git a/Spigot-Server-Patches/0694-Item-Rarity-API.patch b/Spigot-Server-Patches/0693-Item-Rarity-API.patch similarity index 100% rename from Spigot-Server-Patches/0694-Item-Rarity-API.patch rename to Spigot-Server-Patches/0693-Item-Rarity-API.patch diff --git a/Spigot-Server-Patches/0695-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/Spigot-Server-Patches/0694-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from Spigot-Server-Patches/0695-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to Spigot-Server-Patches/0694-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/Spigot-Server-Patches/0696-copy-TESign-isEditable-from-snapshots.patch b/Spigot-Server-Patches/0695-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from Spigot-Server-Patches/0696-copy-TESign-isEditable-from-snapshots.patch rename to Spigot-Server-Patches/0695-copy-TESign-isEditable-from-snapshots.patch diff --git a/Spigot-Server-Patches/0697-Drop-carried-item-when-player-has-disconnected.patch b/Spigot-Server-Patches/0696-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from Spigot-Server-Patches/0697-Drop-carried-item-when-player-has-disconnected.patch rename to Spigot-Server-Patches/0696-Drop-carried-item-when-player-has-disconnected.patch diff --git a/Spigot-Server-Patches/0698-forced-whitelist-use-configurable-kick-message.patch b/Spigot-Server-Patches/0697-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from Spigot-Server-Patches/0698-forced-whitelist-use-configurable-kick-message.patch rename to Spigot-Server-Patches/0697-forced-whitelist-use-configurable-kick-message.patch diff --git a/Spigot-Server-Patches/0699-Make-sure-to-remove-correct-TE-during-TE-tick.patch b/Spigot-Server-Patches/0698-Make-sure-to-remove-correct-TE-during-TE-tick.patch similarity index 100% rename from Spigot-Server-Patches/0699-Make-sure-to-remove-correct-TE-during-TE-tick.patch rename to Spigot-Server-Patches/0698-Make-sure-to-remove-correct-TE-during-TE-tick.patch diff --git a/Spigot-Server-Patches/0700-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0699-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from Spigot-Server-Patches/0700-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to Spigot-Server-Patches/0699-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/work/CraftBukkit b/work/CraftBukkit index 0e26ddb6a3..6b8cd9a7cb 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 0e26ddb6a3f17222efa24654432b71f89b341c79 +Subproject commit 6b8cd9a7cb8f2ed94743d1ed4d4217c9a4138898