diff --git a/patches/server/0707-Fix-dangerous-end-portal-logic.patch b/patches/server/0706-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0707-Fix-dangerous-end-portal-logic.patch rename to patches/server/0706-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0706-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0706-Reset-villager-inventory-on-cancelled-pickup-event.patch deleted file mode 100644 index 044c2954d..000000000 --- a/patches/server/0706-Reset-villager-inventory-on-cancelled-pickup-event.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Tue, 1 Jun 2021 22:05:08 -0500 -Subject: [PATCH] Reset villager inventory on cancelled pickup event - - -diff --git a/src/main/java/net/minecraft/world/SimpleContainer.java b/src/main/java/net/minecraft/world/SimpleContainer.java -index 502e29644504aabe3834351d3b479e21bd8f4be7..4e47ea7359ae56efeb2b74161dc9e7387589415b 100644 ---- a/src/main/java/net/minecraft/world/SimpleContainer.java -+++ b/src/main/java/net/minecraft/world/SimpleContainer.java -@@ -34,6 +34,16 @@ public class SimpleContainer implements Container, StackedContentsCompatible { - return this.items; - } - -+ // Paper start -+ public void setContents(List items) { -+ this.items.clear(); -+ for(int i = 0; i < items.size(); i++) { -+ this.items.set(i, items.get(i)); -+ } -+ this.setChanged(); -+ } -+ // Paper end -+ - public void onOpen(CraftHumanEntity who) { - this.transaction.add(who); - } -diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 2ad93ff0bb46a282df706438b7c039c46323979a..43bb055f0f9ecb82c25e0f47258f45ce4182a75d 100644 ---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java -+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -888,15 +888,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler - } - - // CraftBukkit start -- ItemStack remaining = new SimpleContainer(inventorysubcontainer).addItem(itemstack); -- if (CraftEventFactory.callEntityPickupItemEvent(this, item, remaining.getCount(), false).isCancelled()) { -+ // Paper start -+ List contentsSnapshot = new java.util.ArrayList<>(inventorysubcontainer.getContents()); -+ ItemStack itemstack1 = inventorysubcontainer.addItem(itemstack); -+ if (CraftEventFactory.callEntityPickupItemEvent(this, item, itemstack1.getCount(), false).isCancelled()) { -+ inventorysubcontainer.setContents(contentsSnapshot); -+ // Paper end - return; - } - // CraftBukkit end - - this.onItemPickup(item); - this.take(item, itemstack.getCount()); -- ItemStack itemstack1 = inventorysubcontainer.addItem(itemstack); -+ // ItemStack itemstack1 = inventorysubcontainer.a(itemstack); // Paper - moved up - - if (itemstack1.isEmpty()) { - item.discard(); diff --git a/patches/server/0708-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0707-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0708-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0707-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0709-Make-item-validations-configurable.patch b/patches/server/0708-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0709-Make-item-validations-configurable.patch rename to patches/server/0708-Make-item-validations-configurable.patch diff --git a/patches/server/0710-Add-more-line-of-sight-methods.patch b/patches/server/0709-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/server/0710-Add-more-line-of-sight-methods.patch rename to patches/server/0709-Add-more-line-of-sight-methods.patch diff --git a/patches/server/0711-add-per-world-spawn-limits.patch b/patches/server/0710-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0711-add-per-world-spawn-limits.patch rename to patches/server/0710-add-per-world-spawn-limits.patch diff --git a/patches/server/0712-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0711-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0712-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0711-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0713-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0712-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch similarity index 100% rename from patches/server/0713-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch rename to patches/server/0712-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch diff --git a/patches/server/0714-Add-Feature-Generation-API.patch b/patches/server/0713-Add-Feature-Generation-API.patch similarity index 99% rename from patches/server/0714-Add-Feature-Generation-API.patch rename to patches/server/0713-Add-Feature-Generation-API.patch index 8b674e5ad..72b21d14a 100644 --- a/patches/server/0714-Add-Feature-Generation-API.patch +++ b/patches/server/0713-Add-Feature-Generation-API.patch @@ -126,7 +126,7 @@ index 0000000000000000000000000000000000000000..69b17fe56f28f8978abc3f363a9e805d +} + diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java -index 46ce973ca68420825316352ad4df907edf52bfec..65e9ecda0df8a22f93f5979a8c9ac74e9f0ba042 100644 +index bc25c0f466f8cc5662f01f38a38713570c1e5bfc..eff743042c9b6536f1d5001260ab04b42dfd21bd 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java @@ -191,6 +191,12 @@ public class CustomChunkGenerator extends InternalChunkGenerator { diff --git a/patches/server/0715-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0714-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0715-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0714-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0716-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0715-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0716-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0715-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0717-Missing-Entity-Behavior-API.patch b/patches/server/0716-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0717-Missing-Entity-Behavior-API.patch rename to patches/server/0716-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0718-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0717-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0718-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0717-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0719-Add-git-branch-and-commit-to-manifest.patch b/patches/server/0718-Add-git-branch-and-commit-to-manifest.patch similarity index 100% rename from patches/server/0719-Add-git-branch-and-commit-to-manifest.patch rename to patches/server/0718-Add-git-branch-and-commit-to-manifest.patch diff --git a/patches/server/0720-Allow-explosions-under-0-height.patch b/patches/server/0719-Allow-explosions-under-0-height.patch similarity index 100% rename from patches/server/0720-Allow-explosions-under-0-height.patch rename to patches/server/0719-Allow-explosions-under-0-height.patch diff --git a/patches/server/0721-Improve-CraftChunk-getEntities.patch b/patches/server/0720-Improve-CraftChunk-getEntities.patch similarity index 100% rename from patches/server/0721-Improve-CraftChunk-getEntities.patch rename to patches/server/0720-Improve-CraftChunk-getEntities.patch diff --git a/patches/server/0722-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0721-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0722-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0721-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0723-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0722-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0723-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0722-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0724-Config-option-for-named-entity-death-logging.patch b/patches/server/0723-Config-option-for-named-entity-death-logging.patch similarity index 100% rename from patches/server/0724-Config-option-for-named-entity-death-logging.patch rename to patches/server/0723-Config-option-for-named-entity-death-logging.patch diff --git a/patches/server/0725-Route-sign-run_command-click-events-through-normal-c.patch b/patches/server/0724-Route-sign-run_command-click-events-through-normal-c.patch similarity index 100% rename from patches/server/0725-Route-sign-run_command-click-events-through-normal-c.patch rename to patches/server/0724-Route-sign-run_command-click-events-through-normal-c.patch