From 7c9ac71cd7fc61b981f06056dcd6ff5b4be51f7a Mon Sep 17 00:00:00 2001 From: Cryptite Date: Sat, 20 Jan 2024 17:37:09 -0600 Subject: [PATCH] More patch fixing --- ...003-Add-BlockDestroyedByNeighborEvent.patch | 18 +++++++++--------- ...04-Add-provided-Material-to-getDrops.patch} | 0 ...0005-Add-Player-to-SpongeAbsorbEvent.patch} | 0 ...atch => 0006-Add-World-Instance-flag.patch} | 0 ....patch => 0007-Add-PlayerData-Events.patch} | 4 ++-- ...08-Add-PlayerGetRespawnLocationEvent.patch} | 0 ...9-Set-multiple-team-settings-at-once.patch} | 0 ...ports.patch => 0010-Smooth-Teleports.patch} | 2 +- ...bility-changes-for-equipment-updates.patch} | 0 ...ch => 0012-Disable-Azalea-generation.patch} | 0 ...Bypass.patch => 0013-AntiXray-Bypass.patch} | 0 ... => 0014-Add-PlayerPreChunkLoadEvent.patch} | 0 ...=> 0015-Allow-opening-covered-chests.patch} | 0 ...t-send-fire-packets-if-player-has-FR.patch} | 0 ... => 0017-Allow-access-to-LightEngine.patch} | 0 ...geode-and-monsterspawners-generation.patch} | 0 ...9-Set-Mutton-nutrition-equal-to-beef.patch} | 0 ...t.patch => 0020-PlayerLoadStatsEvent.patch} | 2 +- ...e-Crit-to-PlayerPreAttackEntityEvent.patch} | 0 ...B-Bonus-to-PlayerPreAttackEntityEven.patch} | 0 ...> 0023-noEntityCollisions-for-Entity.patch} | 0 ...=> 0024-Do-not-freeze-MappedRegistry.patch} | 0 ...dd-jackson.patch => 0025-Add-jackson.patch} | 0 ...g.patch => 0026-Maybe-can-t-tostring.patch} | 4 ++-- ...-Allow-inventory-clicks-in-Spectator.patch} | 0 ...028-Packet-obfuscation-and-reduction.patch} | 0 ...patch => 0029-Long-distance-tracking.patch} | 0 ...tch => 0030-Equipment-Packet-Caching.patch} | 0 ...tch => 0031-Add-canDespawn-to-Warden.patch} | 0 ...reason-to-PlayerConnectionCloseEvent.patch} | 0 ...h => 0033-Disable-feature-generation.patch} | 0 ....patch => 0034-Biome-freeze-override.patch} | 0 ...ch => 0035-Change-KeepAlive-interval.patch} | 0 ....patch => 0036-Non-saveable-entities.patch} | 0 ...patch => 0037-ChunkStatusChangeEvent.patch} | 0 ...able-sending-Entity-Movement-Packets.patch} | 0 ...s.patch => 0039-Player-spawnsOwnMobs.patch} | 0 ...0-Set-location-on-a-Custom-Inventory.patch} | 0 ...ge.patch => 0041-Shared-Data-Storage.patch} | 10 +++++----- .../{0041-Vanish.patch => 0042-Vanish.patch} | 0 40 files changed, 20 insertions(+), 20 deletions(-) rename patches/server/{0003-Add-provided-Material-to-getDrops.patch => 0004-Add-provided-Material-to-getDrops.patch} (100%) rename patches/server/{0004-Add-Player-to-SpongeAbsorbEvent.patch => 0005-Add-Player-to-SpongeAbsorbEvent.patch} (100%) rename patches/server/{0005-Add-World-Instance-flag.patch => 0006-Add-World-Instance-flag.patch} (100%) rename patches/server/{0006-Add-PlayerData-Events.patch => 0007-Add-PlayerData-Events.patch} (97%) rename patches/server/{0007-Add-PlayerGetRespawnLocationEvent.patch => 0008-Add-PlayerGetRespawnLocationEvent.patch} (100%) rename patches/server/{0008-Set-multiple-team-settings-at-once.patch => 0009-Set-multiple-team-settings-at-once.patch} (100%) rename patches/server/{0009-Smooth-Teleports.patch => 0010-Smooth-Teleports.patch} (97%) rename patches/server/{0010-Ignore-durability-changes-for-equipment-updates.patch => 0011-Ignore-durability-changes-for-equipment-updates.patch} (100%) rename patches/server/{0011-Disable-Azalea-generation.patch => 0012-Disable-Azalea-generation.patch} (100%) rename patches/server/{0012-AntiXray-Bypass.patch => 0013-AntiXray-Bypass.patch} (100%) rename patches/server/{0013-Add-PlayerPreChunkLoadEvent.patch => 0014-Add-PlayerPreChunkLoadEvent.patch} (100%) rename patches/server/{0014-Allow-opening-covered-chests.patch => 0015-Allow-opening-covered-chests.patch} (100%) rename patches/server/{0015-Don-t-send-fire-packets-if-player-has-FR.patch => 0016-Don-t-send-fire-packets-if-player-has-FR.patch} (100%) rename patches/server/{0016-Allow-access-to-LightEngine.patch => 0017-Allow-access-to-LightEngine.patch} (100%) rename patches/server/{0017-Disable-geode-and-monsterspawners-generation.patch => 0018-Disable-geode-and-monsterspawners-generation.patch} (100%) rename patches/server/{0018-Set-Mutton-nutrition-equal-to-beef.patch => 0019-Set-Mutton-nutrition-equal-to-beef.patch} (100%) rename patches/server/{0019-PlayerLoadStatsEvent.patch => 0020-PlayerLoadStatsEvent.patch} (98%) rename patches/server/{0020-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch => 0021-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch} (100%) rename patches/server/{0021-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch => 0022-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch} (100%) rename patches/server/{0022-noEntityCollisions-for-Entity.patch => 0023-noEntityCollisions-for-Entity.patch} (100%) rename patches/server/{0023-Do-not-freeze-MappedRegistry.patch => 0024-Do-not-freeze-MappedRegistry.patch} (100%) rename patches/server/{0024-Add-jackson.patch => 0025-Add-jackson.patch} (100%) rename patches/server/{0025-Maybe-can-t-tostring.patch => 0026-Maybe-can-t-tostring.patch} (93%) rename patches/server/{0026-Allow-inventory-clicks-in-Spectator.patch => 0027-Allow-inventory-clicks-in-Spectator.patch} (100%) rename patches/server/{0027-Packet-obfuscation-and-reduction.patch => 0028-Packet-obfuscation-and-reduction.patch} (100%) rename patches/server/{0028-Long-distance-tracking.patch => 0029-Long-distance-tracking.patch} (100%) rename patches/server/{0029-Equipment-Packet-Caching.patch => 0030-Equipment-Packet-Caching.patch} (100%) rename patches/server/{0030-Add-canDespawn-to-Warden.patch => 0031-Add-canDespawn-to-Warden.patch} (100%) rename patches/server/{0031-Add-reason-to-PlayerConnectionCloseEvent.patch => 0032-Add-reason-to-PlayerConnectionCloseEvent.patch} (100%) rename patches/server/{0032-Disable-feature-generation.patch => 0033-Disable-feature-generation.patch} (100%) rename patches/server/{0033-Biome-freeze-override.patch => 0034-Biome-freeze-override.patch} (100%) rename patches/server/{0034-Change-KeepAlive-interval.patch => 0035-Change-KeepAlive-interval.patch} (100%) rename patches/server/{0035-Non-saveable-entities.patch => 0036-Non-saveable-entities.patch} (100%) rename patches/server/{0036-ChunkStatusChangeEvent.patch => 0037-ChunkStatusChangeEvent.patch} (100%) rename patches/server/{0037-Disable-sending-Entity-Movement-Packets.patch => 0038-Disable-sending-Entity-Movement-Packets.patch} (100%) rename patches/server/{0038-Player-spawnsOwnMobs.patch => 0039-Player-spawnsOwnMobs.patch} (100%) rename patches/server/{0039-Set-location-on-a-Custom-Inventory.patch => 0040-Set-location-on-a-Custom-Inventory.patch} (100%) rename patches/server/{0040-Shared-Data-Storage.patch => 0041-Shared-Data-Storage.patch} (96%) rename patches/server/{0041-Vanish.patch => 0042-Vanish.patch} (100%) diff --git a/patches/server/0003-Add-BlockDestroyedByNeighborEvent.patch b/patches/server/0003-Add-BlockDestroyedByNeighborEvent.patch index 6eac51249..4626cd22d 100644 --- a/patches/server/0003-Add-BlockDestroyedByNeighborEvent.patch +++ b/patches/server/0003-Add-BlockDestroyedByNeighborEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockDestroyedByNeighborEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 58f972832c39a27a8ccd606f9144e1c54adbf6f3..4f00c2e8d6ff3a03a334542f699c5e35bfd03ce8 100644 +index a9126548672522eb2b824221783453f707c5dd40..f47a1767fe5c1454fd9d52660e4d3ead42f38e25 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -419,6 +419,7 @@ public class ServerPlayerGameMode { @@ -18,14 +18,14 @@ index 58f972832c39a27a8ccd606f9144e1c54adbf6f3..4f00c2e8d6ff3a03a334542f699c5e35 if (flag) { @@ -446,6 +447,7 @@ public class ServerPlayerGameMode { // CraftBukkit start - java.util.List itemsToDrop = this.level.captureDrops; // Paper - store current list - this.level.captureDrops = null; // Paper - Remove this earlier so that we can actually drop stuff + java.util.List itemsToDrop = this.level.captureDrops; // Paper - capture all item additions to the world + this.level.captureDrops = null; // Paper - capture all item additions to the world; Remove this earlier so that we can actually drop stuff + level.pendingPlayerBlockEvents.remove(pos); // Paper if (event.isDropItems()) { - org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, itemsToDrop); // Paper - use stored ref + org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, itemsToDrop); // Paper - capture all item additions to the world } diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index de277d61b718fe07a87d75a2547bb1c7f8553aa1..625a852db818d95365ad7ae56e6b1de541bbdada 100644 +index d7d51f16396ad5539d39b7914125b559bd7dd2b4..6bf4548902316b18e14821767868a9dce36c6d89 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -378,6 +378,7 @@ public final class ItemStack { @@ -34,10 +34,10 @@ index de277d61b718fe07a87d75a2547bb1c7f8553aa1..625a852db818d95365ad7ae56e6b1de5 ServerLevel world = (ServerLevel) context.getLevel(); + if (entityhuman != null) world.pendingPlayerBlockEvents.put(blockposition, new Level.PendingBlockEvent(blockposition, entityhuman)); // Paper - if (!(item instanceof BucketItem/* || item instanceof SolidBucketItem*/)) { // if not bucket // Paper - capture block states for snow buckets + if (!(item instanceof BucketItem/* || item instanceof SolidBucketItem*/)) { // if not bucket // Paper - Fix cancelled powdered snow bucket placement world.captureBlockStates = true; diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index fe62e872f0c989f612dcbfc58894bd1787345d25..465bbaeff36f4d03db40fcaf9b6ab98550316afb 100644 +index e6690b38eb09cd925f9cc2a9b431745e95160fa5..87eefde9481291d016e7bcb4c2214b5c0cefc544 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -187,6 +187,27 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -95,7 +95,7 @@ index fe62e872f0c989f612dcbfc58894bd1787345d25..465bbaeff36f4d03db40fcaf9b6ab985 // Paper start - while the above setAir method is named same and looks very similar // they are NOT used with same intent and the above should not fire this event. The above method is more of a BlockSetToAirEvent, diff --git a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java -index 81d2140351775ad55546af52eb635ccdc8509d89..0ed9f6ae968c06e63e1431ed1ce153dd1e90e908 100644 +index 03b5ab8251497c0c94467f90e6663a0dc766babb..0be28c971bbd88268af4dfdd4489d4fb309ad03a 100644 --- a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java +++ b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java @@ -112,6 +112,15 @@ public class DoublePlantBlock extends BushBlock { @@ -115,7 +115,7 @@ index 81d2140351775ad55546af52eb635ccdc8509d89..0ed9f6ae968c06e63e1431ed1ce153dd BlockState iblockdata2 = iblockdata1.getFluidState().is((Fluid) Fluids.WATER) ? Blocks.WATER.defaultBlockState() : Blocks.AIR.defaultBlockState(); diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index 3ab8b99837b1d1faea722c598b0228b2780be8b1..45bd7b9e684f71d9186a33277e5772dc7e04e9da 100644 +index eb5d6446e639649cdef20101045872a978265f0d..a11693ff8fab2accc7793c79664248a6f58176cb 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java @@ -1242,11 +1242,22 @@ public abstract class BlockBehaviour implements FeatureElement { diff --git a/patches/server/0003-Add-provided-Material-to-getDrops.patch b/patches/server/0004-Add-provided-Material-to-getDrops.patch similarity index 100% rename from patches/server/0003-Add-provided-Material-to-getDrops.patch rename to patches/server/0004-Add-provided-Material-to-getDrops.patch diff --git a/patches/server/0004-Add-Player-to-SpongeAbsorbEvent.patch b/patches/server/0005-Add-Player-to-SpongeAbsorbEvent.patch similarity index 100% rename from patches/server/0004-Add-Player-to-SpongeAbsorbEvent.patch rename to patches/server/0005-Add-Player-to-SpongeAbsorbEvent.patch diff --git a/patches/server/0005-Add-World-Instance-flag.patch b/patches/server/0006-Add-World-Instance-flag.patch similarity index 100% rename from patches/server/0005-Add-World-Instance-flag.patch rename to patches/server/0006-Add-World-Instance-flag.patch diff --git a/patches/server/0006-Add-PlayerData-Events.patch b/patches/server/0007-Add-PlayerData-Events.patch similarity index 97% rename from patches/server/0006-Add-PlayerData-Events.patch rename to patches/server/0007-Add-PlayerData-Events.patch index 70129231e..44dba1507 100644 --- a/patches/server/0006-Add-PlayerData-Events.patch +++ b/patches/server/0007-Add-PlayerData-Events.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerData Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index a9126548672522eb2b824221783453f707c5dd40..cbb044a168c96cd62660a24cb44c7e860bb85609 100644 +index f47a1767fe5c1454fd9d52660e4d3ead42f38e25..bcadfd11b4073ee1e8f2a3f5fa93505fe25ef15c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -601,6 +601,8 @@ public class ServerPlayerGameMode { +@@ -603,6 +603,8 @@ public class ServerPlayerGameMode { enuminteractionresult1 = stack.useOn(itemactioncontext); } diff --git a/patches/server/0007-Add-PlayerGetRespawnLocationEvent.patch b/patches/server/0008-Add-PlayerGetRespawnLocationEvent.patch similarity index 100% rename from patches/server/0007-Add-PlayerGetRespawnLocationEvent.patch rename to patches/server/0008-Add-PlayerGetRespawnLocationEvent.patch diff --git a/patches/server/0008-Set-multiple-team-settings-at-once.patch b/patches/server/0009-Set-multiple-team-settings-at-once.patch similarity index 100% rename from patches/server/0008-Set-multiple-team-settings-at-once.patch rename to patches/server/0009-Set-multiple-team-settings-at-once.patch diff --git a/patches/server/0009-Smooth-Teleports.patch b/patches/server/0010-Smooth-Teleports.patch similarity index 97% rename from patches/server/0009-Smooth-Teleports.patch rename to patches/server/0010-Smooth-Teleports.patch index d19a4b76d..7f8d01d18 100644 --- a/patches/server/0009-Smooth-Teleports.patch +++ b/patches/server/0010-Smooth-Teleports.patch @@ -17,7 +17,7 @@ index 4858282de0ad6758b487b80dc3d746ae0357ad39..260bcff54607b61db8f2bb5d4ee7c468 // Paper start - replace player chunk loader private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 5c7721aa768ec3b2ad659b7242681b4a04153db9..eca931c9915dc6fa702f6178e720fe47658fa046 100644 +index f54e00f11e92d63aa241a3b8693afa5f1797d1ab..0913c1be8b4130ada71e7d4f473a709e55b7d2d5 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -953,10 +953,10 @@ public abstract class PlayerList { diff --git a/patches/server/0010-Ignore-durability-changes-for-equipment-updates.patch b/patches/server/0011-Ignore-durability-changes-for-equipment-updates.patch similarity index 100% rename from patches/server/0010-Ignore-durability-changes-for-equipment-updates.patch rename to patches/server/0011-Ignore-durability-changes-for-equipment-updates.patch diff --git a/patches/server/0011-Disable-Azalea-generation.patch b/patches/server/0012-Disable-Azalea-generation.patch similarity index 100% rename from patches/server/0011-Disable-Azalea-generation.patch rename to patches/server/0012-Disable-Azalea-generation.patch diff --git a/patches/server/0012-AntiXray-Bypass.patch b/patches/server/0013-AntiXray-Bypass.patch similarity index 100% rename from patches/server/0012-AntiXray-Bypass.patch rename to patches/server/0013-AntiXray-Bypass.patch diff --git a/patches/server/0013-Add-PlayerPreChunkLoadEvent.patch b/patches/server/0014-Add-PlayerPreChunkLoadEvent.patch similarity index 100% rename from patches/server/0013-Add-PlayerPreChunkLoadEvent.patch rename to patches/server/0014-Add-PlayerPreChunkLoadEvent.patch diff --git a/patches/server/0014-Allow-opening-covered-chests.patch b/patches/server/0015-Allow-opening-covered-chests.patch similarity index 100% rename from patches/server/0014-Allow-opening-covered-chests.patch rename to patches/server/0015-Allow-opening-covered-chests.patch diff --git a/patches/server/0015-Don-t-send-fire-packets-if-player-has-FR.patch b/patches/server/0016-Don-t-send-fire-packets-if-player-has-FR.patch similarity index 100% rename from patches/server/0015-Don-t-send-fire-packets-if-player-has-FR.patch rename to patches/server/0016-Don-t-send-fire-packets-if-player-has-FR.patch diff --git a/patches/server/0016-Allow-access-to-LightEngine.patch b/patches/server/0017-Allow-access-to-LightEngine.patch similarity index 100% rename from patches/server/0016-Allow-access-to-LightEngine.patch rename to patches/server/0017-Allow-access-to-LightEngine.patch diff --git a/patches/server/0017-Disable-geode-and-monsterspawners-generation.patch b/patches/server/0018-Disable-geode-and-monsterspawners-generation.patch similarity index 100% rename from patches/server/0017-Disable-geode-and-monsterspawners-generation.patch rename to patches/server/0018-Disable-geode-and-monsterspawners-generation.patch diff --git a/patches/server/0018-Set-Mutton-nutrition-equal-to-beef.patch b/patches/server/0019-Set-Mutton-nutrition-equal-to-beef.patch similarity index 100% rename from patches/server/0018-Set-Mutton-nutrition-equal-to-beef.patch rename to patches/server/0019-Set-Mutton-nutrition-equal-to-beef.patch diff --git a/patches/server/0019-PlayerLoadStatsEvent.patch b/patches/server/0020-PlayerLoadStatsEvent.patch similarity index 98% rename from patches/server/0019-PlayerLoadStatsEvent.patch rename to patches/server/0020-PlayerLoadStatsEvent.patch index bd8ffc385..f6fbbc09b 100644 --- a/patches/server/0019-PlayerLoadStatsEvent.patch +++ b/patches/server/0020-PlayerLoadStatsEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerLoadStatsEvent diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index eca931c9915dc6fa702f6178e720fe47658fa046..96c8f9952b86129ddda6063c4129e4b971d10211 100644 +index 0913c1be8b4130ada71e7d4f473a709e55b7d2d5..4483bc16c81a5ca088320a28b4723a603b563f7e 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1495,7 +1495,7 @@ public abstract class PlayerList { diff --git a/patches/server/0020-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch b/patches/server/0021-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch similarity index 100% rename from patches/server/0020-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch rename to patches/server/0021-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch diff --git a/patches/server/0021-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch b/patches/server/0022-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch similarity index 100% rename from patches/server/0021-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch rename to patches/server/0022-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch diff --git a/patches/server/0022-noEntityCollisions-for-Entity.patch b/patches/server/0023-noEntityCollisions-for-Entity.patch similarity index 100% rename from patches/server/0022-noEntityCollisions-for-Entity.patch rename to patches/server/0023-noEntityCollisions-for-Entity.patch diff --git a/patches/server/0023-Do-not-freeze-MappedRegistry.patch b/patches/server/0024-Do-not-freeze-MappedRegistry.patch similarity index 100% rename from patches/server/0023-Do-not-freeze-MappedRegistry.patch rename to patches/server/0024-Do-not-freeze-MappedRegistry.patch diff --git a/patches/server/0024-Add-jackson.patch b/patches/server/0025-Add-jackson.patch similarity index 100% rename from patches/server/0024-Add-jackson.patch rename to patches/server/0025-Add-jackson.patch diff --git a/patches/server/0025-Maybe-can-t-tostring.patch b/patches/server/0026-Maybe-can-t-tostring.patch similarity index 93% rename from patches/server/0025-Maybe-can-t-tostring.patch rename to patches/server/0026-Maybe-can-t-tostring.patch index d3be3e4b5..6458b2cc8 100644 --- a/patches/server/0025-Maybe-can-t-tostring.patch +++ b/patches/server/0026-Maybe-can-t-tostring.patch @@ -19,10 +19,10 @@ index 22106323902ceb4fc58a95918c754234a581f7a1..72d7f519a28bc76733e67e2d0d0fcda5 java.util.Iterator> iterator = (this.tags instanceof it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap) ? ((it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap)this.tags).object2ObjectEntrySet().fastIterator() : this.tags.entrySet().iterator(); while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index d7d51f16396ad5539d39b7914125b559bd7dd2b4..d3eef784aec88a22330efd1ad62c8fc492df0ab7 100644 +index 6bf4548902316b18e14821767868a9dce36c6d89..fce143bb16e4ee2e43fbcf6363b08a0dfeb8a2e1 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -764,7 +764,11 @@ public final class ItemStack { +@@ -765,7 +765,11 @@ public final class ItemStack { itemstack.setPopTime(this.getPopTime()); if (this.tag != null) { diff --git a/patches/server/0026-Allow-inventory-clicks-in-Spectator.patch b/patches/server/0027-Allow-inventory-clicks-in-Spectator.patch similarity index 100% rename from patches/server/0026-Allow-inventory-clicks-in-Spectator.patch rename to patches/server/0027-Allow-inventory-clicks-in-Spectator.patch diff --git a/patches/server/0027-Packet-obfuscation-and-reduction.patch b/patches/server/0028-Packet-obfuscation-and-reduction.patch similarity index 100% rename from patches/server/0027-Packet-obfuscation-and-reduction.patch rename to patches/server/0028-Packet-obfuscation-and-reduction.patch diff --git a/patches/server/0028-Long-distance-tracking.patch b/patches/server/0029-Long-distance-tracking.patch similarity index 100% rename from patches/server/0028-Long-distance-tracking.patch rename to patches/server/0029-Long-distance-tracking.patch diff --git a/patches/server/0029-Equipment-Packet-Caching.patch b/patches/server/0030-Equipment-Packet-Caching.patch similarity index 100% rename from patches/server/0029-Equipment-Packet-Caching.patch rename to patches/server/0030-Equipment-Packet-Caching.patch diff --git a/patches/server/0030-Add-canDespawn-to-Warden.patch b/patches/server/0031-Add-canDespawn-to-Warden.patch similarity index 100% rename from patches/server/0030-Add-canDespawn-to-Warden.patch rename to patches/server/0031-Add-canDespawn-to-Warden.patch diff --git a/patches/server/0031-Add-reason-to-PlayerConnectionCloseEvent.patch b/patches/server/0032-Add-reason-to-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0031-Add-reason-to-PlayerConnectionCloseEvent.patch rename to patches/server/0032-Add-reason-to-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0032-Disable-feature-generation.patch b/patches/server/0033-Disable-feature-generation.patch similarity index 100% rename from patches/server/0032-Disable-feature-generation.patch rename to patches/server/0033-Disable-feature-generation.patch diff --git a/patches/server/0033-Biome-freeze-override.patch b/patches/server/0034-Biome-freeze-override.patch similarity index 100% rename from patches/server/0033-Biome-freeze-override.patch rename to patches/server/0034-Biome-freeze-override.patch diff --git a/patches/server/0034-Change-KeepAlive-interval.patch b/patches/server/0035-Change-KeepAlive-interval.patch similarity index 100% rename from patches/server/0034-Change-KeepAlive-interval.patch rename to patches/server/0035-Change-KeepAlive-interval.patch diff --git a/patches/server/0035-Non-saveable-entities.patch b/patches/server/0036-Non-saveable-entities.patch similarity index 100% rename from patches/server/0035-Non-saveable-entities.patch rename to patches/server/0036-Non-saveable-entities.patch diff --git a/patches/server/0036-ChunkStatusChangeEvent.patch b/patches/server/0037-ChunkStatusChangeEvent.patch similarity index 100% rename from patches/server/0036-ChunkStatusChangeEvent.patch rename to patches/server/0037-ChunkStatusChangeEvent.patch diff --git a/patches/server/0037-Disable-sending-Entity-Movement-Packets.patch b/patches/server/0038-Disable-sending-Entity-Movement-Packets.patch similarity index 100% rename from patches/server/0037-Disable-sending-Entity-Movement-Packets.patch rename to patches/server/0038-Disable-sending-Entity-Movement-Packets.patch diff --git a/patches/server/0038-Player-spawnsOwnMobs.patch b/patches/server/0039-Player-spawnsOwnMobs.patch similarity index 100% rename from patches/server/0038-Player-spawnsOwnMobs.patch rename to patches/server/0039-Player-spawnsOwnMobs.patch diff --git a/patches/server/0039-Set-location-on-a-Custom-Inventory.patch b/patches/server/0040-Set-location-on-a-Custom-Inventory.patch similarity index 100% rename from patches/server/0039-Set-location-on-a-Custom-Inventory.patch rename to patches/server/0040-Set-location-on-a-Custom-Inventory.patch diff --git a/patches/server/0040-Shared-Data-Storage.patch b/patches/server/0041-Shared-Data-Storage.patch similarity index 96% rename from patches/server/0040-Shared-Data-Storage.patch rename to patches/server/0041-Shared-Data-Storage.patch index 7fb66beae..a02d3e904 100644 --- a/patches/server/0040-Shared-Data-Storage.patch +++ b/patches/server/0041-Shared-Data-Storage.patch @@ -17,7 +17,7 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..7f2070bd2d7eb7f0256a96df00103d20 public BlockUpdates blockUpdates; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 078f6e9d081f6efd9417da0798197cf4b5661198..968e35f34584b22bb5bc71dd82482fcc44b99262 100644 +index 078f6e9d081f6efd9417da0798197cf4b5661198..b71fa704c812c138cb44c7580a61ddec15bdc18d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -54,7 +54,7 @@ index 078f6e9d081f6efd9417da0798197cf4b5661198..968e35f34584b22bb5bc71dd82482fcc this.isSaving = true; this.getPlayerList().saveAll(); // Paper - Incremental chunk and player saving; diff on change flag3 = this.saveAllChunks(suppressLogs, flush, force); -+ if (sharedDataStorage != null) sharedDataStorage.save(); // Slice ++ if (sharedDataStorage != null) sharedDataStorage.save(true); // Slice } finally { this.isSaving = false; } @@ -78,12 +78,12 @@ index 078f6e9d081f6efd9417da0798197cf4b5661198..968e35f34584b22bb5bc71dd82482fcc level.saveIncrementally(fullSave); } } -+ if (sharedDataStorage != null) sharedDataStorage.save(); // Slice ++ if (sharedDataStorage != null) sharedDataStorage.save(true); // Slice } finally { this.isSaving = false; } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7f81f3c3339ee1858013a2e1b18c457d9f3eaf03..07472e6728dfc6b2f5811e1989b0653201b40ad7 100644 +index 7f81f3c3339ee1858013a2e1b18c457d9f3eaf03..abdd05abf86567da495682e0613322cdcb4d9c59 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2136,7 +2136,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -114,7 +114,7 @@ index 7f81f3c3339ee1858013a2e1b18c457d9f3eaf03..07472e6728dfc6b2f5811e1989b06532 + } + int newId = mapIndex.getFreeAuxValueForMap(); + storage.set("idcounts", mapIndex); -+ storage.save(); ++ storage.save(true); + return newId; + // Slice end } diff --git a/patches/server/0041-Vanish.patch b/patches/server/0042-Vanish.patch similarity index 100% rename from patches/server/0041-Vanish.patch rename to patches/server/0042-Vanish.patch