diff --git a/patches/server/0573-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0573-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch new file mode 100644 index 000000000..db386dbad --- /dev/null +++ b/patches/server/0573-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch @@ -0,0 +1,249 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Thu, 2 Jul 2020 16:12:10 -0700 +Subject: [PATCH] Add PlayerTradeEvent and PlayerPurchaseEvent + +Co-authored-by: Alexander + +diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java +index 4a7b657265cbbc91ae85409abb3db29cfc555a2c..c75fa3274dedfafa11b94704695a2313f11c22cc 100644 +--- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java ++++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java +@@ -138,11 +138,24 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa + @Override + public void overrideXp(int experience) {} + ++ // Paper start ++ @Override ++ public void processTrade(MerchantOffer recipe, io.papermc.paper.event.player.PlayerPurchaseEvent event) { // The MerchantRecipe passed in here is the one set by the PlayerPurchaseEvent ++ if (event.willIncreaseTradeUses()) { ++ recipe.increaseUses(); ++ } ++ if (event.isRewardingExp()) { ++ this.rewardTradeXp(recipe); ++ } ++ this.notifyTrade(recipe); ++ } ++ // Paper end ++ + @Override + public void notifyTrade(MerchantOffer offer) { +- offer.increaseUses(); ++ // offer.increaseUses(); // Paper - handled in processTrade + this.ambientSoundTime = -this.getAmbientSoundInterval(); +- this.rewardTradeXp(offer); ++ // this.rewardTradeXp(offer); // Paper - handled in processTrade + if (this.tradingPlayer instanceof ServerPlayer) { + CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, offer.getResult()); + } +diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java +index 60a67f75b4f772654e064e2b19f68a907ca4c93b..83d9fe7d92a8cb46478964d0742d0103a937648c 100644 +--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java ++++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java +@@ -741,6 +741,14 @@ public abstract class AbstractContainerMenu { + public abstract boolean stillValid(Player player); + + protected boolean moveItemStackTo(ItemStack stack, int startIndex, int endIndex, boolean fromLast) { ++ // Paper start ++ return this.moveItemStackTo(stack, startIndex, endIndex, fromLast, false); ++ } ++ protected boolean moveItemStackTo(ItemStack stack, int startIndex, int endIndex, boolean fromLast, boolean isCheck) { ++ if (isCheck) { ++ stack = stack.copy(); ++ } ++ // Paper end + boolean flag1 = false; + int k = startIndex; + +@@ -763,18 +771,27 @@ public abstract class AbstractContainerMenu { + + slot = (Slot) this.slots.get(k); + itemstack1 = slot.getItem(); ++ // Paper start - clone if only a check ++ if (isCheck) { ++ itemstack1 = itemstack1.copy(); ++ } ++ // Paper end + if (!itemstack1.isEmpty() && ItemStack.isSameItemSameTags(stack, itemstack1)) { + int l = itemstack1.getCount() + stack.getCount(); + + if (l <= stack.getMaxStackSize()) { + stack.setCount(0); + itemstack1.setCount(l); ++ if (!isCheck) { // Paper - dont update if only a check + slot.setChanged(); ++ } // Paper + flag1 = true; + } else if (itemstack1.getCount() < stack.getMaxStackSize()) { + stack.shrink(stack.getMaxStackSize() - itemstack1.getCount()); + itemstack1.setCount(stack.getMaxStackSize()); ++ if (!isCheck) { // Paper - dont update if only a check + slot.setChanged(); ++ } // Paper + flag1 = true; + } + } +@@ -805,14 +822,33 @@ public abstract class AbstractContainerMenu { + + slot = (Slot) this.slots.get(k); + itemstack1 = slot.getItem(); ++ // Paper start - clone if only a check ++ if (isCheck) { ++ itemstack1 = itemstack1.copy(); ++ } ++ // Paper end + if (itemstack1.isEmpty() && slot.mayPlace(stack)) { + if (stack.getCount() > slot.getMaxStackSize()) { ++ // Paper start - dont set slot if only check ++ if (isCheck) { ++ stack.shrink(slot.getMaxStackSize()); ++ } else { ++ // Paper end + slot.set(stack.split(slot.getMaxStackSize())); ++ } // Paper + } else { ++ // Paper start - dont set slot if only check ++ if (isCheck) { ++ stack.shrink(stack.getCount()); ++ } else { ++ // Paper end + slot.set(stack.split(stack.getCount())); ++ } // Paper + } + ++ if (!isCheck) { // Paper - dont update if only check + slot.setChanged(); ++ } // Paper + flag1 = true; + break; + } +diff --git a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java +index dc036f6450b2eccdc848c66dac525ed43f70f4e4..549c13180fbbebce73771a8d82eb040f1b4fc605 100644 +--- a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java ++++ b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java +@@ -134,12 +134,12 @@ public class MerchantMenu extends AbstractContainerMenu { + + itemstack = itemstack1.copy(); + if (index == 2) { +- if (!this.moveItemStackTo(itemstack1, 3, 39, true)) { ++ if (!this.moveItemStackTo(itemstack1, 3, 39, true, true)) { // Paper + return ItemStack.EMPTY; + } + +- slot.onQuickCraft(itemstack1, itemstack); +- this.playTradeSound(); ++ // slot.onQuickCraft(itemstack1, itemstack); // Paper - moved to after the non-check moveItemStackTo call ++ // this.playTradeSound(); + } else if (index != 0 && index != 1) { + if (index >= 3 && index < 30) { + if (!this.moveItemStackTo(itemstack1, 30, 39, false)) { +@@ -152,6 +152,7 @@ public class MerchantMenu extends AbstractContainerMenu { + return ItemStack.EMPTY; + } + ++ if (index != 2) { // Paper - moved down for slot 2 + if (itemstack1.isEmpty()) { + slot.set(ItemStack.EMPTY); + } else { +@@ -163,6 +164,21 @@ public class MerchantMenu extends AbstractContainerMenu { + } + + slot.onTake(player, itemstack1); ++ } // Paper start - handle slot 2 ++ if (index == 2) { // is merchant result slot ++ slot.onTake(player, itemstack1); ++ if (itemstack1.isEmpty()) { ++ slot.set(ItemStack.EMPTY); ++ return ItemStack.EMPTY; ++ } ++ ++ this.moveItemStackTo(itemstack1, 3, 39, true, false); // This should always succeed because it's checked above ++ ++ slot.onQuickCraft(itemstack1, itemstack); ++ this.playTradeSound(); ++ slot.set(ItemStack.EMPTY); // itemstack1 should ALWAYS be empty ++ } ++ // Paper end + } + + return itemstack; +diff --git a/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java b/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java +index 74b28315197b81f80334ae6023113904e4fac4c3..9e65c9535e01b3c858050a7881aff3f99edbeaac 100644 +--- a/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java ++++ b/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java +@@ -47,13 +47,30 @@ public class MerchantResultSlot extends Slot { + + @Override + public void onTake(Player player, ItemStack stack) { +- this.checkTakeAchievements(stack); ++ // this.checkTakeAchievements(stack); // Paper - move to after event is called and not cancelled + MerchantOffer merchantOffer = this.slots.getActiveOffer(); ++ // Paper start ++ io.papermc.paper.event.player.PlayerPurchaseEvent event = null; ++ if (this.merchant instanceof net.minecraft.world.entity.npc.AbstractVillager && this.merchant.getTradingPlayer().getBukkitEntity() instanceof org.bukkit.entity.Player) { ++ event = new io.papermc.paper.event.player.PlayerTradeEvent((org.bukkit.entity.Player) this.merchant.getTradingPlayer().getBukkitEntity(), (org.bukkit.entity.AbstractVillager) ((net.minecraft.world.entity.npc.AbstractVillager) this.merchant).getBukkitEntity(), merchantOffer.asBukkit(), true, true); ++ } else if (this.merchant instanceof org.bukkit.craftbukkit.inventory.CraftMerchantCustom.MinecraftMerchant && this.merchant.getTradingPlayer().getBukkitEntity() instanceof org.bukkit.entity.Player) { ++ event = new io.papermc.paper.event.player.PlayerPurchaseEvent((org.bukkit.entity.Player) this.merchant.getTradingPlayer().getBukkitEntity(), merchantOffer.asBukkit(), false, true); ++ } ++ if (event != null) { ++ if (!event.callEvent()) { ++ stack.setCount(0); ++ event.getPlayer().updateInventory(); ++ return; ++ } ++ merchantOffer = org.bukkit.craftbukkit.inventory.CraftMerchantRecipe.fromBukkit(event.getTrade()).toMinecraft(); ++ } ++ this.checkTakeAchievements(stack); ++ // Paper end + if (merchantOffer != null) { + ItemStack itemStack = this.slots.getItem(0); + ItemStack itemStack2 = this.slots.getItem(1); + if (merchantOffer.take(itemStack, itemStack2) || merchantOffer.take(itemStack2, itemStack)) { +- this.merchant.notifyTrade(merchantOffer); ++ this.merchant.processTrade(merchantOffer, event); // Paper + player.awardStat(Stats.TRADED_WITH_VILLAGER); + this.slots.setItem(0, itemStack); + this.slots.setItem(1, itemStack2); +diff --git a/src/main/java/net/minecraft/world/item/trading/Merchant.java b/src/main/java/net/minecraft/world/item/trading/Merchant.java +index 50dca0d86dbc47f66ba2d2f262e8587853cc6f9e..f11eff88ba4b9a4f8601d70c07907cc12611a1d0 100644 +--- a/src/main/java/net/minecraft/world/item/trading/Merchant.java ++++ b/src/main/java/net/minecraft/world/item/trading/Merchant.java +@@ -21,6 +21,7 @@ public interface Merchant { + + void overrideOffers(MerchantOffers offers); + ++ default void processTrade(MerchantOffer merchantRecipe, io.papermc.paper.event.player.PlayerPurchaseEvent event) { this.notifyTrade(merchantRecipe); } // Paper + void notifyTrade(MerchantOffer offer); + + void notifyTradeUpdated(ItemStack stack); +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java +index f40d6a0048ad5b3f6e31d83894ee89f5ca64fb3a..22a64092e3b925e852b304376fe0a7c19acf35d0 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java +@@ -79,10 +79,25 @@ public class CraftMerchantCustom extends CraftMerchant { + return this.trades; + } + ++ // Paper start ++ @Override ++ public void processTrade(MerchantOffer merchantRecipe, io.papermc.paper.event.player.PlayerPurchaseEvent event) { // The MerchantRecipe passed in here is the one set by the PlayerPurchaseEvent ++ /** Based on {@link net.minecraft.world.entity.npc.AbstractVillager#processTrade(MerchantOffer, io.papermc.paper.event.player.PlayerPurchaseEvent)} */ ++ if (getTradingPlayer() instanceof net.minecraft.server.level.ServerPlayer) { ++ if (event.willIncreaseTradeUses()) { ++ merchantRecipe.increaseUses(); ++ } ++ if (event.isRewardingExp()) { ++ this.tradingWorld.addFreshEntity(new net.minecraft.world.entity.ExperienceOrb(tradingWorld, tradingPlayer.getX(), tradingPlayer.getY(), tradingPlayer.getZ(), merchantRecipe.getXp(), org.bukkit.entity.ExperienceOrb.SpawnReason.VILLAGER_TRADE, this.tradingPlayer, null)); ++ } ++ } ++ this.notifyTrade(merchantRecipe); ++ } ++ // Paper end + @Override + public void notifyTrade(MerchantOffer offer) { + // increase recipe's uses +- offer.increaseUses(); ++ // offer.increaseUses(); // Paper - handled above in processTrade + } + + @Override diff --git a/patches/server/0573-added-PlayerTradeEvent.patch b/patches/server/0573-added-PlayerTradeEvent.patch deleted file mode 100644 index c2539b44b..000000000 --- a/patches/server/0573-added-PlayerTradeEvent.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Thu, 2 Jul 2020 16:12:10 -0700 -Subject: [PATCH] added PlayerTradeEvent - - -diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java -index 4a7b657265cbbc91ae85409abb3db29cfc555a2c..e59a77c80a1bbe62aaa61bd4792d21b12c895a5c 100644 ---- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java -+++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java -@@ -140,13 +140,24 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa - - @Override - public void notifyTrade(MerchantOffer offer) { -- offer.increaseUses(); -- this.ambientSoundTime = -this.getAmbientSoundInterval(); -- this.rewardTradeXp(offer); -+ // Paper - moved down -+ // Paper start - if (this.tradingPlayer instanceof ServerPlayer) { -- CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, offer.getResult()); -+ io.papermc.paper.event.player.PlayerTradeEvent event = new io.papermc.paper.event.player.PlayerTradeEvent(((ServerPlayer) this.tradingPlayer).getBukkitEntity(), (org.bukkit.entity.AbstractVillager) this.getBukkitEntity(), offer.asBukkit(), true, true); -+ event.callEvent(); -+ if (!event.isCancelled()) { -+ MerchantOffer recipe = CraftMerchantRecipe.fromBukkit(event.getTrade()).toMinecraft(); -+ if (event.willIncreaseTradeUses()) recipe.increaseUses(); -+ this.ambientSoundTime = -this.getAmbientSoundInterval(); -+ if (event.isRewardingExp()) this.rewardTradeXp(recipe); -+ CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, recipe.getResult()); -+ } -+ } else { -+ offer.increaseUses(); -+ this.ambientSoundTime = -getAmbientSoundInterval(); -+ this.rewardTradeXp(offer); - } -- -+ // Paper end - } - - protected abstract void rewardTradeXp(MerchantOffer offer); diff --git a/patches/server/0689-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0689-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch deleted file mode 100644 index 586065db5..000000000 --- a/patches/server/0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alexander -Date: Thu, 6 May 2021 13:01:25 +0100 -Subject: [PATCH] Have CraftMerchantCustom emit PlayerPurchaseEvent - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java -index f40d6a0048ad5b3f6e31d83894ee89f5ca64fb3a..56a04cfdedfbc34be686304fc2dde59f1707d282 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java -@@ -81,6 +81,35 @@ public class CraftMerchantCustom extends CraftMerchant { - - @Override - public void notifyTrade(MerchantOffer offer) { -+ // Paper start -+ /** Based on {@link net.minecraft.world.entity.npc.EntityVillagerAbstract#b(MerchantRecipe)} */ -+ if (getTradingPlayer() instanceof net.minecraft.server.level.ServerPlayer) { -+ final net.minecraft.server.level.ServerPlayer trader = (net.minecraft.server.level.ServerPlayer) getTradingPlayer(); -+ final io.papermc.paper.event.player.PlayerPurchaseEvent event = new io.papermc.paper.event.player.PlayerPurchaseEvent( -+ trader.getBukkitEntity(), -+ offer.asBukkit(), -+ false, // reward xp? -+ true); // should increase uses? -+ event.callEvent(); -+ if (event.isCancelled()) { -+ return; -+ } -+ final org.bukkit.inventory.MerchantRecipe eventTrade = event.getTrade(); -+ if (event.willIncreaseTradeUses()) { -+ eventTrade.setUses(eventTrade.getUses() + 1); -+ } -+ if (event.isRewardingExp() && eventTrade.hasExperienceReward()) { -+ /** Based on {@link net.minecraft.world.entity.npc.EntityVillagerTrader#b(MerchantRecipe)} */ -+ final int xp = 3 + net.minecraft.world.entity.Entity.SHARED_RANDOM.nextInt(4); -+ final Level world = trader.getCommandSenderWorld(); -+ world.addFreshEntity(new net.minecraft.world.entity.ExperienceOrb( -+ world, trader.getX(), trader.getY() + 0.5d, trader.getZ(), xp, -+ org.bukkit.entity.ExperienceOrb.SpawnReason.VILLAGER_TRADE, trader, null)); -+ } -+ return; -+ } -+ // Paper end -+ - // increase recipe's uses - offer.increaseUses(); - } diff --git a/patches/server/0690-More-Lidded-Block-API.patch b/patches/server/0689-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0690-More-Lidded-Block-API.patch rename to patches/server/0689-More-Lidded-Block-API.patch diff --git a/patches/server/0691-Limit-item-frame-cursors-on-maps.patch b/patches/server/0690-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0691-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0690-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0692-Add-PufferFishStateChangeEvent.patch b/patches/server/0691-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0692-Add-PufferFishStateChangeEvent.patch rename to patches/server/0691-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0693-Add-PlayerKickEvent-causes.patch b/patches/server/0692-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0693-Add-PlayerKickEvent-causes.patch rename to patches/server/0692-Add-PlayerKickEvent-causes.patch index 8715fa420..898f4d019 100644 --- a/patches/server/0693-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0692-Add-PlayerKickEvent-causes.patch @@ -57,7 +57,7 @@ index 708ac03d5a849bf09c49547306e4a8c5a5ef8d91..5a8df368a4a25839cd4ac9be6972da2e } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5f7abfba4154a3191d56eddb6dc75f26d3da3ca9..1a3ebbfdeeff1dee8d6cf2e1611453172fab852e 100644 +index a9f763a0fba107b7f39c59bb20804ce69df566c0..c21ae45dce12a8079401207f83877e72e786e154 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -320,7 +320,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch similarity index 100% rename from patches/server/0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch rename to patches/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch diff --git a/patches/server/0696-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0695-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0696-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0695-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0697-Add-BellRevealRaiderEvent.patch b/patches/server/0696-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0697-Add-BellRevealRaiderEvent.patch rename to patches/server/0696-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0698-Fix-invulnerable-end-crystals.patch b/patches/server/0697-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0698-Fix-invulnerable-end-crystals.patch rename to patches/server/0697-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0699-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0698-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0699-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0698-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0700-Fix-dangerous-end-portal-logic.patch b/patches/server/0699-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0700-Fix-dangerous-end-portal-logic.patch rename to patches/server/0699-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0701-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0700-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0701-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0700-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0702-Make-item-validations-configurable.patch b/patches/server/0701-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0702-Make-item-validations-configurable.patch rename to patches/server/0701-Make-item-validations-configurable.patch diff --git a/patches/server/0703-Line-Of-Sight-Changes.patch b/patches/server/0702-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0703-Line-Of-Sight-Changes.patch rename to patches/server/0702-Line-Of-Sight-Changes.patch diff --git a/patches/server/0704-add-per-world-spawn-limits.patch b/patches/server/0703-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0704-add-per-world-spawn-limits.patch rename to patches/server/0703-add-per-world-spawn-limits.patch diff --git a/patches/server/0705-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0704-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0705-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0704-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0706-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch similarity index 100% rename from patches/server/0706-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch rename to patches/server/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch diff --git a/patches/server/0707-Add-more-LimitedRegion-API.patch b/patches/server/0706-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0707-Add-more-LimitedRegion-API.patch rename to patches/server/0706-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0708-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0707-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0708-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0707-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0709-Missing-Entity-Behavior-API.patch b/patches/server/0708-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0709-Missing-Entity-Behavior-API.patch rename to patches/server/0708-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0710-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0709-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 92% rename from patches/server/0710-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0709-Ensure-disconnect-for-book-edit-is-called-on-main.patch index ef18fb52a..efe5b7d13 100644 --- a/patches/server/0710-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/server/0709-Ensure-disconnect-for-book-edit-is-called-on-main.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 93826caece07029911a90919361b773e2f8dc80f..805fff130b9ed08309ed287978bd0dd2f52b95a4 100644 +index c21ae45dce12a8079401207f83877e72e786e154..d7c053043aecf7dd701773192eb54017eb87237a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1099,7 +1099,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0711-Add-git-branch-and-commit-to-manifest.patch b/patches/server/0710-Add-git-branch-and-commit-to-manifest.patch similarity index 100% rename from patches/server/0711-Add-git-branch-and-commit-to-manifest.patch rename to patches/server/0710-Add-git-branch-and-commit-to-manifest.patch diff --git a/patches/server/0712-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0711-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0712-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0711-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0713-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0712-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 97% rename from patches/server/0713-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0712-Use-getChunkIfLoadedImmediately-in-places.patch index dcf4b0dcf..e24126ea3 100644 --- a/patches/server/0713-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/patches/server/0712-Use-getChunkIfLoadedImmediately-in-places.patch @@ -21,7 +21,7 @@ index f28aefd9192b26f39e71826fa87cca60a799be39..f8c0574137cab33d0b5efe5d532efb13 // Paper start diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 805fff130b9ed08309ed287978bd0dd2f52b95a4..640ee1b8ca4ba7308d94832fc23b0c57c81a99e1 100644 +index d7c053043aecf7dd701773192eb54017eb87237a..faa32056399e93e729c6313dc15e7315e34b8eb0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1310,7 +1310,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0714-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0713-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0714-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0713-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0715-Adds-PlayerArmSwingEvent.patch b/patches/server/0714-Adds-PlayerArmSwingEvent.patch similarity index 92% rename from patches/server/0715-Adds-PlayerArmSwingEvent.patch rename to patches/server/0714-Adds-PlayerArmSwingEvent.patch index 2c31625cb..187cfaa6e 100644 --- a/patches/server/0715-Adds-PlayerArmSwingEvent.patch +++ b/patches/server/0714-Adds-PlayerArmSwingEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 07f9b6269fa156672ed8a6572ec5dd72ca08419f..3a562f0c2c851e190ca9a681bbd33721df46a06a 100644 +index faa32056399e93e729c6313dc15e7315e34b8eb0..e20f272cc4892e5527e60861b9d12f276e877d7f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2225,7 +2225,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0716-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0715-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 98% rename from patches/server/0716-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0715-Fixes-kick-event-leave-message-not-being-sent.patch index 81eb6c1fc..e8a43c556 100644 --- a/patches/server/0716-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0715-Fixes-kick-event-leave-message-not-being-sent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3a562f0c2c851e190ca9a681bbd33721df46a06a..6a0b473e3ae663644b15e3921b87e3cb28621b31 100644 +index e20f272cc4892e5527e60861b9d12f276e877d7f..93b801fec4d8f5c42d391f3c4784b8abe0fea6d6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -457,7 +457,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0717-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0716-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0717-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0716-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0718-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0717-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0718-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0717-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0719-Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/server/0718-Fix-MerchantOffer-BuyB-Only-AssertionError.patch similarity index 100% rename from patches/server/0719-Fix-MerchantOffer-BuyB-Only-AssertionError.patch rename to patches/server/0718-Fix-MerchantOffer-BuyB-Only-AssertionError.patch diff --git a/patches/server/0720-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0719-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0720-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0719-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0721-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0720-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0721-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0720-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0722-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0721-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0722-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0721-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0723-Stinger-API.patch b/patches/server/0722-Stinger-API.patch similarity index 100% rename from patches/server/0723-Stinger-API.patch rename to patches/server/0722-Stinger-API.patch diff --git a/patches/server/0724-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0723-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0724-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0723-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0725-Add-System.out-err-catcher.patch b/patches/server/0724-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0725-Add-System.out-err-catcher.patch rename to patches/server/0724-Add-System.out-err-catcher.patch diff --git a/patches/server/0726-Fix-test-not-bootstrapping.patch b/patches/server/0725-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0726-Fix-test-not-bootstrapping.patch rename to patches/server/0725-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0727-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0726-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0727-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0726-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0728-Improve-boat-collision-performance.patch b/patches/server/0727-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0728-Improve-boat-collision-performance.patch rename to patches/server/0727-Improve-boat-collision-performance.patch diff --git a/patches/server/0729-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0728-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0729-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0728-Prevent-AFK-kick-while-watching-end-credits.patch index ccb692ad4..3a01510e5 100644 --- a/patches/server/0729-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0728-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1c7d0f4b594cc0e0ae28c89514fa21f7d42f2644..49405404a64187e1895ca2a2449a2d4cac25cc62 100644 +index 93b801fec4d8f5c42d391f3c4784b8abe0fea6d6..0cf2b24b7f97efeec17218684baa72b2f6ea17f4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -389,7 +389,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0730-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0729-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0730-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0729-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0731-Add-PlayerSetSpawnEvent.patch b/patches/server/0730-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0731-Add-PlayerSetSpawnEvent.patch rename to patches/server/0730-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0732-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0731-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0732-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0731-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0733-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0732-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0733-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0732-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0734-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0733-Config-option-for-Piglins-guarding-chests.patch similarity index 95% rename from patches/server/0734-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0733-Config-option-for-Piglins-guarding-chests.patch index 6678ecd15..7a4195634 100644 --- a/patches/server/0734-Config-option-for-Piglins-guarding-chests.patch +++ b/patches/server/0733-Config-option-for-Piglins-guarding-chests.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config option for Piglins guarding chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 055f0de420fd3603b4e2580b29746c127bb1a104..a14602b6ef00e9ac544582c0d8f4f43a5fcbf908 100644 +index 34d3ca57acd3aa37a37d44cd81bdd10967f12aaa..eac8ebb2538144d584eb02152a8d1366526150fe 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -54,6 +54,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0735-Added-EntityDamageItemEvent.patch b/patches/server/0734-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0735-Added-EntityDamageItemEvent.patch rename to patches/server/0734-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0736-Optimize-indirect-passenger-iteration.patch b/patches/server/0735-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0736-Optimize-indirect-passenger-iteration.patch rename to patches/server/0735-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0737-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0736-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0737-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0736-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0738-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0737-Configurable-item-frame-map-cursor-update-interval.patch similarity index 96% rename from patches/server/0738-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0737-Configurable-item-frame-map-cursor-update-interval.patch index 6c8e1889f..5bb473a9e 100644 --- a/patches/server/0738-Configurable-item-frame-map-cursor-update-interval.patch +++ b/patches/server/0737-Configurable-item-frame-map-cursor-update-interval.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a14602b6ef00e9ac544582c0d8f4f43a5fcbf908..e1f386cccdf0d2f6831c86667230e0bc8ee39cc9 100644 +index eac8ebb2538144d584eb02152a8d1366526150fe..fd7ac4be153538dcee60fade6e7a00f57770e97f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -862,6 +862,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0739-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0738-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0739-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0738-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0740-Clear-bucket-NBT-after-dispense.patch b/patches/server/0739-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0740-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0739-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0741-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch b/patches/server/0740-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch similarity index 100% rename from patches/server/0741-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch rename to patches/server/0740-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch diff --git a/patches/server/0742-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0741-Respect-despawn-rate-in-item-merge-check.patch similarity index 100% rename from patches/server/0742-Respect-despawn-rate-in-item-merge-check.patch rename to patches/server/0741-Respect-despawn-rate-in-item-merge-check.patch diff --git a/patches/server/0743-Move-BlockPistonRetractEvent-to-fix-duplication.patch b/patches/server/0742-Move-BlockPistonRetractEvent-to-fix-duplication.patch similarity index 100% rename from patches/server/0743-Move-BlockPistonRetractEvent-to-fix-duplication.patch rename to patches/server/0742-Move-BlockPistonRetractEvent-to-fix-duplication.patch diff --git a/patches/server/0744-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0743-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0744-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0743-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0745-Add-BlockBreakBlockEvent.patch b/patches/server/0744-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0745-Add-BlockBreakBlockEvent.patch rename to patches/server/0744-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0746-Vanilla-command-permission-fixes.patch b/patches/server/0745-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0746-Vanilla-command-permission-fixes.patch rename to patches/server/0745-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0747-Make-CallbackExecutor-strict-again.patch b/patches/server/0746-Make-CallbackExecutor-strict-again.patch similarity index 95% rename from patches/server/0747-Make-CallbackExecutor-strict-again.patch rename to patches/server/0746-Make-CallbackExecutor-strict-again.patch index 17db32765..63ac429e7 100644 --- a/patches/server/0747-Make-CallbackExecutor-strict-again.patch +++ b/patches/server/0746-Make-CallbackExecutor-strict-again.patch @@ -10,7 +10,7 @@ schedules. Effectively, use the callback executor as a tool of finding issues rather than hiding these issues. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 2a85deeab49f32a897b53707d453d1a5f2972902..dd6980326a2ec41a5eb65038ee8283a7cb8195bf 100644 +index 38f84e37510dd51a8b9b37a670ae649e8f3d4abd..00e79197d59bcbca0785ff0d651220756cb57c9b 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -154,17 +154,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0748-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0747-Prevent-unload-calls-removing-tickets-for-sync-loads.patch similarity index 100% rename from patches/server/0748-Prevent-unload-calls-removing-tickets-for-sync-loads.patch rename to patches/server/0747-Prevent-unload-calls-removing-tickets-for-sync-loads.patch diff --git a/patches/server/0749-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0748-Do-not-allow-ticket-level-changes-while-unloading-pl.patch similarity index 100% rename from patches/server/0749-Do-not-allow-ticket-level-changes-while-unloading-pl.patch rename to patches/server/0748-Do-not-allow-ticket-level-changes-while-unloading-pl.patch diff --git a/patches/server/0750-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0749-Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 100% rename from patches/server/0750-Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/server/0749-Do-not-allow-the-server-to-unload-chunks-at-request-.patch diff --git a/patches/server/0751-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0750-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0751-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0750-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0752-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0751-Correctly-handle-recursion-for-chunkholder-updates.patch similarity index 100% rename from patches/server/0752-Correctly-handle-recursion-for-chunkholder-updates.patch rename to patches/server/0751-Correctly-handle-recursion-for-chunkholder-updates.patch diff --git a/patches/server/0753-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0752-Separate-lookup-locking-from-state-access-in-UserCac.patch similarity index 100% rename from patches/server/0753-Separate-lookup-locking-from-state-access-in-UserCac.patch rename to patches/server/0752-Separate-lookup-locking-from-state-access-in-UserCac.patch diff --git a/patches/server/0754-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0753-Fix-chunks-refusing-to-unload-at-low-TPS.patch similarity index 93% rename from patches/server/0754-Fix-chunks-refusing-to-unload-at-low-TPS.patch rename to patches/server/0753-Fix-chunks-refusing-to-unload-at-low-TPS.patch index 73f9ea770..89cbf8bf9 100644 --- a/patches/server/0754-Fix-chunks-refusing-to-unload-at-low-TPS.patch +++ b/patches/server/0753-Fix-chunks-refusing-to-unload-at-low-TPS.patch @@ -10,7 +10,7 @@ chunk future to complete. We can simply schedule to the immediate executor to get this effect, rather than the main mailbox. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 7e750f84b7f7050bd2405ab01a233aa231db62c4..410d3d840e4858dd2a4f0ac9c61ff9bb98d57c1c 100644 +index fb647b770ffd7bc7609c98232e74a0bc9b98522b..fc170e5e477dec16515ceb0c27828c0199fefe43 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1451,9 +1451,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0755-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0754-Do-not-allow-ticket-level-changes-when-updating-chun.patch similarity index 100% rename from patches/server/0755-Do-not-allow-ticket-level-changes-when-updating-chun.patch rename to patches/server/0754-Do-not-allow-ticket-level-changes-when-updating-chun.patch diff --git a/patches/server/0756-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0755-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0756-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0755-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0757-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0756-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0757-Log-when-the-async-catcher-is-tripped.patch rename to patches/server/0756-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0758-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0757-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0758-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0757-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0759-Fix-and-optimize-legacy-world-conversion.patch b/patches/server/0758-Fix-and-optimize-legacy-world-conversion.patch similarity index 100% rename from patches/server/0759-Fix-and-optimize-legacy-world-conversion.patch rename to patches/server/0758-Fix-and-optimize-legacy-world-conversion.patch diff --git a/patches/server/0760-Optimise-general-POI-access.patch b/patches/server/0759-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0760-Optimise-general-POI-access.patch rename to patches/server/0759-Optimise-general-POI-access.patch diff --git a/patches/server/0761-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0760-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0761-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0760-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0762-Add-more-async-catchers.patch b/patches/server/0761-Add-more-async-catchers.patch similarity index 100% rename from patches/server/0762-Add-more-async-catchers.patch rename to patches/server/0761-Add-more-async-catchers.patch diff --git a/patches/server/0763-Rewrite-the-light-engine.patch b/patches/server/0762-Rewrite-the-light-engine.patch similarity index 99% rename from patches/server/0763-Rewrite-the-light-engine.patch rename to patches/server/0762-Rewrite-the-light-engine.patch index 98f82f6e8..70cede435 100644 --- a/patches/server/0763-Rewrite-the-light-engine.patch +++ b/patches/server/0762-Rewrite-the-light-engine.patch @@ -3856,7 +3856,7 @@ index b0a6eb7846580489e0476e69565676e77fd224cd..54822e418e319db551bfea3218d00faf private final DebugBuffer chunkToSaveHistory; public int oldTicketLevel; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 410d3d840e4858dd2a4f0ac9c61ff9bb98d57c1c..6cf01d98d5d7a41f743527381d496c0d01421928 100644 +index fc170e5e477dec16515ceb0c27828c0199fefe43..82dbeb5a10104ed3599a007186f61b0c92bea2b1 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -121,7 +121,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0764-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0763-Rewrite-entity-bounding-box-lookup-calls.patch similarity index 99% rename from patches/server/0764-Rewrite-entity-bounding-box-lookup-calls.patch rename to patches/server/0763-Rewrite-entity-bounding-box-lookup-calls.patch index 2162c466c..cfef26c75 100644 --- a/patches/server/0764-Rewrite-entity-bounding-box-lookup-calls.patch +++ b/patches/server/0763-Rewrite-entity-bounding-box-lookup-calls.patch @@ -914,7 +914,7 @@ index 0000000000000000000000000000000000000000..3ba094e640d7fe7803e2bbdab8ff3beb + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7000909d2910e3e0e87e05f0a8bda8269f8d7e05..7fd55f26ad278aae27c102638ad8ab6776f27c7d 100644 +index 80f59abeb0081fe4784f3c0d027e8dfce752814b..3351c4d43b41db5a0718d7ff761b06d950b7ee87 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -437,7 +437,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0765-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0764-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/0765-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0764-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/0766-Optimise-chunk-tick-iteration.patch b/patches/server/0765-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0766-Optimise-chunk-tick-iteration.patch rename to patches/server/0765-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0767-Execute-chunk-tasks-mid-tick.patch b/patches/server/0766-Execute-chunk-tasks-mid-tick.patch similarity index 97% rename from patches/server/0767-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0766-Execute-chunk-tasks-mid-tick.patch index 672f07a03..bf1c347f8 100644 --- a/patches/server/0767-Execute-chunk-tasks-mid-tick.patch +++ b/patches/server/0766-Execute-chunk-tasks-mid-tick.patch @@ -31,7 +31,7 @@ index 5fdaefc128956581be4bb9b34199fd6410563991..b7edc1121797bc1c57e25f540ed0124f // start copy from TickListServer // TODO check on update CrashReport crashreport = CrashReport.forThrowable(thr, "Exception while ticking"); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 154b0dd9bcfefbd7e7eae8c2f28bbabcd0fde531..099db3a627c1d3c08f3b923bb02a1cb8a0a268ab 100644 +index b7beb5c778c010d37e737f09cc9f0e7af3b47cef..1d7c26354eee1dff5e66b6234d408ed8f800415c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -330,6 +330,76 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop allChunks = new ArrayList<>(visibleChunks.values()); List players = world.players; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 6cf01d98d5d7a41f743527381d496c0d01421928..ff2fbe220da7daf572298a3d65cd11257fcc147c 100644 +index 82dbeb5a10104ed3599a007186f61b0c92bea2b1..58cf34b714ba98f35bdbe3895078ae4f87a0360e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -114,9 +114,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0770-Replace-player-chunk-loader-system.patch b/patches/server/0769-Replace-player-chunk-loader-system.patch similarity index 99% rename from patches/server/0770-Replace-player-chunk-loader-system.patch rename to patches/server/0769-Replace-player-chunk-loader-system.patch index b247183f9..cc0d4a9c0 100644 --- a/patches/server/0770-Replace-player-chunk-loader-system.patch +++ b/patches/server/0769-Replace-player-chunk-loader-system.patch @@ -1202,7 +1202,7 @@ index 54822e418e319db551bfea3218d00faf0e043f43..de0c6316c9b75a2ecc7d6abf7bcca24e } } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 83eb42f4021df19e5c58c2c0ff3d8fea89df8974..74a2e70220832257c036c40e0aa8626ab2a4ae7f 100644 +index 58cf34b714ba98f35bdbe3895078ae4f87a0360e..e343c0ad21da97c4b830c626b3d59e03fa60e494 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -187,22 +187,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0771-Replace-ticket-level-propagator.patch b/patches/server/0770-Replace-ticket-level-propagator.patch similarity index 100% rename from patches/server/0771-Replace-ticket-level-propagator.patch rename to patches/server/0770-Replace-ticket-level-propagator.patch diff --git a/patches/server/0772-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0771-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0772-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0771-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0773-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0772-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0773-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0772-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0774-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0773-Detail-more-information-in-watchdog-dumps.patch similarity index 99% rename from patches/server/0774-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0773-Detail-more-information-in-watchdog-dumps.patch index 178848d5c..7af32a532 100644 --- a/patches/server/0774-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/0773-Detail-more-information-in-watchdog-dumps.patch @@ -77,7 +77,7 @@ index bcf53ec07b8eeec7a88fb67e6fb908362e6f51b0..acc12307f61e1e055896b68fe16654c9 }); throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 12b13945702a03132d1b4c42864c8036d1357020..b5a2445bbd691cbfed0d0bf7c688b1f10c267039 100644 +index 9c69855874da2c18e9c80decf4244a0f50021a28..a999fece43b1b3f687061b541a975d889886db60 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -962,7 +962,26 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0775-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0774-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 99% rename from patches/server/0775-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0774-Optimise-collision-checking-in-player-move-packet-ha.patch index a5f673990..82baaada8 100644 --- a/patches/server/0775-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/server/0774-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 49405404a64187e1895ca2a2449a2d4cac25cc62..5ef613f2436a42859cf1d518735c3c088db4fe69 100644 +index 0cf2b24b7f97efeec17218684baa72b2f6ea17f4..86ff3ee13ac571570965966fc5b2392bb928ffb0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -582,12 +582,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0776-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0775-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0776-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0775-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0777-Distance-manager-tick-timings.patch b/patches/server/0776-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0777-Distance-manager-tick-timings.patch rename to patches/server/0776-Distance-manager-tick-timings.patch diff --git a/patches/server/0778-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0777-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0778-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0777-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0779-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0778-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0779-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0778-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0780-Add-packet-limiter-config.patch b/patches/server/0779-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0780-Add-packet-limiter-config.patch rename to patches/server/0779-Add-packet-limiter-config.patch diff --git a/patches/server/0781-Lag-compensate-block-breaking.patch b/patches/server/0780-Lag-compensate-block-breaking.patch similarity index 100% rename from patches/server/0781-Lag-compensate-block-breaking.patch rename to patches/server/0780-Lag-compensate-block-breaking.patch diff --git a/patches/server/0782-Use-hash-table-for-maintaing-changed-block-set.patch b/patches/server/0781-Use-hash-table-for-maintaing-changed-block-set.patch similarity index 100% rename from patches/server/0782-Use-hash-table-for-maintaing-changed-block-set.patch rename to patches/server/0781-Use-hash-table-for-maintaing-changed-block-set.patch diff --git a/patches/server/0783-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0782-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0783-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0782-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0784-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0783-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0784-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0783-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0785-Time-scoreboard-search.patch b/patches/server/0784-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0785-Time-scoreboard-search.patch rename to patches/server/0784-Time-scoreboard-search.patch diff --git a/patches/server/0786-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0785-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0786-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0785-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0787-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0786-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0787-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0786-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0788-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0787-Oprimise-map-impl-for-tracked-players.patch similarity index 93% rename from patches/server/0788-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0787-Oprimise-map-impl-for-tracked-players.patch index 62b0eed04..40df34a36 100644 --- a/patches/server/0788-Oprimise-map-impl-for-tracked-players.patch +++ b/patches/server/0787-Oprimise-map-impl-for-tracked-players.patch @@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have better lookups than HashMap. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 74a2e70220832257c036c40e0aa8626ab2a4ae7f..ab14316375f41a7d7177159d10f1281349b97337 100644 +index e343c0ad21da97c4b830c626b3d59e03fa60e494..5cd766b25e63f05aa728da8dd109f0d5b91bc944 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -103,6 +103,7 @@ import org.apache.logging.log4j.LogManager; diff --git a/patches/server/0789-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0788-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0789-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0788-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0790-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0789-Allow-removal-addition-of-entities-to-entity-ticklis.patch similarity index 100% rename from patches/server/0790-Allow-removal-addition-of-entities-to-entity-ticklis.patch rename to patches/server/0789-Allow-removal-addition-of-entities-to-entity-ticklis.patch diff --git a/patches/server/0791-Optimise-random-block-ticking.patch b/patches/server/0790-Optimise-random-block-ticking.patch similarity index 99% rename from patches/server/0791-Optimise-random-block-ticking.patch rename to patches/server/0790-Optimise-random-block-ticking.patch index efcf6e55b..5ac1faf39 100644 --- a/patches/server/0791-Optimise-random-block-ticking.patch +++ b/patches/server/0790-Optimise-random-block-ticking.patch @@ -71,7 +71,7 @@ index 0000000000000000000000000000000000000000..e8b4053babe46999980b926431254050 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b5a2445bbd691cbfed0d0bf7c688b1f10c267039..3b26b6a24516bb2e2331edb7dc41a28b57835aa1 100644 +index a999fece43b1b3f687061b541a975d889886db60..f512d68cbeb243fbef8fad73472ea6587112f889 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -743,6 +743,10 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0792-Optimise-non-flush-packet-sending.patch b/patches/server/0791-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0792-Optimise-non-flush-packet-sending.patch rename to patches/server/0791-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0793-Optimise-nearby-player-lookups.patch b/patches/server/0792-Optimise-nearby-player-lookups.patch similarity index 98% rename from patches/server/0793-Optimise-nearby-player-lookups.patch rename to patches/server/0792-Optimise-nearby-player-lookups.patch index f658df2f2..fa33ff50d 100644 --- a/patches/server/0793-Optimise-nearby-player-lookups.patch +++ b/patches/server/0792-Optimise-nearby-player-lookups.patch @@ -26,7 +26,7 @@ index 4588ae8037407b81c99135863eb0c4e97c564c24..2a33071c4b69cb7b5a7e296e8fd903e3 // Paper end - optimise isOutsideOfRange long lastAutoSaveTime; // Paper - incremental autosave diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index ab14316375f41a7d7177159d10f1281349b97337..daa589cb9441d2255dbbd30583a8c003a325976f 100644 +index 5cd766b25e63f05aa728da8dd109f0d5b91bc944..741609db2c8dfff24999b26f6fb98d1f27b9525e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -217,6 +217,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -114,7 +114,7 @@ index ab14316375f41a7d7177159d10f1281349b97337..daa589cb9441d2255dbbd30583a8c003 holder = new ChunkHolder(new ChunkPos(pos), level, this.level, this.lightEngine, this.queueSorter, this); // Paper start diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3b26b6a24516bb2e2331edb7dc41a28b57835aa1..6e8115c3ab1f6986fdf3b3716cb09add91424306 100644 +index f512d68cbeb243fbef8fad73472ea6587112f889..796ae447fcc305335fe943fc6d97e21422f406b1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -392,6 +392,83 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -309,7 +309,7 @@ index 5efafcadda2bfc5cab8ce5d3ede83a0467fe696f..b93056b91e7ebd49e6ddb53ccb6c05c0 protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, final DimensionType dimensionmanager, Supplier supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper - Anti-Xray - Pass executor this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 88145f04989c71a686aae1b486087ecdf55e268c..403f50ef908f65c62d4aaa7e5328faa0a7654480 100644 +index 75fc88e7def31a133e7d2a493507eacff2e7342d..bad8f0d2934218296954e9758810a68e1fedcacc 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -262,7 +262,7 @@ public final class NaturalSpawner { diff --git a/patches/server/0794-Fix-Codec-log-spam.patch b/patches/server/0793-Fix-Codec-log-spam.patch similarity index 100% rename from patches/server/0794-Fix-Codec-log-spam.patch rename to patches/server/0793-Fix-Codec-log-spam.patch diff --git a/patches/server/0795-Optimise-WorldServer-notify.patch b/patches/server/0794-Optimise-WorldServer-notify.patch similarity index 98% rename from patches/server/0795-Optimise-WorldServer-notify.patch rename to patches/server/0794-Optimise-WorldServer-notify.patch index 8f7c1c28b..e20ee5da3 100644 --- a/patches/server/0795-Optimise-WorldServer-notify.patch +++ b/patches/server/0794-Optimise-WorldServer-notify.patch @@ -8,7 +8,7 @@ Instead, only iterate over navigators in the current region that are eligible for repathing. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index daa589cb9441d2255dbbd30583a8c003a325976f..4386402e5e55438475c48b023c61bfb2dbe71a8f 100644 +index 741609db2c8dfff24999b26f6fb98d1f27b9525e..4045b7999948710517259edf1cda7028a96cc4c9 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -290,15 +290,81 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -110,7 +110,7 @@ index daa589cb9441d2255dbbd30583a8c003a325976f..4386402e5e55438475c48b023c61bfb2 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6e8115c3ab1f6986fdf3b3716cb09add91424306..cebaf0fb8187335ca303621a2cb412bb22584e23 100644 +index 796ae447fcc305335fe943fc6d97e21422f406b1..9e4ad810dd6348ad95c9a7e6d1bd63f6ec37c986 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1079,6 +1079,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0796-Remove-streams-for-villager-AI.patch b/patches/server/0795-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0796-Remove-streams-for-villager-AI.patch rename to patches/server/0795-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0797-Rewrite-dataconverter-system.patch b/patches/server/0796-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0797-Rewrite-dataconverter-system.patch rename to patches/server/0796-Rewrite-dataconverter-system.patch diff --git a/patches/server/0798-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0798-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0797-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0799-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0799-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0800-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0799-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0800-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0799-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0801-Configurable-feature-seeds.patch b/patches/server/0800-Configurable-feature-seeds.patch similarity index 98% rename from patches/server/0801-Configurable-feature-seeds.patch rename to patches/server/0800-Configurable-feature-seeds.patch index aecdb2adb..309a6a715 100644 --- a/patches/server/0801-Configurable-feature-seeds.patch +++ b/patches/server/0800-Configurable-feature-seeds.patch @@ -19,7 +19,7 @@ index 7d44abcb4fff9717a1af55879deb7eb9c2d9e7e9..e29b0a90019b12bd6586ad0f7b5314f3 } final Object val = config.get(key); diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e1f386cccdf0d2f6831c86667230e0bc8ee39cc9..78024e0b05fd24a0c3340f052fe8eb40191afdd6 100644 +index fd7ac4be153538dcee60fade6e7a00f57770e97f..9a3f75288b1d743a7ec4bfd663c1c2988678d3e6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -927,6 +927,55 @@ public class PaperWorldConfig { diff --git a/patches/server/0802-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0801-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch similarity index 100% rename from patches/server/0802-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch rename to patches/server/0801-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch diff --git a/patches/server/0803-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0802-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0803-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0802-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0804-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0803-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 99% rename from patches/server/0804-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0803-Add-paper-mobcaps-and-paper-playermobcaps.patch index 6a6e4b292..4273626dd 100644 --- a/patches/server/0804-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/server/0803-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -270,7 +270,7 @@ index 2ef4b4c2ff81d0fa33d4630593266066d8e6a6f3..34bc24403a83ae578d2fc3956b488389 List worlds; if (args.length < 2 || args[1].equals("*")) { diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 403f50ef908f65c62d4aaa7e5328faa0a7654480..afb4e740fd11e0249e70e9aea7ae1e7bebca702f 100644 +index bad8f0d2934218296954e9758810a68e1fedcacc..0b228b8bcae5ed2840ab244b6de35732f737504d 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -144,28 +144,15 @@ public final class NaturalSpawner { diff --git a/patches/server/0805-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0804-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0805-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0804-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0806-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0805-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0806-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0805-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0807-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0806-Mark-fish-and-axolotls-from-buckets-as-persistent.patch similarity index 100% rename from patches/server/0807-Mark-fish-and-axolotls-from-buckets-as-persistent.patch rename to patches/server/0806-Mark-fish-and-axolotls-from-buckets-as-persistent.patch diff --git a/patches/server/0808-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0807-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0808-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0807-fix-various-menus-with-empty-level-accesses.patch