diff --git a/patches/server/0007-CB-fixes.patch b/patches/server/0007-CB-fixes.patch index 1e55248465..8329afc236 100644 --- a/patches/server/0007-CB-fixes.patch +++ b/patches/server/0007-CB-fixes.patch @@ -17,10 +17,10 @@ Subject: [PATCH] CB fixes Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index caae5d862461c7dcf5fa9bf36e51276925668945..9908ab936780a88992c2690502c85e4d9074371d 100644 +index ae219be37c5fcec3dd3f8b08819551003e66d351..8309eb14140ebcf62ae7be1dfa0177ac7fcf83d7 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -295,7 +295,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -294,7 +294,7 @@ public class ServerLevel extends Level implements WorldGenLevel { long l = minecraftserver.getWorldData().worldGenOptions().seed(); @@ -67,7 +67,7 @@ index 99af167b02c1291f9f5fd1a195a3eb65de87002b..874f7ea643d27eec47d51a10ad472af7 this.registryAccess = registryManager; this.structureTemplateManager = structureTemplateManager; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 64db49f699ebd0baf1cce79c1ef20c5b7a83f2b3..a9cfb4e94e8038ccbbe10669198abb9177fb8ebc 100644 +index 7faf3100253b7b1fd7119cf83238d8a349e7a6bb..2d3e0eed3ef5ac3853ede30bd67866d2a6e87508 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2302,7 +2302,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0009-Adventure.patch b/patches/server/0009-Adventure.patch index 693105865e..20d7f264a1 100644 --- a/patches/server/0009-Adventure.patch +++ b/patches/server/0009-Adventure.patch @@ -1910,7 +1910,7 @@ index 0f7dd33d51281b383be0fb47d4e6b133f123ce1f..011c3d2dbd34dd0c2afba477202c937c } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9bd9210c3c66d9fa9085cfadb943e1dc93820697..72f9e0eedb142cb37f0cab85208d491c4918235e 100644 +index 48972d64710fb0d3821e7c1a0722a1d203c47e07..6a8c67dc668c775809227b455b2dd522ea0dd70b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -156,6 +156,7 @@ import net.minecraft.world.scores.Score; @@ -2458,7 +2458,7 @@ index 7ff9abc0d8fae40c425c9b5151cb36a3b8c2eee7..1fd305ccedfd311dc5238810003889b2 } collection = icons; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a9cfb4e94e8038ccbbe10669198abb9177fb8ebc..26ae612c1314258f382d1fb28c07285b0f4cd780 100644 +index 2d3e0eed3ef5ac3853ede30bd67866d2a6e87508..89feb208c93d76445dc01cf592ed5728c1659908 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -605,8 +605,10 @@ public final class CraftServer implements Server { @@ -3681,10 +3681,10 @@ index 6a64fbb8b4937f39d5fdc2e2cbec26c83c74c486..7d6b5fdb00a5c1614849735634262a36 public String getTitle() { return CraftChatMessage.fromComponent(this.container.getTitle()); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 122348a235a98a88b331f96f113bb06be7b5800c..881ba2026976c1304a6cada9dab22f8ca7b39899 100644 +index 4455bd0803327363bb76c52b4842a5cfe7f5ec90..8b01bed0d3f3b655783c3d53acf876d7eaf727c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -@@ -399,4 +399,17 @@ public final class CraftItemFactory implements ItemFactory { +@@ -408,4 +408,17 @@ public final class CraftItemFactory implements ItemFactory { public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException { return ((CraftMetaItem) meta).updateMaterial(material); } diff --git a/patches/server/0012-Timings-v2.patch b/patches/server/0012-Timings-v2.patch index 884a388911..47be04ca74 100644 --- a/patches/server/0012-Timings-v2.patch +++ b/patches/server/0012-Timings-v2.patch @@ -729,7 +729,7 @@ index 13421daa96b4ba302581f36abcd730952713d8cd..049e64c355d5f064009b1107ad15d28c } catch (Exception exception) { if (listener.shouldPropagateHandlingExceptions()) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fce3826745cf753247e0a7df02f3c73cf49dac06..ea35461400b55243a46989f1bbd57b428298e7a1 100644 +index 011c3d2dbd34dd0c2afba477202c937c654d42a4..2737dfbf4d978f2bb118cb996ea5c6920decab90 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -189,7 +189,7 @@ import org.bukkit.event.player.AsyncPlayerChatPreviewEvent; @@ -997,7 +997,7 @@ index 11006df8797334da69801cdb9aa34b0f941cf90d..5e5c4de89784db702256ee765091e929 } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 77ff6d46a4361ae1b377fa3cb269c75467a45f01..fc5965f8f2ac21a8465285e5933d8490b015568d 100644 +index 51ef894462df15f8a4b9ac6d69fb522a6e77db4e..87c60bf2795bec8cbd579957695eb23971143f30 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1,8 +1,10 @@ @@ -1146,7 +1146,7 @@ index 794ad2dbaea2555d4557124e9d942d3e6919ea09..28c8a3ba1caddf0ea334a6ef43cae25f } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 017e0ae318c15cfce72ed389b250345418e7b876..a6387b7dcc51cdf5d2646162cb24c1ba7f84795b 100644 +index 8784b0702f10eb7582c309c15f18fe13eebd9c8e..6f81aa6b0a835bf10e0d5f2b32fe9fb2dbb60400 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1,6 +1,8 @@ @@ -1166,7 +1166,7 @@ index 017e0ae318c15cfce72ed389b250345418e7b876..a6387b7dcc51cdf5d2646162cb24c1ba import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.generator.CustomWorldChunkManager; import org.bukkit.craftbukkit.util.CraftNamespacedKey; -@@ -452,7 +453,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -451,7 +452,7 @@ public class ServerLevel extends Level implements WorldGenLevel { this.updateSkyBrightness(); this.tickTime(); gameprofilerfiller.popPush("tickPending"); @@ -1175,7 +1175,7 @@ index 017e0ae318c15cfce72ed389b250345418e7b876..a6387b7dcc51cdf5d2646162cb24c1ba if (!this.isDebug()) { j = this.getGameTime(); gameprofilerfiller.push("blockTicks"); -@@ -461,12 +462,16 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -460,12 +461,16 @@ public class ServerLevel extends Level implements WorldGenLevel { this.fluidTicks.tick(j, 65536, this::tickFluid); gameprofilerfiller.pop(); } @@ -1193,7 +1193,7 @@ index 017e0ae318c15cfce72ed389b250345418e7b876..a6387b7dcc51cdf5d2646162cb24c1ba gameprofilerfiller.popPush("blockEvents"); timings.doSounds.startTiming(); // Spigot this.runBlockEvents(); -@@ -651,6 +656,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -650,6 +655,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } gameprofilerfiller.popPush("tickBlocks"); @@ -1201,7 +1201,7 @@ index 017e0ae318c15cfce72ed389b250345418e7b876..a6387b7dcc51cdf5d2646162cb24c1ba if (randomTickSpeed > 0) { LevelChunkSection[] achunksection = chunk.getSections(); int j1 = achunksection.length; -@@ -683,6 +689,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -682,6 +688,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } } @@ -1209,7 +1209,7 @@ index 017e0ae318c15cfce72ed389b250345418e7b876..a6387b7dcc51cdf5d2646162cb24c1ba gameprofilerfiller.pop(); } -@@ -917,14 +924,22 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -916,14 +923,22 @@ public class ServerLevel extends Level implements WorldGenLevel { } public void tickNonPassenger(Entity entity) { @@ -1233,7 +1233,7 @@ index 017e0ae318c15cfce72ed389b250345418e7b876..a6387b7dcc51cdf5d2646162cb24c1ba entity.setOldPosAndRot(); ProfilerFiller gameprofilerfiller = this.getProfiler(); -@@ -943,7 +958,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -942,7 +957,7 @@ public class ServerLevel extends Level implements WorldGenLevel { this.tickPassenger(entity, entity1); } @@ -1242,7 +1242,7 @@ index 017e0ae318c15cfce72ed389b250345418e7b876..a6387b7dcc51cdf5d2646162cb24c1ba } -@@ -985,6 +1000,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -984,6 +999,7 @@ public class ServerLevel extends Level implements WorldGenLevel { if (!savingDisabled) { org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit @@ -1250,7 +1250,7 @@ index 017e0ae318c15cfce72ed389b250345418e7b876..a6387b7dcc51cdf5d2646162cb24c1ba if (progressListener != null) { progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel")); } -@@ -994,7 +1010,10 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -993,7 +1009,10 @@ public class ServerLevel extends Level implements WorldGenLevel { progressListener.progressStage(Component.translatable("menu.savingChunks")); } @@ -1611,7 +1611,7 @@ index cf496b430bf3d7aab0b8e86c11e015583c1411a7..6fdd5c92ab069896e3921faa042cbdb3 }; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f1acded917678d69fe9de2bdcab5f9f747a53d78..dc39c51ac4417857a75faeae5e28bc1b4f8b4d78 100644 +index 01bee6cf472ee4f434208eb40f6e25c31c652cb6..f3fc33d0592b5eb62cdd86dae03d55f796a15d4d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2403,12 +2403,31 @@ public final class CraftServer implements Server { @@ -1816,7 +1816,7 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index bcfa8474413a5c149c126f53a446422b4fa540fa..a41b9663c2ec5a5ec9fc593531141edc7c48751e 100644 +index e12b4ec0d14901a0246cfea16c65fb046c7a4f6c..091346c2cbe7f7cf0173072343f796afe2a0f4c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2321,6 +2321,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0016-Rewrite-chunk-system.patch b/patches/server/0016-Rewrite-chunk-system.patch index 59ab9515e2..5e2030fd75 100644 --- a/patches/server/0016-Rewrite-chunk-system.patch +++ b/patches/server/0016-Rewrite-chunk-system.patch @@ -13532,7 +13532,7 @@ index a7feddc31da0870faa3d32a7108282e9e9143180..2ba3bb4e5670ece798a8882801a856d8 // Paper end } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 779783037d024792f8052fea0ea8dbe6f06bc181..38143bac35ba18590a26552820b27b9b12279ea6 100644 +index c4be39d98267e78c32abe63e3b13806fd23c54dc..38b6885d6ed9c0c799a69e8b6b069dc82d67bab6 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -125,10 +125,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -13638,7 +13638,7 @@ index 779783037d024792f8052fea0ea8dbe6f06bc181..38143bac35ba18590a26552820b27b9b this.entityMap = new Int2ObjectOpenHashMap(); @@ -262,19 +239,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider - this.chunkGeneratorState = chunkGenerator.createState(iregistrycustom.lookupOrThrow(Registries.STRUCTURE_SET), this.randomState, j); + this.chunkGeneratorState = chunkGenerator.createState(iregistrycustom.lookupOrThrow(Registries.STRUCTURE_SET), this.randomState, j, world.spigotConfig); // Spigot this.mainThreadExecutor = mainThreadExecutor; - ProcessorMailbox threadedmailbox = ProcessorMailbox.create(executor, "worldgen"); + // Paper - rewrite chunk system @@ -15327,7 +15327,7 @@ index 28c8a3ba1caddf0ea334a6ef43cae25f982743e4..80d108ae7faf3fdcb024931e93032215 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d21042ba1894 100644 +index 6f81aa6b0a835bf10e0d5f2b32fe9fb2dbb60400..3fce997cc390136a16c941f0461b20d2bc046948 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -193,7 +193,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -15449,7 +15449,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 // Add env and gen to constructor, IWorldDataServer -> WorldDataServer public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { -@@ -361,16 +462,16 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -360,16 +461,16 @@ public class ServerLevel extends Level implements WorldGenLevel { // CraftBukkit end boolean flag2 = minecraftserver.forceSynchronousWrites(); DataFixer datafixer = minecraftserver.getFixerUpper(); @@ -15471,7 +15471,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 return minecraftserver.overworld().getDataStorage(); }); this.chunkSource.getGeneratorState().ensureStructuresGenerated(); -@@ -400,6 +501,9 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -399,6 +500,9 @@ public class ServerLevel extends Level implements WorldGenLevel { this.sleepStatus = new SleepStatus(); this.gameEventDispatcher = new GameEventDispatcher(this); this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit @@ -15481,7 +15481,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 } public void setWeatherParameters(int clearDuration, int rainDuration, boolean raining, boolean thundering) { -@@ -503,7 +607,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -502,7 +606,7 @@ public class ServerLevel extends Level implements WorldGenLevel { gameprofilerfiller.push("checkDespawn"); entity.checkDespawn(); gameprofilerfiller.pop(); @@ -15490,7 +15490,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 Entity entity1 = entity.getVehicle(); if (entity1 != null) { -@@ -528,13 +632,16 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -527,13 +631,16 @@ public class ServerLevel extends Level implements WorldGenLevel { } gameprofilerfiller.push("entityManagement"); @@ -15509,7 +15509,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 } protected void tickTime() { -@@ -996,6 +1103,11 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -995,6 +1102,11 @@ public class ServerLevel extends Level implements WorldGenLevel { } public void save(@Nullable ProgressListener progressListener, boolean flush, boolean savingDisabled) { @@ -15521,7 +15521,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 ServerChunkCache chunkproviderserver = this.getChunkSource(); if (!savingDisabled) { -@@ -1011,16 +1123,13 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1010,16 +1122,13 @@ public class ServerLevel extends Level implements WorldGenLevel { } timings.worldSaveChunks.startTiming(); // Paper @@ -15542,7 +15542,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 // CraftBukkit start - moved from MinecraftServer.saveChunks ServerLevel worldserver1 = this; -@@ -1156,7 +1265,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1155,7 +1264,7 @@ public class ServerLevel extends Level implements WorldGenLevel { this.removePlayerImmediately((ServerPlayer) entity, Entity.RemovalReason.DISCARDED); } @@ -15551,7 +15551,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 } // CraftBukkit start -@@ -1172,7 +1281,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1171,7 +1280,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } // CraftBukkit end @@ -15560,7 +15560,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 } } -@@ -1184,10 +1293,10 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1183,10 +1292,10 @@ public class ServerLevel extends Level implements WorldGenLevel { public boolean tryAddFreshEntityWithPassengers(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) { // CraftBukkit end Stream stream = entity.getSelfAndPassengers().map(Entity::getUUID); // CraftBukkit - decompile error @@ -15574,7 +15574,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 return false; } else { this.addFreshEntityWithPassengers(entity, reason); // CraftBukkit -@@ -1707,7 +1816,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1706,7 +1815,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } } @@ -15583,7 +15583,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 bufferedwriter.write(String.format(Locale.ROOT, "block_entity_tickers: %d\n", this.blockEntityTickers.size())); bufferedwriter.write(String.format(Locale.ROOT, "block_ticks: %d\n", this.getBlockTicks().count())); bufferedwriter.write(String.format(Locale.ROOT, "fluid_ticks: %d\n", this.getFluidTicks().count())); -@@ -1756,7 +1865,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1755,7 +1864,7 @@ public class ServerLevel extends Level implements WorldGenLevel { BufferedWriter bufferedwriter2 = Files.newBufferedWriter(path1); try { @@ -15592,7 +15592,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 } catch (Throwable throwable4) { if (bufferedwriter2 != null) { try { -@@ -1777,7 +1886,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1776,7 +1885,7 @@ public class ServerLevel extends Level implements WorldGenLevel { BufferedWriter bufferedwriter3 = Files.newBufferedWriter(path2); try { @@ -15601,7 +15601,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 } catch (Throwable throwable6) { if (bufferedwriter3 != null) { try { -@@ -1919,7 +2028,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1918,7 +2027,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @VisibleForTesting public String getWatchdogStats() { @@ -15610,7 +15610,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 return BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString(); }), this.blockEntityTickers.size(), ServerLevel.getTypeCount(this.blockEntityTickers, TickingBlockEntity::getType), this.getBlockTicks().count(), this.getFluidTicks().count(), this.gatherChunkSourceStats()); } -@@ -1979,15 +2088,15 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1978,15 +2087,15 @@ public class ServerLevel extends Level implements WorldGenLevel { @Override public LevelEntityGetter getEntities() { org.spigotmc.AsyncCatcher.catchOp("Chunk getEntities call"); // Spigot @@ -15629,7 +15629,7 @@ index a6387b7dcc51cdf5d2646162cb24c1ba7f84795b..1fb159167321e9ac2b8e4a895914d210 } public void startTickingChunk(LevelChunk chunk) { -@@ -2003,34 +2112,49 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2002,34 +2111,49 @@ public class ServerLevel extends Level implements WorldGenLevel { @Override public void close() throws IOException { super.close(); @@ -16627,10 +16627,10 @@ index 0640df782cff1aec27e1915f726c89275edeec69..bcbbb266302cbd1ac3b0b42fac58d097 + // Paper end } diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index 53cf5c1292bc919e1c396328211421cb8d4ff8bb..de9aac5a8ef1c95385d0dc532c7764fe2c394f12 100644 +index ab358cfc606ad24c8f3a49da4294ecc6a1d22630..2d89c415fe4e76bff51374d50f1a7efbaace134e 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -@@ -115,7 +115,7 @@ public abstract class ChunkGenerator { +@@ -114,7 +114,7 @@ public abstract class ChunkGenerator { return CompletableFuture.supplyAsync(Util.wrapThreadWithTaskName("init_biomes", () -> { chunk.fillBiomesFromNoise(this.biomeSource, noiseConfig.sampler()); return chunk; @@ -17854,7 +17854,7 @@ index d58f6b48befbc637a58e669c83e994bae8872adf..cda6277a3a8eefc80de00ffc98687ce0 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index dc39c51ac4417857a75faeae5e28bc1b4f8b4d78..241e328dda2f9d32a16bbb47f4848af33d8d7b45 100644 +index f3fc33d0592b5eb62cdd86dae03d55f796a15d4d..6c0ebfeb77ad572b3c89327757348333969fa6d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1139,7 +1139,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0031-Entity-Origin-API.patch b/patches/server/0031-Entity-Origin-API.patch index dd800d55ee..784b34e6e2 100644 --- a/patches/server/0031-Entity-Origin-API.patch +++ b/patches/server/0031-Entity-Origin-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity Origin API diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 1fb159167321e9ac2b8e4a895914d21042ba1894..168c79aa8d43bddc60f9e18d3c2c8b1cb6a26e66 100644 +index 3fce997cc390136a16c941f0461b20d2bc046948..b1771e25c13b555d3316aca35f8a97ed4ce8f275 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2216,6 +2216,15 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2215,6 +2215,15 @@ public class ServerLevel extends Level implements WorldGenLevel { entity.updateDynamicGameEventListener(DynamicGameEventListener::add); entity.valid = true; // CraftBukkit diff --git a/patches/server/0040-Disable-thunder.patch b/patches/server/0040-Disable-thunder.patch index 310ef03a90..1d09b859ce 100644 --- a/patches/server/0040-Disable-thunder.patch +++ b/patches/server/0040-Disable-thunder.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable thunder diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 168c79aa8d43bddc60f9e18d3c2c8b1cb6a26e66..54fb658d05273408e0b8577199abeba7ff6481b8 100644 +index b1771e25c13b555d3316aca35f8a97ed4ce8f275..f6b62d26e99d7bec49279a41475948a4fd4b92d9 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -693,7 +693,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -692,7 +692,7 @@ public class ServerLevel extends Level implements WorldGenLevel { gameprofilerfiller.push("thunder"); BlockPos blockposition; diff --git a/patches/server/0041-Disable-ice-and-snow.patch b/patches/server/0041-Disable-ice-and-snow.patch index e5aa9d50bc..61bc0a8fc8 100644 --- a/patches/server/0041-Disable-ice-and-snow.patch +++ b/patches/server/0041-Disable-ice-and-snow.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable ice and snow diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 54fb658d05273408e0b8577199abeba7ff6481b8..2ad216a533dedb180ea10d9072ce25ebe0283b1a 100644 +index f6b62d26e99d7bec49279a41475948a4fd4b92d9..9c9c8178cd11e37aaef400e40092fb1095fa6c5f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -723,7 +723,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -722,7 +722,7 @@ public class ServerLevel extends Level implements WorldGenLevel { gameprofilerfiller.popPush("iceandsnow"); int l; diff --git a/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch index 5bc05882ee..20f3f8ebaa 100644 --- a/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable spawn chances for skeleton horses diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ad11ff50427177042b8f7331dddfc27f10657522..a99744982184649d927f72675f9cfd29e6909741 100644 +index d4b101d0f1835b57f34f68653d728df2bb78faa1..87a81cdd00b19ba020f6506eedd8ac4bf20d32ef 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -697,7 +697,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -696,7 +696,7 @@ public class ServerLevel extends Level implements WorldGenLevel { blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15)); if (this.isRainingAt(blockposition)) { DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition); diff --git a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch index fc85c367d5..bc0bf9a47e 100644 --- a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6f05f44f1123e1e152ec62d9c9f083c3d0046292..3e2b5d68ebbb2b35ffb7809238468808c106d0d8 100644 +index a487331d9df8fa0d58cfb0859c25a8fffe376ac2..e7d07d1f86af49b8729f6ac66b398ee6aae5ab4a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2226,6 +2226,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2225,6 +2225,7 @@ public class ServerLevel extends Level implements WorldGenLevel { entity.setOrigin(entity.getOriginVector().toLocation(getWorld())); } // Paper end @@ -16,7 +16,7 @@ index 6f05f44f1123e1e152ec62d9c9f083c3d0046292..3e2b5d68ebbb2b35ffb7809238468808 } public void onTrackingEnd(Entity entity) { -@@ -2301,6 +2302,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2300,6 +2301,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } } // CraftBukkit end diff --git a/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index 973af7ae80..f5f59665cb 100644 --- a/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3e2b5d68ebbb2b35ffb7809238468808c106d0d8..60a54cec367c405b1f3e69712fdbede462d6c8e5 100644 +index e7d07d1f86af49b8729f6ac66b398ee6aae5ab4a..0d08690aade0e3334c583b62e0abf7bbab9a0c59 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1459,6 +1459,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1458,6 +1458,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @Override public void updateNeighborsAt(BlockPos pos, Block sourceBlock) { diff --git a/patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index c86f58dd88..01f53af301 100644 --- a/patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -13,10 +13,10 @@ custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 60a54cec367c405b1f3e69712fdbede462d6c8e5..fab7a0f66874c5da029005310f990d7fcd61c1bc 100644 +index 0d08690aade0e3334c583b62e0abf7bbab9a0c59..349a9f4596cd1411ec3a69cd7d6f5414971b74ef 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2247,6 +2247,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2246,6 +2246,7 @@ public class ServerLevel extends Level implements WorldGenLevel { { if ( iter.next().player == entity ) { diff --git a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch index 3849dc69f4..f98ee93868 100644 --- a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch +++ b/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch @@ -34,10 +34,10 @@ index 6ec5a1525d0b8ced8fe78d3eab29c5eb82996844..2442c287a7f26cfee10a19e9015558cd return (double) pos.getMaxBlockX() > this.getMinX() && (double) pos.getMinBlockX() < this.getMaxX() && (double) pos.getMaxBlockZ() > this.getMinZ() && (double) pos.getMinBlockZ() < this.getMaxZ(); } diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index de9aac5a8ef1c95385d0dc532c7764fe2c394f12..f6241ee705a3827df9d716f199fd070ab8605ea6 100644 +index 2d89c415fe4e76bff51374d50f1a7efbaace134e..b6df6077107759963ee8205dddb90501d5ccb4d6 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -@@ -218,6 +218,7 @@ public abstract class ChunkGenerator { +@@ -217,6 +217,7 @@ public abstract class ChunkGenerator { while (iterator.hasNext()) { ChunkPos chunkcoordintpair = (ChunkPos) iterator.next(); diff --git a/patches/server/0148-Implement-ensureServerConversions-API.patch b/patches/server/0148-Implement-ensureServerConversions-API.patch index 544d1ccc7a..f3947d6102 100644 --- a/patches/server/0148-Implement-ensureServerConversions-API.patch +++ b/patches/server/0148-Implement-ensureServerConversions-API.patch @@ -7,10 +7,10 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 881ba2026976c1304a6cada9dab22f8ca7b39899..7d8ba88706edf6634f134de58e255fce26a152ba 100644 +index 8b01bed0d3f3b655783c3d53acf876d7eaf727c6..8e36ab00122d0f23f0935ef69c3cc74b06d1b4a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -@@ -411,5 +411,11 @@ public final class CraftItemFactory implements ItemFactory { +@@ -420,5 +420,11 @@ public final class CraftItemFactory implements ItemFactory { public net.kyori.adventure.text.@org.jetbrains.annotations.NotNull Component displayName(@org.jetbrains.annotations.NotNull ItemStack itemStack) { return io.papermc.paper.adventure.PaperAdventure.asAdventure(CraftItemStack.asNMSCopy(itemStack).getDisplayName()); } diff --git a/patches/server/0149-Implement-getI18NDisplayName.patch b/patches/server/0149-Implement-getI18NDisplayName.patch index 4b7e044231..fb7ba7b282 100644 --- a/patches/server/0149-Implement-getI18NDisplayName.patch +++ b/patches/server/0149-Implement-getI18NDisplayName.patch @@ -8,10 +8,10 @@ Currently the server only supports the English language. To override this, You must replace the language file embedded in the server jar. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 7d8ba88706edf6634f134de58e255fce26a152ba..6cdce121f1f04e2ca23cdbdf0844aa118be5dec8 100644 +index 8e36ab00122d0f23f0935ef69c3cc74b06d1b4a4..b2344068802478861657ebcbc70f561544c64166 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -@@ -417,5 +417,18 @@ public final class CraftItemFactory implements ItemFactory { +@@ -426,5 +426,18 @@ public final class CraftItemFactory implements ItemFactory { public ItemStack ensureServerConversions(ItemStack item) { return CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(item)); } diff --git a/patches/server/0194-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0194-Block-Enderpearl-Travel-Exploit.patch index eedb3f8756..118b98f199 100644 --- a/patches/server/0194-Block-Enderpearl-Travel-Exploit.patch +++ b/patches/server/0194-Block-Enderpearl-Travel-Exploit.patch @@ -16,10 +16,10 @@ public net.minecraft.world.entity.projectile.Projectile cachedOwner public net.minecraft.world.entity.projectile.Projectile ownerUUID diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index fab7a0f66874c5da029005310f990d7fcd61c1bc..fcdf4512307acf405dcc22f7b30dc7286ff28462 100644 +index 349a9f4596cd1411ec3a69cd7d6f5414971b74ef..45485383943f1ae0d4c5b5064cbaa8f56181dad3 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2180,6 +2180,12 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2179,6 +2179,12 @@ public class ServerLevel extends Level implements WorldGenLevel { public void onTickingEnd(Entity entity) { ServerLevel.this.entityTickList.remove(entity); diff --git a/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch index ae5b4ec9d5..c7c7d7c202 100644 --- a/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -10,10 +10,10 @@ Adds an option to control the force mode of the particle. This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index fcdf4512307acf405dcc22f7b30dc7286ff28462..60602ff0497a246788dfbecf8bdea9bc83683fd0 100644 +index 45485383943f1ae0d4c5b5064cbaa8f56181dad3..d17808f6c565712dac31b0db7a4b6baed2dbdf21 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1573,12 +1573,17 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1572,12 +1572,17 @@ public class ServerLevel extends Level implements WorldGenLevel { } public int sendParticles(ServerPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) { diff --git a/patches/server/0217-InventoryCloseEvent-Reason-API.patch b/patches/server/0217-InventoryCloseEvent-Reason-API.patch index 18de0e5784..b0fe4ce4a4 100644 --- a/patches/server/0217-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0217-InventoryCloseEvent-Reason-API.patch @@ -7,10 +7,10 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 60602ff0497a246788dfbecf8bdea9bc83683fd0..c27ceaf1b9685f1433799d50bacc361db793c1d5 100644 +index d17808f6c565712dac31b0db7a4b6baed2dbdf21..8b28de5755ad4fe50903837700feed32e4530afd 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1310,7 +1310,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1309,7 +1309,7 @@ public class ServerLevel extends Level implements WorldGenLevel { for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) { if (tileentity instanceof net.minecraft.world.Container) { for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((net.minecraft.world.Container) tileentity).getViewers())) { @@ -19,7 +19,7 @@ index 60602ff0497a246788dfbecf8bdea9bc83683fd0..c27ceaf1b9685f1433799d50bacc361d } } } -@@ -2270,7 +2270,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2269,7 +2269,7 @@ public class ServerLevel extends Level implements WorldGenLevel { // Spigot Start if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) { @@ -29,7 +29,7 @@ index 60602ff0497a246788dfbecf8bdea9bc83683fd0..c27ceaf1b9685f1433799d50bacc361d } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 6460e922056b2f349bdc9299920dc7236c4cb695..b3fa1f28405ddebdd616bcc31db42d73697f2d79 100644 +index 0e64cb9969453832c5d08b112cafb9ef835f9a2a..cd392d316f35ac488c49ad8c34c0273bbccc6a1c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -633,7 +633,7 @@ public class ServerPlayer extends Player { @@ -117,7 +117,7 @@ index 216ad4d729d8996bb4f5bc696fd168f65b076994..0f33c4bf3cb52f192d5dfe8b55a72c7a PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(entityplayer.getScoreboardName()))); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 2c93f9add161ce1aecb7e647c2c2e004cc3caf7e..12904581bcf666c31ca6b02e5e0be2f5fe17de34 100644 +index 26709e64ffbe1a41516908e4b3fc9d21d4c0dff0..a46a6b76b6821be9d8983633cd0c6b9fa3aa349c 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -265,7 +265,7 @@ public abstract class Player extends LivingEntity { @@ -173,7 +173,7 @@ index 7ea4a2d4e691e0a0a4d9ef3189a29a4a4ca4374b..883b6245f44f3fb82d7678e1092177ca @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ef923eb5aedfe93cc8746a89b63bdee5f4aaac72..e5b32af97f045f52c92dcd8f56af1508c54db490 100644 +index 3259d4ecad831f68a742517d2e85a1062035712b..aae49c0a8a6672b0b2753c88a61df5f1c9436699 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1160,7 +1160,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch index e87e6a23ba..44a4cb2119 100644 --- a/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch +++ b/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch @@ -11,10 +11,10 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set. Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 6f1bc67038fd6d8c3c31ef33ae19a014d0976bf6..05dc7159f178b971a8bd5aa06b0b6551ef27ec7d 100644 +index 846c89f7502b6f9a288b2fb7b6a7ba55b6fe1a38..7f6d331cf832f57857519b6e9801c3b45b53fc32 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -@@ -613,7 +613,7 @@ public final class CraftItemStack extends ItemStack { +@@ -622,7 +622,7 @@ public final class CraftItemStack extends ItemStack { @Override public boolean hasItemMeta() { diff --git a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 2792d84ae8..5d888284af 100644 --- a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -8,7 +8,7 @@ Add -Ddebug.entities=true to your JVM flags to gain more information 1.17: Needs to be reworked for new entity storage system diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index c6706c3d7841869134be89dd09ea723820d306a2..23bbd70dd2dd487caf972c2b1a6c85a1caa3fbcd 100644 +index 3e1b2d2cedd44112a6c100ddfffe842d3be8b703..e76241660aaefa1736565515b98f7d33f86e10b3 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -896,6 +896,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -29,7 +29,7 @@ index c6706c3d7841869134be89dd09ea723820d306a2..23bbd70dd2dd487caf972c2b1a6c85a1 protected void tick() { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c27ceaf1b9685f1433799d50bacc361db793c1d5..f2b20fe0770b519756342c7b900919c6a9d93bdb 100644 +index 8b28de5755ad4fe50903837700feed32e4530afd..2daa8e2e64829df838bde981a56d6e407b8ee004 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -219,6 +219,9 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -42,7 +42,7 @@ index c27ceaf1b9685f1433799d50bacc361db793c1d5..f2b20fe0770b519756342c7b900919c6 @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI return this.chunkSource.getChunk(x, z, false); -@@ -1272,7 +1275,28 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1271,7 +1274,28 @@ public class ServerLevel extends Level implements WorldGenLevel { // CraftBukkit start private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) { org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot diff --git a/patches/server/0304-Entity-getEntitySpawnReason.patch b/patches/server/0304-Entity-getEntitySpawnReason.patch index e83aa0a2f3..c089ab8fc2 100644 --- a/patches/server/0304-Entity-getEntitySpawnReason.patch +++ b/patches/server/0304-Entity-getEntitySpawnReason.patch @@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index f2b20fe0770b519756342c7b900919c6a9d93bdb..6ca2ea98531d28602905f0e68d368d0015a46dcd 100644 +index 2daa8e2e64829df838bde981a56d6e407b8ee004..04826a7684940558368e95d4cfd7f90eda057df8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1290,6 +1290,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1289,6 +1289,7 @@ public class ServerLevel extends Level implements WorldGenLevel { return true; } // Paper end @@ -93,7 +93,7 @@ index d664b8691a8248a035cbe1b12a353f633980ea7b..15625d54c32530eae73d6360ef68ffd1 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index a985364e5dd4a592e282ad16f0555f842a1d5048..2ae7b8d1129a3549c5ba6fe03455b0b0683c9c31 100644 +index eab8634dbf5bbb7eaa65e7e9a3d4a94a2d45ea2a..6ba97a0b4f2cb15d5435657c8e8f5c71c6fee3db 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -185,6 +185,7 @@ public abstract class BaseSpawner { diff --git a/patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 56719be607..88fd46b9fc 100644 --- a/patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world This lets you disable it for some worlds and lower it for others. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e56a03b04e510a510d9deb2a013900241471ac0f..41376a0aaa2da34ec3194d38c59a4ea2f353bd64 100644 +index 0f824428003776128f5d92c735df06cd30a8666b..80519ddf6302bf0aa8a186bd03aaa6e518e19adc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -737,31 +737,34 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop entitytypes = entity.getType(); int i = entitytypes.clientTrackingRange() * 16; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a2bba2678a56c5ea197e8b18c4a96e0833121fbe..8646b9b07bc61ec1ee11b4053c67119c8ae20459 100644 +index 52a514b657485246827bf9c153303b8b5229bf5b..62f1f568bba5fbcb68e49640adb79c9384619bc6 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2326,7 +2326,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2325,7 +2325,7 @@ public class ServerLevel extends Level implements WorldGenLevel { public void onTrackingStart(Entity entity) { org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot @@ -37,7 +37,7 @@ index a2bba2678a56c5ea197e8b18c4a96e0833121fbe..8646b9b07bc61ec1ee11b4053c67119c if (entity instanceof ServerPlayer) { ServerPlayer entityplayer = (ServerPlayer) entity; -@@ -2360,6 +2360,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2359,6 +2359,7 @@ public class ServerLevel extends Level implements WorldGenLevel { entity.updateDynamicGameEventListener(DynamicGameEventListener::add); entity.valid = true; // CraftBukkit diff --git a/patches/server/0398-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0398-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 424a8ff634..f126d9bc9f 100644 --- a/patches/server/0398-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0398-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -473,7 +473,7 @@ index 65231daec99d36d9ad3c1ca8561b6dbc49efde10..6df4d02020a14d17d9c5b1971bb5640b } } diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 8bc8b6013ea5803e091cf3534130b72278b9c29e..dca0c978b30962d4216dc443d7d105e54a29ae1b 100644 +index 00c4c8eb0fe70931a6fab24416ddcfa6f256d0cd..d032f8d011b94f396c9d5606f42a8c331db62740 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -62,13 +62,13 @@ public class Connection extends SimpleChannelInboundHandler> { @@ -515,7 +515,7 @@ index 549ea8e0fe702615eefcbfd1cd6a30e05b7b3fd5..771677c0e1cd7bfe089b9a5bb9095650 paperConfigurations.initializeWorldDefaultsConfiguration(); org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3bd645d9f642e6484d8ac8f02872873bc306e3de..3fff95ffe0e343f873dda31507567cbd8fa2460e 100644 +index 49ab59485e61f784701cf75b623ad2127e9fbe20..8d20f8beb9fd2da36a6cf8c16b1ad0315c321fc9 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -221,7 +221,9 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -529,7 +529,7 @@ index 3bd645d9f642e6484d8ac8f02872873bc306e3de..3fff95ffe0e343f873dda31507567cbd } @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI -@@ -1330,7 +1332,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1329,7 +1331,7 @@ public class ServerLevel extends Level implements WorldGenLevel { if (entity.isRemoved()) { // Paper start if (DEBUG_ENTITIES) { diff --git a/patches/server/0434-incremental-chunk-and-player-saving.patch b/patches/server/0434-incremental-chunk-and-player-saving.patch index db9bb83617..0f05d3a9aa 100644 --- a/patches/server/0434-incremental-chunk-and-player-saving.patch +++ b/patches/server/0434-incremental-chunk-and-player-saving.patch @@ -73,10 +73,10 @@ index 298e4468f7b5346733257f7117f76c66e9a1d8f0..d1652c237b2b272f0dfe80f774cff160 public void close() throws IOException { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3fff95ffe0e343f873dda31507567cbd8fa2460e..750f41e03f54b0dbac85c2a46edae2cc1505d12c 100644 +index 8d20f8beb9fd2da36a6cf8c16b1ad0315c321fc9..629f7fb76fc0382235ca5c7f87121bf0092ec279 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1144,6 +1144,37 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1143,6 +1143,37 @@ public class ServerLevel extends Level implements WorldGenLevel { return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos); } @@ -115,7 +115,7 @@ index 3fff95ffe0e343f873dda31507567cbd8fa2460e..750f41e03f54b0dbac85c2a46edae2cc // Paper start - rewrite chunk system - add close param this.save(progressListener, flush, savingDisabled, false); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 39c3c4a5239c177ef81b13be1139300bb9af1dea..eafc2651a15e1e905a6f2343760969cb5bd414c3 100644 +index 1277eb92d5ed041d014e9b5bd5e2a1edbb73addf..b291903888b33eeae7347841f12a8ca49439c736 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -181,6 +181,7 @@ import org.bukkit.inventory.MainHand; diff --git a/patches/server/0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index f46b65ddc4..26cba4d2ce 100644 --- a/patches/server/0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 772512a77f67ef83b99241de930c07a0b8c96c8a..5f5cd9ae01039432c138ff901d7f3462c5a2e491 100644 +index 629f7fb76fc0382235ca5c7f87121bf0092ec279..b4f299a61b9c02d1dc679a0eff2b039c984bef37 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1869,6 +1869,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1868,6 +1868,7 @@ public class ServerLevel extends Level implements WorldGenLevel { //ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(this.worldData.a(), 0, this.worldData.c())); this.levelData.setSpawn(pos, angle); @@ -17,7 +17,7 @@ index 772512a77f67ef83b99241de930c07a0b8c96c8a..5f5cd9ae01039432c138ff901d7f3462 // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d9ac6e687ad7f4c2cfe6698cdf6e7d1d4652eb2b..66d87216a3964c5fd39af564c3b4c40eee278c9a 100644 +index cec02e3b47ccc99ba8343dafa7a760ebca64ffc1..51f20f0f28c3372be871873dcf58c551800797b2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -262,11 +262,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0475-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0475-Create-HoverEvent-from-ItemStack-Entity.patch index 39dfe775bc..e2dd166372 100644 --- a/patches/server/0475-Create-HoverEvent-from-ItemStack-Entity.patch +++ b/patches/server/0475-Create-HoverEvent-from-ItemStack-Entity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Create HoverEvent from ItemStack Entity diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 6cdce121f1f04e2ca23cdbdf0844aa118be5dec8..b7a53edbf6c4730ae65a8e5fb414feaef9bdf1b7 100644 +index b2344068802478861657ebcbc70f561544c64166..6da68728ead8eeb986baeb8bb0a3503307f5b70b 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -@@ -430,5 +430,40 @@ public final class CraftItemFactory implements ItemFactory { +@@ -439,5 +439,40 @@ public final class CraftItemFactory implements ItemFactory { return nms != null ? net.minecraft.locale.Language.getInstance().getOrDefault(nms.getItem().getDescriptionId(nms)) : null; } diff --git a/patches/server/0480-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0480-Extend-block-drop-capture-to-capture-all-items-added.patch index cf298f6a01..b2465b0a6c 100644 --- a/patches/server/0480-Extend-block-drop-capture-to-capture-all-items-added.patch +++ b/patches/server/0480-Extend-block-drop-capture-to-capture-all-items-added.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5f5cd9ae01039432c138ff901d7f3462c5a2e491..145ccb0b4ae02fc4fd32552570315a8356bc3141 100644 +index b4f299a61b9c02d1dc679a0eff2b039c984bef37..8c32f34a3bf03f4e95bf961f33e6e98368e7e961 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1370,6 +1370,12 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1369,6 +1369,12 @@ public class ServerLevel extends Level implements WorldGenLevel { // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit return false; } else { diff --git a/patches/server/0547-Remove-stale-POIs.patch b/patches/server/0547-Remove-stale-POIs.patch index 0ceb90cdab..68b06f554e 100644 --- a/patches/server/0547-Remove-stale-POIs.patch +++ b/patches/server/0547-Remove-stale-POIs.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove stale POIs diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 145ccb0b4ae02fc4fd32552570315a8356bc3141..c7a79e8208f678c5ce94f3d5bf769565d6b3ff63 100644 +index 8c32f34a3bf03f4e95bf961f33e6e98368e7e961..cd791e727bf66ff32ffeeae68e5c110502fbdd37 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1934,6 +1934,11 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1933,6 +1933,11 @@ public class ServerLevel extends Level implements WorldGenLevel { }); optional1.ifPresent((holder) -> { this.getServer().execute(() -> { diff --git a/patches/server/0551-Add-StructuresLocateEvent.patch b/patches/server/0551-Add-StructuresLocateEvent.patch index 1a0a9a1c8d..76cea9fd60 100644 --- a/patches/server/0551-Add-StructuresLocateEvent.patch +++ b/patches/server/0551-Add-StructuresLocateEvent.patch @@ -75,10 +75,10 @@ index 0000000000000000000000000000000000000000..16996c743b169e625ec810523c1d59a3 + } +} diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index f6241ee705a3827df9d716f199fd070ab8605ea6..d916159abb9c817b57897e6ec8b65a2079bf8e18 100644 +index b6df6077107759963ee8205dddb90501d5ccb4d6..29032374f0e71a41a2de260d402b6fbff68288cc 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -@@ -122,6 +122,26 @@ public abstract class ChunkGenerator { +@@ -121,6 +121,26 @@ public abstract class ChunkGenerator { @Nullable public Pair> findNearestMapStructure(ServerLevel world, HolderSet structures, BlockPos center, int radius, boolean skipReferencedStructures) { diff --git a/patches/server/0565-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0565-added-option-to-disable-pathfinding-updates-on-block.patch index 04fedaaefb..207bd4a029 100644 --- a/patches/server/0565-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0565-added-option-to-disable-pathfinding-updates-on-block.patch @@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c576f94ee4f562b2f871af6c241031fd765353ff..835fda071197f9d7b929e015fbd9b143d13856d5 100644 +index af355382878d49c3265c372405615b73d87dd647..5e1448c900b8569344f5c7d219c0d7ce92ccd5b4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1515,6 +1515,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1514,6 +1514,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } this.getChunkSource().blockChanged(pos); @@ -16,7 +16,7 @@ index c576f94ee4f562b2f871af6c241031fd765353ff..835fda071197f9d7b929e015fbd9b143 VoxelShape voxelshape = oldState.getCollisionShape(this, pos); VoxelShape voxelshape1 = newState.getCollisionShape(this, pos); -@@ -1556,6 +1557,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1555,6 +1556,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } } diff --git a/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch index a793b5851f..125f1268be 100644 --- a/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 835fda071197f9d7b929e015fbd9b143d13856d5..862314a0a73c2c6676fa4a4dc70bc719a356a93b 100644 +index 5e1448c900b8569344f5c7d219c0d7ce92ccd5b4..307c451c7fb8e783440f805bf2623ba7fa8c300a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -534,8 +534,8 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -533,8 +533,8 @@ public class ServerLevel extends Level implements WorldGenLevel { this.serverLevelData.setClearWeatherTime(clearDuration); this.serverLevelData.setRainTime(rainDuration); this.serverLevelData.setThunderTime(rainDuration); @@ -19,7 +19,7 @@ index 835fda071197f9d7b929e015fbd9b143d13856d5..862314a0a73c2c6676fa4a4dc70bc719 } @Override -@@ -948,8 +948,8 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -947,8 +947,8 @@ public class ServerLevel extends Level implements WorldGenLevel { this.serverLevelData.setThunderTime(j); this.serverLevelData.setRainTime(k); this.serverLevelData.setClearWeatherTime(i); @@ -30,7 +30,7 @@ index 835fda071197f9d7b929e015fbd9b143d13856d5..862314a0a73c2c6676fa4a4dc70bc719 } this.oThunderLevel = this.thunderLevel; -@@ -1015,14 +1015,14 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1014,14 +1014,14 @@ public class ServerLevel extends Level implements WorldGenLevel { private void resetWeatherCycle() { // CraftBukkit start @@ -95,7 +95,7 @@ index 68d495d5554d5c5758537be11188745e1458a00c..6eafa7969f463a6ee33b84b7e6a79f80 if (weather.isCancelled()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ac8f0b163b6b2c7eefb8dd24a878112367b13566..a31016f6b5651732c8bbcdcb239b237ccaf0a36e 100644 +index 7beaea21edf0b832bc1115d90f5893c75a8da912..0b1b0f5eaf8ac1e01d991fbf90f3656b649b878f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1183,7 +1183,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch index 9fce41f148..6ced63ffcd 100644 --- a/patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Add methods to find targets for lightning strikes public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 17aaa93e5ad6badb7a220e891328962a69a63a7b..507792ec35a075c72c6ca9341ec95fcda2ecc665 100644 +index e14c8dfb8238b4afed2085e68beaf746463f7846..e875ae882652b7c2c8cc85fade6ecfa2327eaf64 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -837,6 +837,11 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -836,6 +836,11 @@ public class ServerLevel extends Level implements WorldGenLevel { } protected BlockPos findLightningTargetAround(BlockPos pos) { @@ -22,7 +22,7 @@ index 17aaa93e5ad6badb7a220e891328962a69a63a7b..507792ec35a075c72c6ca9341ec95fcd BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos); Optional optional = this.findLightningRod(blockposition1); -@@ -851,6 +856,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -850,6 +855,7 @@ public class ServerLevel extends Level implements WorldGenLevel { if (!list.isEmpty()) { return ((LivingEntity) list.get(this.random.nextInt(list.size()))).blockPosition(); } else { @@ -31,7 +31,7 @@ index 17aaa93e5ad6badb7a220e891328962a69a63a7b..507792ec35a075c72c6ca9341ec95fcd blockposition1 = blockposition1.above(2); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e7c334dfe8f9eda2f1c8449bcae5ad983715f9db..30561840201f3e560753d91f82a646bad20f1a93 100644 +index 78427e0b3f02f01bb7c688049091469b1fd50e05..0f7c6711dc36a31da53a2389fd3c9bba4008d7d1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -685,6 +685,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0690-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0690-Add-ItemFactory-getSpawnEgg-API.patch index e6b8c69ff5..a890378c5e 100644 --- a/patches/server/0690-Add-ItemFactory-getSpawnEgg-API.patch +++ b/patches/server/0690-Add-ItemFactory-getSpawnEgg-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add ItemFactory#getSpawnEgg API diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index b7a53edbf6c4730ae65a8e5fb414feaef9bdf1b7..a0d146b2f32c9de63658d9c791385c349f12f853 100644 +index 6da68728ead8eeb986baeb8bb0a3503307f5b70b..a7370f440dbcde6bf56deb1c1763baaa2a30da88 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -@@ -465,5 +465,17 @@ public final class CraftItemFactory implements ItemFactory { +@@ -474,5 +474,17 @@ public final class CraftItemFactory implements ItemFactory { entity.getUniqueId().toString(), new net.md_5.bungee.api.chat.TextComponent(customName)); } diff --git a/patches/server/0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index 9d18c6a9e7..570472151c 100644 --- a/patches/server/0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -9,10 +9,10 @@ chunk through it. This should also be OK from a leak prevention/ state desync POV because the TE is getting unloaded anyways. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 507792ec35a075c72c6ca9341ec95fcda2ecc665..52f424e381e3b15e5c53bca536025b5dd77bf562 100644 +index e875ae882652b7c2c8cc85fade6ecfa2327eaf64..3df252848b7d3420fdc65e255fe842fc578f0638 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1416,9 +1416,13 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1415,9 +1415,13 @@ public class ServerLevel extends Level implements WorldGenLevel { // Spigot Start for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) { if (tileentity instanceof net.minecraft.world.Container) { @@ -28,7 +28,7 @@ index 507792ec35a075c72c6ca9341ec95fcda2ecc665..52f424e381e3b15e5c53bca536025b5d } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 95e268a3d50bbcea3e5a2273df6e92d8364970ce..d02cab4c09e2036f6b1ac3667ef8282475daf015 100644 +index 5f9ca49dc90b20883b52948318125e4d510b485f..0007cf65767e304e27588bf2133579c5e06cc54a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1597,6 +1597,18 @@ public class ServerPlayer extends Player { @@ -51,7 +51,7 @@ index 95e268a3d50bbcea3e5a2273df6e92d8364970ce..d02cab4c09e2036f6b1ac3667ef82824 @Override public void doCloseContainer() { diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 983be45492dad5a1c73b591bc14b57102b273851..2a770125bf31906a3def5e563fbfcc283c39127d 100644 +index 95019b6ba1bc3bff42e15e5bed4ca7c5d109f1be..d7ef9c267a0cf496ac08ce568cb7649e09d5fcd6 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -499,6 +499,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0706-Execute-chunk-tasks-mid-tick.patch b/patches/server/0706-Execute-chunk-tasks-mid-tick.patch index 52ca020c51..62db069d93 100644 --- a/patches/server/0706-Execute-chunk-tasks-mid-tick.patch +++ b/patches/server/0706-Execute-chunk-tasks-mid-tick.patch @@ -126,7 +126,7 @@ index b768767b92bf7691a6e57627c69818a1f5fd82c8..ebd0da4f87c74f12d702e1ae4f320688 } // Paper start - optimise chunk tick iteration diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 528a946af676167b0a3affc7d17b8e5219446988..390fdb2cf33901814c475b2e7da7dc1a79beda29 100644 +index 3df252848b7d3420fdc65e255fe842fc578f0638..4b8130bdf5139e72e7f7d16af7fe1dcaeb3387b5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -215,6 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -137,7 +137,7 @@ index 528a946af676167b0a3affc7d17b8e5219446988..390fdb2cf33901814c475b2e7da7dc1a // CraftBukkit start public final LevelStorageSource.LevelStorageAccess convertable; -@@ -1048,6 +1049,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1047,6 +1048,7 @@ public class ServerLevel extends Level implements WorldGenLevel { if (fluid1.is(fluid)) { fluid1.tick(this, pos); } @@ -145,7 +145,7 @@ index 528a946af676167b0a3affc7d17b8e5219446988..390fdb2cf33901814c475b2e7da7dc1a } -@@ -1057,6 +1059,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1056,6 +1058,7 @@ public class ServerLevel extends Level implements WorldGenLevel { if (iblockdata.is(block)) { iblockdata.tick(this, pos, this.random); } @@ -154,7 +154,7 @@ index 528a946af676167b0a3affc7d17b8e5219446988..390fdb2cf33901814c475b2e7da7dc1a } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 8a73f999c18bd3f8880af831f7d4bc3c97241627..10f4cbf82cc4a79aacfd1f8e1e53a6c1f4963865 100644 +index abaf792d77bb30d7bab6377dc1cdb6237766555d..5c904ca1e7963cabaaa84d81e0eab4872c4595ac 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -825,6 +825,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0709-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0709-Detail-more-information-in-watchdog-dumps.patch index a6070fec9a..59edad5ba3 100644 --- a/patches/server/0709-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/0709-Detail-more-information-in-watchdog-dumps.patch @@ -78,10 +78,10 @@ index acfa1907bfc9c29d261cfccc00d65bad9ad1a002..d6f3869f5725c7f081efb7f486f74dbb }); 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 390fdb2cf33901814c475b2e7da7dc1a79beda29..3ba995c8d21427a3dbbde22c8faa0a7888507880 100644 +index 4b8130bdf5139e72e7f7d16af7fe1dcaeb3387b5..4dec1619002cd922c25f27cc771cf8672092a341 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1063,7 +1063,26 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1062,7 +1062,26 @@ public class ServerLevel extends Level implements WorldGenLevel { } @@ -108,7 +108,7 @@ index 390fdb2cf33901814c475b2e7da7dc1a79beda29..3ba995c8d21427a3dbbde22c8faa0a78 ++TimingHistory.entityTicks; // Paper - timings // Spigot start co.aikar.timings.Timing timer; // Paper -@@ -1103,7 +1122,13 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1102,7 +1121,13 @@ public class ServerLevel extends Level implements WorldGenLevel { this.tickPassenger(entity, entity1); } // } finally { timer.stopTiming(); } // Paper - timings - move up diff --git a/patches/server/0723-Optimise-random-block-ticking.patch b/patches/server/0723-Optimise-random-block-ticking.patch index ddddbaa824..56a3a1964c 100644 --- a/patches/server/0723-Optimise-random-block-ticking.patch +++ b/patches/server/0723-Optimise-random-block-ticking.patch @@ -90,10 +90,10 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3ba995c8d21427a3dbbde22c8faa0a7888507880..02e58f7de47af48c9e23dfd2ebe5fab9967dd82c 100644 +index 4dec1619002cd922c25f27cc771cf8672092a341..46464111ce908eaa44def90167c50a442e0ae640 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -707,6 +707,10 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -706,6 +706,10 @@ public class ServerLevel extends Level implements WorldGenLevel { entityplayer.stopSleepInBed(false, false); }); } @@ -104,7 +104,7 @@ index 3ba995c8d21427a3dbbde22c8faa0a7888507880..02e58f7de47af48c9e23dfd2ebe5fab9 public void tickChunk(LevelChunk chunk, int randomTickSpeed) { ChunkPos chunkcoordintpair = chunk.getPos(); -@@ -716,10 +720,10 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -715,10 +719,10 @@ public class ServerLevel extends Level implements WorldGenLevel { ProfilerFiller gameprofilerfiller = this.getProfiler(); gameprofilerfiller.push("thunder"); @@ -117,7 +117,7 @@ index 3ba995c8d21427a3dbbde22c8faa0a7888507880..02e58f7de47af48c9e23dfd2ebe5fab9 if (this.isRainingAt(blockposition)) { DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition); boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper -@@ -749,18 +753,26 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -748,18 +752,26 @@ public class ServerLevel extends Level implements WorldGenLevel { int l; if (!this.paperConfig().environment.disableIceAndSnow && this.random.nextInt(16) == 0) { // Paper - Disable ice and snow @@ -148,7 +148,7 @@ index 3ba995c8d21427a3dbbde22c8faa0a7888507880..02e58f7de47af48c9e23dfd2ebe5fab9 if (i1 > 0 && biomebase.shouldSnow(this, blockposition)) { iblockdata = this.getBlockState(blockposition); if (iblockdata.is(Blocks.SNOW)) { -@@ -775,52 +787,55 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -774,52 +786,55 @@ public class ServerLevel extends Level implements WorldGenLevel { org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition, Blocks.SNOW.defaultBlockState(), null); // CraftBukkit } } @@ -319,7 +319,7 @@ index 30663713e198bfe40b95c48524b71ea65f39965e..25503678e7d049a8b3172cfad8a56069 public BlockPos getHomePos() { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index c56de0c388f5902d85b0810c6e105c24d721bcdd..62bf7fec8188e69e7811aa4e1f0f3131f8af0bd7 100644 +index f2868adace339d923012efc9aba0d882909eecb5..7c86a130afb536ece5726caf7f2b32f68fa5fa0a 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1368,10 +1368,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -436,7 +436,7 @@ index 066874d27495dcaa3dea254b7328257e46920357..c3f1334b2bb97f0633f3ea43b97ee49a public PalettedContainer getStates() { diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index 5cd4b81a9e89402c617aa3458200b95faa551c9c..2362688501d246f4a1ced41d63f75548a19ad013 100644 +index 715830d27490572bbe963515f046205c6d7e834d..3c7ef1e8e338a84eee34f39ce73e64876632ea87 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -383,6 +383,14 @@ public class PalettedContainer implements PaletteResize, PalettedContainer diff --git a/patches/server/0725-Optimise-nearby-player-lookups.patch b/patches/server/0725-Optimise-nearby-player-lookups.patch index 2192d15dda..9b36e2ed99 100644 --- a/patches/server/0725-Optimise-nearby-player-lookups.patch +++ b/patches/server/0725-Optimise-nearby-player-lookups.patch @@ -39,7 +39,7 @@ index e11ec87e8007979a1c6932b414bcd70c10db746c..bc46479fd0622a90fd98ac88f92b2840 // Paper end diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index fab05c504ede66b91f07666341df70338ab4b6db..fb47e820beb5b8224a44d41a7b83e10e6eb783c1 100644 +index 61751736ce65a4004acccf36edc9e1cc057db828..d1717ea6e3aa8912caeb3a5590b08b0113b83ec0 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -156,6 +156,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -104,7 +104,7 @@ index fab05c504ede66b91f07666341df70338ab4b6db..fb47e820beb5b8224a44d41a7b83e10e protected ChunkGenerator generator() { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 02e58f7de47af48c9e23dfd2ebe5fab9967dd82c..91b4866c15104ad8ed7b0967df1fc8d9e433b096 100644 +index 46464111ce908eaa44def90167c50a442e0ae640..5053b714df6110df6bf5c97ededc542ef6927f98 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -446,6 +446,84 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -192,7 +192,7 @@ index 02e58f7de47af48c9e23dfd2ebe5fab9967dd82c..91b4866c15104ad8ed7b0967df1fc8d9 // Add env and gen to constructor, IWorldDataServer -> WorldDataServer public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { // Holder holder = worlddimension.type(); // CraftBukkit - decompile error -@@ -549,6 +627,14 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -548,6 +626,14 @@ public class ServerLevel extends Level implements WorldGenLevel { } public void tick(BooleanSupplier shouldKeepTicking) { @@ -226,7 +226,7 @@ index 082da4f8eaede9d7f70341c207a2aaa6f07b997e..49b983064ea810382b6112f5dc7f93ba if (entityhuman != null) { double d0 = entityhuman.distanceToSqr((Entity) this); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 62bf7fec8188e69e7811aa4e1f0f3131f8af0bd7..363d908ef7707311210fa662f706c59a8a5e7f76 100644 +index 7c86a130afb536ece5726caf7f2b32f68fa5fa0a..413b4a5d2064381b2f52f6b4eef553c72029808f 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -204,6 +204,69 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch index 7d0fc1ab3f..fd3d81ccce 100644 --- a/patches/server/0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch +++ b/patches/server/0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 91b4866c15104ad8ed7b0967df1fc8d9e433b096..2b823f40c9435cfac6590487426e1ec1c051ecec 100644 +index 5053b714df6110df6bf5c97ededc542ef6927f98..84b1c2e26b20426a11aad25efe2804ee992989f3 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2590,6 +2590,11 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2589,6 +2589,11 @@ public class ServerLevel extends Level implements WorldGenLevel { // Spigot end // Spigot Start if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message diff --git a/patches/server/0746-Configurable-feature-seeds.patch b/patches/server/0746-Configurable-feature-seeds.patch index 6b2b9024c9..bf5727b704 100644 --- a/patches/server/0746-Configurable-feature-seeds.patch +++ b/patches/server/0746-Configurable-feature-seeds.patch @@ -19,10 +19,10 @@ index 98171f6c8e23f6ef89b897e4b80e3afb2a1950a0..06bff37e4c1fddd3be6343049a66787c } final Object val = config.get(key); diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index d916159abb9c817b57897e6ec8b65a2079bf8e18..e0638949774215d4c2524761ffebf378206cd2d0 100644 +index 29032374f0e71a41a2de260d402b6fbff68288cc..95dd058fca280a1e16f3d327be2aabeab91be534 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -@@ -434,7 +434,14 @@ public abstract class ChunkGenerator { +@@ -433,7 +433,14 @@ public abstract class ChunkGenerator { return (String) optional.orElseGet(placedfeature::toString); }; diff --git a/patches/server/0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index 200f71514f..93c850f0d3 100644 --- a/patches/server/0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -18,12 +18,12 @@ index 0868805c78d991c602d8f1d1b5aeb5c790c13384..6986d5475b090bca60b5ae892512fd5e biomeProvider = gen.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 961a68252baabb0b7ccc9f7aa88dcb7516d0865f..135dd847700158332c3d770be6e13c1f9a893c03 100644 +index 037cc496670c08fbee3fda1ca192758a7cad577c..ae5421fd85de55eecad2db4041c6552ed0ef04d4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1236,7 +1236,7 @@ public final class CraftServer implements Server { List list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata)); - LevelStem worlddimension = (LevelStem) iregistry.get(actualDimension); + LevelStem worlddimension = this.getServer().registries().compositeAccess().registryOrThrow(Registries.LEVEL_STEM).get(actualDimension); - WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.type().value()); + WorldInfo worldInfo = new CraftWorldInfo(worlddata, worldSession, creator.environment(), worlddimension.type().value(), worlddimension.generator(), this.getHandle().getServer().registryAccess()); // Paper @@ -31,7 +31,7 @@ index 961a68252baabb0b7ccc9f7aa88dcb7516d0865f..135dd847700158332c3d770be6e13c1f biomeProvider = generator.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 41289cc5dc51ff18a7bf199b738d33a985761edf..d80b9dda3fd9b4b0a2c4b7545c6b22674c0449e4 100644 +index aaba757b605405e08da7b359bc1fc87252114252..04b4c2f4796046828a73d3911da880ccd3fdf349 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -199,6 +199,30 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0822-Implement-enchantWithLevels-API.patch b/patches/server/0822-Implement-enchantWithLevels-API.patch index 790b5c7b86..e1481c972f 100644 --- a/patches/server/0822-Implement-enchantWithLevels-API.patch +++ b/patches/server/0822-Implement-enchantWithLevels-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Implement enchantWithLevels API diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 2d25b7fb8e0c8984a6d3bad94b177713e3114533..4214420d6670b394758f14dbf6de628420c56e3b 100644 +index a7370f440dbcde6bf56deb1c1763baaa2a30da88..9076770aa8dc9a7a40efc06bb9fc50fd85026188 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -@@ -401,6 +401,21 @@ public final class CraftItemFactory implements ItemFactory { +@@ -410,6 +410,21 @@ public final class CraftItemFactory implements ItemFactory { } // Paper start diff --git a/patches/server/0847-Don-t-tick-markers.patch b/patches/server/0847-Don-t-tick-markers.patch index fac3c839c0..2fa6522fbb 100644 --- a/patches/server/0847-Don-t-tick-markers.patch +++ b/patches/server/0847-Don-t-tick-markers.patch @@ -9,7 +9,7 @@ list is only used in the tick and tickPassenger methods, so we can safely not ad markers to it. diff --git a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java -index 68f99e93ed3e843b4001a7a27620f88a48b85e67..0dc96c39151ec4dbeec3947cb17606f53a6392d4 100644 +index 9e51b3d1217ad6dc5c0c11d2febac7144e5721af..a38a0c11c9e12aeff73d792368e1a69a856376d4 100644 --- a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java +++ b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java @@ -103,7 +103,7 @@ public final class EntityCommand implements PaperSubcommand { @@ -22,10 +22,10 @@ index 68f99e93ed3e843b4001a7a27620f88a48b85e67..0dc96c39151ec4dbeec3947cb17606f5 } }); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 2b823f40c9435cfac6590487426e1ec1c051ecec..22f738ed5e93e868caba0af7077c3623c2013a43 100644 +index 84b1c2e26b20426a11aad25efe2804ee992989f3..000d0963fb9551a38690da7f14c9a9d0c8bd93d2 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2500,6 +2500,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2499,6 +2499,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } public void onTickingStart(Entity entity) { diff --git a/patches/server/0856-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0856-Add-Alternate-Current-redstone-implementation.patch index c712f64505..c1325a9eb8 100644 --- a/patches/server/0856-Add-Alternate-Current-redstone-implementation.patch +++ b/patches/server/0856-Add-Alternate-Current-redstone-implementation.patch @@ -2008,7 +2008,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 22f738ed5e93e868caba0af7077c3623c2013a43..557a5aa50d9d23f9c8bda3d39865a96bd6b395ee 100644 +index 000d0963fb9551a38690da7f14c9a9d0c8bd93d2..8cb87b4b11beef91ad32c08c579c4b27aa943e08 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -2019,7 +2019,7 @@ index 22f738ed5e93e868caba0af7077c3623c2013a43..557a5aa50d9d23f9c8bda3d39865a96b public static Throwable getAddToWorldStackTrace(Entity entity) { final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date()); io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr); -@@ -2489,6 +2490,13 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2488,6 +2489,13 @@ public class ServerLevel extends Level implements WorldGenLevel { return this.server.getWorldData().enabledFeatures(); } @@ -2034,7 +2034,7 @@ index 22f738ed5e93e868caba0af7077c3623c2013a43..557a5aa50d9d23f9c8bda3d39865a96b EntityCallbacks() {} diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 363d908ef7707311210fa662f706c59a8a5e7f76..502d7c7322e1b48ae59c8e0fd271a6bf2dcd2ec8 100644 +index 413b4a5d2064381b2f52f6b4eef553c72029808f..bb411f4efc550ed7872f0252373be81bd8e99b76 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1520,4 +1520,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0859-Add-WardenAngerChangeEvent.patch b/patches/server/0858-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0859-Add-WardenAngerChangeEvent.patch rename to patches/server/0858-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0858-Add-missing-spawn-eggs.patch b/patches/server/0858-Add-missing-spawn-eggs.patch deleted file mode 100644 index e4252e173c..0000000000 --- a/patches/server/0858-Add-missing-spawn-eggs.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> -Date: Wed, 8 Jun 2022 15:58:20 -0400 -Subject: [PATCH] Add missing spawn eggs - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 4214420d6670b394758f14dbf6de628420c56e3b..0fb3a165ba564c83a9337cdd003457b5181ae4c6 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -@@ -198,6 +198,17 @@ public final class CraftItemFactory implements ItemFactory { - case ZOMBIE_SPAWN_EGG: - case ZOMBIE_VILLAGER_SPAWN_EGG: - case ZOMBIFIED_PIGLIN_SPAWN_EGG: -+ // Paper start -+ case ALLAY_SPAWN_EGG: -+ case CAMEL_SPAWN_EGG: -+ case ENDER_DRAGON_SPAWN_EGG: -+ case FROG_SPAWN_EGG: -+ case IRON_GOLEM_SPAWN_EGG: -+ case TADPOLE_SPAWN_EGG: -+ case SNOW_GOLEM_SPAWN_EGG: -+ case WARDEN_SPAWN_EGG: -+ case WITHER_SPAWN_EGG: -+ // Paper end - return meta instanceof CraftMetaSpawnEgg ? meta : new CraftMetaSpawnEgg(meta); - case ARMOR_STAND: - return meta instanceof CraftMetaArmorStand ? meta : new CraftMetaArmorStand(meta); -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 2d0e828687e9f4e860348eb10b1a40e12a654f2a..7ddca6f734fb5d75824503282c528904064b7480 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -@@ -430,6 +430,17 @@ public final class CraftItemStack extends ItemStack { - case ZOMBIE_SPAWN_EGG: - case ZOMBIE_VILLAGER_SPAWN_EGG: - case ZOMBIFIED_PIGLIN_SPAWN_EGG: -+ // Paper start -+ case ALLAY_SPAWN_EGG: -+ case CAMEL_SPAWN_EGG: -+ case ENDER_DRAGON_SPAWN_EGG: -+ case FROG_SPAWN_EGG: -+ case IRON_GOLEM_SPAWN_EGG: -+ case TADPOLE_SPAWN_EGG: -+ case SNOW_GOLEM_SPAWN_EGG: -+ case WARDEN_SPAWN_EGG: -+ case WITHER_SPAWN_EGG: -+ // Paper end - return new CraftMetaSpawnEgg(item.getTag()); - case ARMOR_STAND: - return new CraftMetaArmorStand(item.getTag()); -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java -index 155e2b50df754021acdd29a870342db8ad6d1f41..89eb3b30c13e51967e201ad1fdeb37ba9ae93496 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java -@@ -18,6 +18,17 @@ import org.bukkit.material.MaterialData; - public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { - - private static final Set SPAWN_EGG_MATERIALS = Sets.newHashSet( -+ // Paper start -+ Material.ALLAY_SPAWN_EGG, -+ Material.CAMEL_SPAWN_EGG, -+ Material.ENDER_DRAGON_SPAWN_EGG, -+ Material.FROG_SPAWN_EGG, -+ Material.IRON_GOLEM_SPAWN_EGG, -+ Material.TADPOLE_SPAWN_EGG, -+ Material.SNOW_GOLEM_SPAWN_EGG, -+ Material.WARDEN_SPAWN_EGG, -+ Material.WITHER_SPAWN_EGG, -+ // Paper end - Material.AXOLOTL_SPAWN_EGG, - Material.BAT_SPAWN_EGG, - Material.BEE_SPAWN_EGG, diff --git a/patches/server/0860-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0859-Add-option-for-strict-advancement-dimension-checks.patch similarity index 94% rename from patches/server/0860-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0859-Add-option-for-strict-advancement-dimension-checks.patch index 0516f0d7c1..337eb5d601 100644 --- a/patches/server/0860-Add-option-for-strict-advancement-dimension-checks.patch +++ b/patches/server/0859-Add-option-for-strict-advancement-dimension-checks.patch @@ -11,7 +11,7 @@ distance trigger. This adds a config option to ignore that and use the exact dimension key of the worlds involved. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2741a218ce45377479ad47ec0141fa70e2b0acca..ebefc46c41529659a0f1ce17191b852aabc1668a 100644 +index d44e5445cc9ea0346a1f6fc7f9c3f0b5a1ee8b4e..e235037de74c9d0a3ba136902a599b06d24a134d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1260,6 +1260,12 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0861-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0860-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0861-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0860-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0862-Nameable-Banner-API.patch b/patches/server/0861-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0862-Nameable-Banner-API.patch rename to patches/server/0861-Nameable-Banner-API.patch diff --git a/patches/server/0863-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0862-Don-t-broadcast-messages-to-command-blocks.patch similarity index 95% rename from patches/server/0863-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0862-Don-t-broadcast-messages-to-command-blocks.patch index c507262831..bf84ae28e1 100644 --- a/patches/server/0863-Don-t-broadcast-messages-to-command-blocks.patch +++ b/patches/server/0862-Don-t-broadcast-messages-to-command-blocks.patch @@ -20,7 +20,7 @@ index 7c7e5f3c0f9cd1f16192a8fc8163da9b2d9519d5..888936385196a178ab8b730fd5e4fff4 Date date = new Date(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c94bb0fc7e96cb0e20e1527813b9f57394f69504..f5836a017d793214b41c02b344463e6a171b230c 100644 +index d3b4fef3696c9999912fd37034ea7e1d6755c9ef..afadd1b5dd7c46c1b8f46e222ed16489dcc10e79 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1787,7 +1787,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0864-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0863-Prevent-empty-items-from-being-added-to-world.patch similarity index 94% rename from patches/server/0864-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0863-Prevent-empty-items-from-being-added-to-world.patch index 90c7a2f0a6..6f37c2ce2e 100644 --- a/patches/server/0864-Prevent-empty-items-from-being-added-to-world.patch +++ b/patches/server/0863-Prevent-empty-items-from-being-added-to-world.patch @@ -7,10 +7,10 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca Just simply prevent them from being added to the world instead. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 557a5aa50d9d23f9c8bda3d39865a96bd6b395ee..89e27bf61e1fc24d162dab3c33f942036b1f647e 100644 +index 8cb87b4b11beef91ad32c08c579c4b27aa943e08..e902673328fa9ec371c99a03214fbe4db91b5e7d 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1507,6 +1507,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1506,6 +1506,7 @@ public class ServerLevel extends Level implements WorldGenLevel { // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit return false; } else { diff --git a/patches/server/0865-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0864-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0865-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0864-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0866-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0865-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 94% rename from patches/server/0866-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/server/0865-Don-t-print-component-in-resource-pack-rejection-mes.patch index 96a8f2e596..c06d317988 100644 --- a/patches/server/0866-Don-t-print-component-in-resource-pack-rejection-mes.patch +++ b/patches/server/0865-Don-t-print-component-in-resource-pack-rejection-mes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1e4899e9f99c57a62330c82545157f38f9c3d26a..c6db193e5603b047f07fc7edd64890e2a9a29355 100644 +index f20d862617d1c576dd8e802b979f5bd9c725a945..f93182fc575c9579991e31ec3cadde193294b9e3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2045,7 +2045,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0867-Add-Player-getFishHook.patch b/patches/server/0866-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0867-Add-Player-getFishHook.patch rename to patches/server/0866-Add-Player-getFishHook.patch diff --git a/patches/server/0868-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0867-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0868-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0867-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0869-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0868-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0869-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0868-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0870-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0869-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 94% rename from patches/server/0870-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0869-Add-some-minimal-debug-information-to-chat-packet-er.patch index e11e603ffb..91a89db7f4 100644 --- a/patches/server/0870-Add-some-minimal-debug-information-to-chat-packet-er.patch +++ b/patches/server/0869-Add-some-minimal-debug-information-to-chat-packet-er.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors TODO: potentially add some kick leeway diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c6db193e5603b047f07fc7edd64890e2a9a29355..b537b49afba734ba498f5cf584c0924d3c10514d 100644 +index f93182fc575c9579991e31ec3cadde193294b9e3..0cfdef1c8400807349f3b2fba90111df31ed4f25 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2295,7 +2295,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0871-Fix-Bee-flower-NPE.patch b/patches/server/0870-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0871-Fix-Bee-flower-NPE.patch rename to patches/server/0870-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 92% rename from patches/server/0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch index a691c15a06..a5374d1663 100644 --- a/patches/server/0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch +++ b/patches/server/0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b537b49afba734ba498f5cf584c0924d3c10514d..ecba65304d97647ab0ec0bfca2fc80b8399e6581 100644 +index 0cfdef1c8400807349f3b2fba90111df31ed4f25..9987bdf85726c8a91b6329f93d3a6197eaf00ec5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2540,7 +2540,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0873-More-Teleport-API.patch b/patches/server/0872-More-Teleport-API.patch similarity index 99% rename from patches/server/0873-More-Teleport-API.patch rename to patches/server/0872-More-Teleport-API.patch index f3acfe16bc..eed297a5d2 100644 --- a/patches/server/0873-More-Teleport-API.patch +++ b/patches/server/0872-More-Teleport-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] More Teleport API public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ecba65304d97647ab0ec0bfca2fc80b8399e6581..cb59fee583519fd650e42ffefa660d72e604bb53 100644 +index 9987bdf85726c8a91b6329f93d3a6197eaf00ec5..69bd16a0ba1dd6a7b5da49740bc3f5d4ad4fd34b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1722,11 +1722,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0874-Add-EntityPortalReadyEvent.patch b/patches/server/0873-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0874-Add-EntityPortalReadyEvent.patch rename to patches/server/0873-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0875-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0874-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0875-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0874-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0876-Send-block-entities-after-destroy-prediction.patch b/patches/server/0875-Send-block-entities-after-destroy-prediction.patch similarity index 98% rename from patches/server/0876-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0875-Send-block-entities-after-destroy-prediction.patch index c1b61444af..120101dddb 100644 --- a/patches/server/0876-Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/0875-Send-block-entities-after-destroy-prediction.patch @@ -57,7 +57,7 @@ index 796d17f51496974cfdfed2593753b8c09b5c81c1..13031576c20bda3bb12c926f6cd938fa } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cb59fee583519fd650e42ffefa660d72e604bb53..1af9cbfd657e3d998b871e1ada77a804462bc3ad 100644 +index 69bd16a0ba1dd6a7b5da49740bc3f5d4ad4fd34b..ce9ed6aa7133239e3bbda1cb37c756164fee0159 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1867,8 +1867,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0877-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0876-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 96% rename from patches/server/0877-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0876-Warn-on-plugins-accessing-faraway-chunks.patch index 93a8482e35..db0b8076a5 100644 --- a/patches/server/0877-Warn-on-plugins-accessing-faraway-chunks.patch +++ b/patches/server/0876-Warn-on-plugins-accessing-faraway-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 502d7c7322e1b48ae59c8e0fd271a6bf2dcd2ec8..628922887e49df43f7e92b8f6cfeb3dd5d00e5d7 100644 +index bb411f4efc550ed7872f0252373be81bd8e99b76..3cbf801b2e5420c0e870f73788deb550e49ad54d 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -416,7 +416,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -18,7 +18,7 @@ index 502d7c7322e1b48ae59c8e0fd271a6bf2dcd2ec8..628922887e49df43f7e92b8f6cfeb3dd private static boolean isOutsideSpawnableHeight(int y) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 2976b3469a7870611862c28ef555be974309ee34..f10b941012a59c056c120c8ee112ee4b9ed0e9b8 100644 +index 37a204d35979fb51cab9c228515e35c4b1049ab1..c5eb25b191cbb496be2a761d0b6eec9776319687 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -312,9 +312,24 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0878-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0877-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0878-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0877-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0879-Add-missing-BlockFadeEvents.patch b/patches/server/0878-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0879-Add-missing-BlockFadeEvents.patch rename to patches/server/0878-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0880-Collision-API.patch b/patches/server/0879-Collision-API.patch similarity index 96% rename from patches/server/0880-Collision-API.patch rename to patches/server/0879-Collision-API.patch index 2ee61e720a..876d883cdc 100644 --- a/patches/server/0880-Collision-API.patch +++ b/patches/server/0879-Collision-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Collision API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 3209d13a12a033e157621920a0cefdad5727463f..c6f896c230f343af2d825f0dff458a0e4578dbe8 100644 +index 446657577aa843e6ebc5143b6c511f33d27b6360..d99f079e03d0541d7aa3c70d9e8c12b8619b2c22 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -973,5 +973,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0881-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0880-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0881-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0880-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0882-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0881-Remove-invalid-signature-login-stacktrace.patch similarity index 92% rename from patches/server/0882-Remove-invalid-signature-login-stacktrace.patch rename to patches/server/0881-Remove-invalid-signature-login-stacktrace.patch index b599caec29..0515815aa9 100644 --- a/patches/server/0882-Remove-invalid-signature-login-stacktrace.patch +++ b/patches/server/0881-Remove-invalid-signature-login-stacktrace.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove invalid signature login stacktrace diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1af9cbfd657e3d998b871e1ada77a804462bc3ad..d3d881a9eedd81b0d6814b49e81fe5cc28aa2c9f 100644 +index ce9ed6aa7133239e3bbda1cb37c756164fee0159..b24676aaf4ea18cd3cd4e7eec8de544f20df37d6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3593,7 +3593,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch similarity index 91% rename from patches/server/0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch rename to patches/server/0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch index dadca8fdde..41f32eb3b6 100644 --- a/patches/server/0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch +++ b/patches/server/0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add async catcher to PlayerConnection internalTeleport diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d3d881a9eedd81b0d6814b49e81fe5cc28aa2c9f..317a53cbaea38e1191f455b3d2c9c7971f505e9e 100644 +index b24676aaf4ea18cd3cd4e7eec8de544f20df37d6..5701955b0e7bdff1661844562cba3ea8f319400f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1750,6 +1750,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0884-Block-Ticking-API.patch b/patches/server/0883-Block-Ticking-API.patch similarity index 95% rename from patches/server/0884-Block-Ticking-API.patch rename to patches/server/0883-Block-Ticking-API.patch index eadd922c45..f1300b0a84 100644 --- a/patches/server/0884-Block-Ticking-API.patch +++ b/patches/server/0883-Block-Ticking-API.patch @@ -31,7 +31,7 @@ index 47ee348a7042a8e0705bc7d2c4077c0f270a8239..2b78bdd5773872405690084fea5a92bc // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index 14fd37f4bdb9b0b7f28abfccffe682f6fdc6339e..5f0acece20208047e9d17b6e72d77a5f80cb125f 100644 +index 3399e8cdf2230bd71444abb43829c54d7277ce36..6f7ee97e381e80d6e8cf6b9c3f40b5e25f6bf64b 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -617,4 +617,10 @@ public class CraftBlockData implements BlockData { diff --git a/patches/server/0885-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0884-Add-Velocity-IP-Forwarding-Support.patch similarity index 99% rename from patches/server/0885-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0884-Add-Velocity-IP-Forwarding-Support.patch index 4056f6a2bd..018cb939bc 100644 --- a/patches/server/0885-Add-Velocity-IP-Forwarding-Support.patch +++ b/patches/server/0884-Add-Velocity-IP-Forwarding-Support.patch @@ -197,7 +197,7 @@ index d2cba3fb9eb0d344b71c79387d1d160596b1dc62..9c6473beae78cd6e173e28335e6b06f8 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f5836a017d793214b41c02b344463e6a171b230c..16abfbf72b6033c190e1523ba6be8cfc467f7855 100644 +index afadd1b5dd7c46c1b8f46e222ed16489dcc10e79..47df6f4268a63118da8187f4102c876bd37d1680 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -797,7 +797,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0886-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0885-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0886-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0885-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0887-Add-NamespacedKey-biome-methods.patch b/patches/server/0886-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0887-Add-NamespacedKey-biome-methods.patch rename to patches/server/0886-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0888-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0887-Fix-plugin-loggers-on-server-shutdown.patch similarity index 96% rename from patches/server/0888-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0887-Fix-plugin-loggers-on-server-shutdown.patch index c0b46a577a..ce7032033d 100644 --- a/patches/server/0888-Fix-plugin-loggers-on-server-shutdown.patch +++ b/patches/server/0887-Fix-plugin-loggers-on-server-shutdown.patch @@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7275c708a6a2ad138ded2eb6b3c4a57a9406883a..f6d52a1a6305d04fe650a0747b6e972921955a38 100644 +index 0e04083ff0598451c66731b1518b2eb6367ae36c..710ca7d3a5659953f64bc6dccdd93b43300961cc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -998,6 +998,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Co-authored-by: Nassim Jahnke diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 11cf01752d763621a1102120421261e6fce847f8..f5aa2560de5f386726677caac6414237d9c6512d 100644 +index d1717ea6e3aa8912caeb3a5590b08b0113b83ec0..d6e7934d18f756388b01373e2a3466c37aaa0428 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1363,6 +1363,46 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0890-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0889-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0890-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0889-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0891-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0890-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 100% rename from patches/server/0891-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/server/0890-Add-custom-destroyerIdentity-to-sendBlockDamage.patch diff --git a/patches/server/0892-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0891-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch similarity index 100% rename from patches/server/0892-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch rename to patches/server/0891-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch diff --git a/patches/server/0893-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0892-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0893-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0892-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0894-Missing-eating-regain-reason.patch b/patches/server/0893-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0894-Missing-eating-regain-reason.patch rename to patches/server/0893-Missing-eating-regain-reason.patch diff --git a/patches/server/0895-Missing-effect-cause.patch b/patches/server/0894-Missing-effect-cause.patch similarity index 100% rename from patches/server/0895-Missing-effect-cause.patch rename to patches/server/0894-Missing-effect-cause.patch diff --git a/patches/server/0896-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0895-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0896-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0895-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0897-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0896-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0897-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0896-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0898-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0897-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0898-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0897-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0899-Configurable-chat-thread-limit.patch b/patches/server/0898-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0899-Configurable-chat-thread-limit.patch rename to patches/server/0898-Configurable-chat-thread-limit.patch diff --git a/patches/server/0900-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0899-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0900-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0899-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0901-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0900-Set-position-before-player-sending-on-dimension-chan.patch similarity index 92% rename from patches/server/0901-Set-position-before-player-sending-on-dimension-chan.patch rename to patches/server/0900-Set-position-before-player-sending-on-dimension-chan.patch index f185a28fe7..7525923f3e 100644 --- a/patches/server/0901-Set-position-before-player-sending-on-dimension-chan.patch +++ b/patches/server/0900-Set-position-before-player-sending-on-dimension-chan.patch @@ -7,7 +7,7 @@ This causes a moment where the player entity is sent with the previous location, teleport packet which is sent shortly after is meant to correct that. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ebefc46c41529659a0f1ce17191b852aabc1668a..d93c4e9218936afff97aa63ad4b8616b638eec85 100644 +index e235037de74c9d0a3ba136902a599b06d24a134d..95841722fd6a87f0bdea650f44535a717bb7f867 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1163,6 +1163,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0902-fix-Jigsaw-block-kicking-user.patch b/patches/server/0901-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0902-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0901-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0903-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0902-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0903-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0902-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0904-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0903-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch similarity index 96% rename from patches/server/0904-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch rename to patches/server/0903-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch index 40d3b3231b..d11dd661b3 100644 --- a/patches/server/0904-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch +++ b/patches/server/0903-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch @@ -43,7 +43,7 @@ index 966ac60daebb7bb211ab8096fc0c5f33db67320a..a8ab1d3ee81664193be39d2735d64951 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index 5f0acece20208047e9d17b6e72d77a5f80cb125f..e14a06bcd35422a692254b69d195d8452f43c7fb 100644 +index 6f7ee97e381e80d6e8cf6b9c3f40b5e25f6bf64b..1fefe185800dd48dd328697127405e0844543e5e 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -623,4 +623,12 @@ public class CraftBlockData implements BlockData { diff --git a/patches/server/0905-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0904-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0905-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0904-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0906-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0905-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 87% rename from patches/server/0906-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0905-Remove-unnecessary-onTrackingStart-during-navigation.patch index 380e7ef89b..6b0ab827df 100644 --- a/patches/server/0906-Remove-unnecessary-onTrackingStart-during-navigation.patch +++ b/patches/server/0905-Remove-unnecessary-onTrackingStart-during-navigation.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 89e27bf61e1fc24d162dab3c33f942036b1f647e..00cb96f71cc5bd713abfd8b40b7b4418e06d8ad6 100644 +index e902673328fa9ec371c99a03214fbe4db91b5e7d..e55ef41da88062b54533953bd74c3cdfce7ea933 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2536,7 +2536,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2535,7 +2535,7 @@ public class ServerLevel extends Level implements WorldGenLevel { if (entity instanceof Mob) { Mob entityinsentient = (Mob) entity; @@ -17,7 +17,7 @@ index 89e27bf61e1fc24d162dab3c33f942036b1f647e..00cb96f71cc5bd713abfd8b40b7b4418 String s = "onTrackingStart called during navigation iteration"; Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration")); -@@ -2621,7 +2621,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2620,7 +2620,7 @@ public class ServerLevel extends Level implements WorldGenLevel { if (entity instanceof Mob) { Mob entityinsentient = (Mob) entity; diff --git a/patches/server/0907-Fix-custom-piglin-loved-items.patch b/patches/server/0906-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0907-Fix-custom-piglin-loved-items.patch rename to patches/server/0906-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0908-EntityPickupItemEvent-fixes.patch b/patches/server/0907-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0908-EntityPickupItemEvent-fixes.patch rename to patches/server/0907-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0909-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0908-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0909-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0908-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0910-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0909-Add-PlayerInventorySlotChangeEvent.patch similarity index 97% rename from patches/server/0910-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0909-Add-PlayerInventorySlotChangeEvent.patch index 2cd2769f7f..cebafba0b8 100644 --- a/patches/server/0910-Add-PlayerInventorySlotChangeEvent.patch +++ b/patches/server/0909-Add-PlayerInventorySlotChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d93c4e9218936afff97aa63ad4b8616b638eec85..2be3a70bfde48b17f7a3680a8df966f9aa92d05b 100644 +index 95841722fd6a87f0bdea650f44535a717bb7f867..cf80bafd928caf73ec766342f7b3cd89eb926fd2 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -323,6 +323,25 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0911-Elder-Guardian-appearance-API.patch b/patches/server/0910-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0911-Elder-Guardian-appearance-API.patch rename to patches/server/0910-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0912-Allow-changing-bed-s-occupied-property.patch b/patches/server/0911-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0912-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0911-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0913-Add-entity-knockback-API.patch b/patches/server/0912-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0913-Add-entity-knockback-API.patch rename to patches/server/0912-Add-entity-knockback-API.patch diff --git a/patches/server/0914-Detect-headless-JREs.patch b/patches/server/0913-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0914-Detect-headless-JREs.patch rename to patches/server/0913-Detect-headless-JREs.patch diff --git a/patches/server/0915-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0914-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0915-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0914-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0916-optimized-dirt-and-snow-spreading.patch b/patches/server/0915-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0916-optimized-dirt-and-snow-spreading.patch rename to patches/server/0915-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0917-Added-EntityToggleSitEvent.patch b/patches/server/0916-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0917-Added-EntityToggleSitEvent.patch rename to patches/server/0916-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0918-Add-fire-tick-delay-option.patch b/patches/server/0917-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0918-Add-fire-tick-delay-option.patch rename to patches/server/0917-Add-fire-tick-delay-option.patch diff --git a/patches/server/0919-Add-Moving-Piston-API.patch b/patches/server/0918-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0919-Add-Moving-Piston-API.patch rename to patches/server/0918-Add-Moving-Piston-API.patch diff --git a/patches/server/0920-Ignore-impossible-spawn-tick.patch b/patches/server/0919-Ignore-impossible-spawn-tick.patch similarity index 90% rename from patches/server/0920-Ignore-impossible-spawn-tick.patch rename to patches/server/0919-Ignore-impossible-spawn-tick.patch index 87dd1ae6ec..f5be829db3 100644 --- a/patches/server/0920-Ignore-impossible-spawn-tick.patch +++ b/patches/server/0919-Ignore-impossible-spawn-tick.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ignore impossible spawn tick diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index b53fc8ca05fb44e6cb7ab6b27b8371b56795fe98..eae23b8cc808bbb4ca8fa804a4af6d6c15da9f1c 100644 +index 0e7c2e7640ff2a2cdc3088dcb56314026bfaf95f..af799b61cec48ca290ed66cb47cfc0b244ac41a7 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -80,6 +80,7 @@ public abstract class BaseSpawner { diff --git a/patches/server/0921-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0920-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0921-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0920-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0922-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0921-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0922-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0921-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0923-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0922-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0923-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0922-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0924-Prevent-compass-from-loading-chunks.patch b/patches/server/0923-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0924-Prevent-compass-from-loading-chunks.patch rename to patches/server/0923-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0925-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0924-Add-PrePlayerAttackEntityEvent.patch similarity index 93% rename from patches/server/0925-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0924-Add-PrePlayerAttackEntityEvent.patch index 5b2f2a6f1a..df2f4dad15 100644 --- a/patches/server/0925-Add-PrePlayerAttackEntityEvent.patch +++ b/patches/server/0924-Add-PrePlayerAttackEntityEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 2a770125bf31906a3def5e563fbfcc283c39127d..8742dc6efdbc9f80fabab78061c448da7953554e 100644 +index d7ef9c267a0cf496ac08ce568cb7649e09d5fcd6..2e6557a19523d18aecff709de30cb4466b46a9fa 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1233,8 +1233,17 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0926-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0925-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0926-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0925-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0927-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0926-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0927-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0926-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0928-Reorder-bukkit-damage-source-entity-for-explosion-to.patch b/patches/server/0927-Reorder-bukkit-damage-source-entity-for-explosion-to.patch similarity index 100% rename from patches/server/0928-Reorder-bukkit-damage-source-entity-for-explosion-to.patch rename to patches/server/0927-Reorder-bukkit-damage-source-entity-for-explosion-to.patch diff --git a/patches/server/0929-Fix-MC-121048.patch b/patches/server/0928-Fix-MC-121048.patch similarity index 100% rename from patches/server/0929-Fix-MC-121048.patch rename to patches/server/0928-Fix-MC-121048.patch diff --git a/patches/server/0930-Add-Player-Warden-Warning-API.patch b/patches/server/0929-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0930-Add-Player-Warden-Warning-API.patch rename to patches/server/0929-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0931-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0930-More-vanilla-friendly-methods-to-update-trades.patch similarity index 95% rename from patches/server/0931-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0930-More-vanilla-friendly-methods-to-update-trades.patch index db1f5e6c35..15d2e1d715 100644 --- a/patches/server/0931-More-vanilla-friendly-methods-to-update-trades.patch +++ b/patches/server/0930-More-vanilla-friendly-methods-to-update-trades.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More vanilla friendly methods to update trades diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index ec46a095a26af507fdee0485f7c519c14decc95f..a62f69210ac63c44ade4f3ce9379071b93122afb 100644 +index 105f8fcbbc5c7c384b77ca8eb768f1147d6ce4b2..18eac340386a396c9850f53f30d20a41c1437788 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -923,6 +923,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -35,7 +35,7 @@ index ec46a095a26af507fdee0485f7c519c14decc95f..a62f69210ac63c44ade4f3ce9379071b public void gossip(ServerLevel world, Villager villager, long time) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -index 11e44a81934255fd4efa418009d8bb78c785cfd5..e0c083f54434120609cd95824cab509fa6c93427 100644 +index 1fa8026ca63b7e38870daac59936a10b1950561e..a1a8ac55e572156671e47317ba061855be79e5ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -99,6 +99,34 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { diff --git a/patches/server/0932-Add-paper-dumplisteners-command.patch b/patches/server/0931-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0932-Add-paper-dumplisteners-command.patch rename to patches/server/0931-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0933-check-global-player-list-where-appropriate.patch b/patches/server/0932-check-global-player-list-where-appropriate.patch similarity index 97% rename from patches/server/0933-check-global-player-list-where-appropriate.patch rename to patches/server/0932-check-global-player-list-where-appropriate.patch index 64e5d9f231..61c8afb1a1 100644 --- a/patches/server/0933-check-global-player-list-where-appropriate.patch +++ b/patches/server/0932-check-global-player-list-where-appropriate.patch @@ -5,10 +5,10 @@ Subject: [PATCH] check global player list where appropriate diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 00cb96f71cc5bd713abfd8b40b7b4418e06d8ad6..6f76c17488c5855e86c145dbcfbdba80dacc232c 100644 +index e55ef41da88062b54533953bd74c3cdfce7ea933..f3a19d00f78e19aa98c57461efb90d79f656a992 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2658,4 +2658,12 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2657,4 +2657,12 @@ public class ServerLevel extends Level implements WorldGenLevel { entity.updateDynamicGameEventListener(DynamicGameEventListener::move); } } diff --git a/patches/server/0934-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0933-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 95% rename from patches/server/0934-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0933-Fix-async-entity-add-due-to-fungus-trees.patch index 39f69be081..47409a0177 100644 --- a/patches/server/0934-Fix-async-entity-add-due-to-fungus-trees.patch +++ b/patches/server/0933-Fix-async-entity-add-due-to-fungus-trees.patch @@ -17,7 +17,7 @@ index 52fd12c474c01f3b53d0f6596b7a6fafee52bd0d..877498729c66de9aa6a27c9148f7494d BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index c6f896c230f343af2d825f0dff458a0e4578dbe8..99a9b348f6a2db4a1c41abc19b9b37dc4280c5a3 100644 +index d99f079e03d0541d7aa3c70d9e8c12b8619b2c22..09be3f188f9710fa71c5db67023e654739721f21 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -375,10 +375,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0935-ItemStack-damage-API.patch b/patches/server/0934-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0935-ItemStack-damage-API.patch rename to patches/server/0934-ItemStack-damage-API.patch diff --git a/patches/server/0936-Friction-API.patch b/patches/server/0935-Friction-API.patch similarity index 100% rename from patches/server/0936-Friction-API.patch rename to patches/server/0935-Friction-API.patch diff --git a/patches/server/0937-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0936-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0937-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0936-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0938-Fix-player-kick-on-shutdown.patch b/patches/server/0937-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0938-Fix-player-kick-on-shutdown.patch rename to patches/server/0937-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0939-Sync-offhand-slot-in-menus.patch b/patches/server/0938-Sync-offhand-slot-in-menus.patch similarity index 97% rename from patches/server/0939-Sync-offhand-slot-in-menus.patch rename to patches/server/0938-Sync-offhand-slot-in-menus.patch index 6deed87496..271a6e11fc 100644 --- a/patches/server/0939-Sync-offhand-slot-in-menus.patch +++ b/patches/server/0938-Sync-offhand-slot-in-menus.patch @@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th by pressing the offhand swap item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2be3a70bfde48b17f7a3680a8df966f9aa92d05b..cb4a4f097c4c471e9e649827fd3c1e98a1cb911b 100644 +index cf80bafd928caf73ec766342f7b3cd89eb926fd2..c0b0a7fdb75266a7064d54bda6441953184ecc64 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -292,6 +292,13 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0940-Player-Entity-Tracking-Events.patch b/patches/server/0939-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0940-Player-Entity-Tracking-Events.patch rename to patches/server/0939-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0941-Limit-pet-look-distance.patch b/patches/server/0940-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0941-Limit-pet-look-distance.patch rename to patches/server/0940-Limit-pet-look-distance.patch diff --git a/patches/server/0942-Properly-resend-entities.patch b/patches/server/0941-Properly-resend-entities.patch similarity index 97% rename from patches/server/0942-Properly-resend-entities.patch rename to patches/server/0941-Properly-resend-entities.patch index 30a74e23ca..f8d070bcdf 100644 --- a/patches/server/0942-Properly-resend-entities.patch +++ b/patches/server/0941-Properly-resend-entities.patch @@ -66,7 +66,7 @@ index 755989780c955592e27cae2b4b5f0e90e13543b7..37e193f57938047c8b886ed7d2816411 public static class DataItem { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 317a53cbaea38e1191f455b3d2c9c7971f505e9e..61053a0f90e604457998db61593b666ce07d02ef 100644 +index 5701955b0e7bdff1661844562cba3ea8f319400f..5c56d848cbfac8b8a4a2d2fabc7f1f9e7d7eb1da 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2774,7 +2774,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -79,7 +79,7 @@ index 317a53cbaea38e1191f455b3d2c9c7971f505e9e..61053a0f90e604457998db61593b666c } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index cb0d6f2eba67b0f45ce0ce0f6c6b76167a87de10..2985cb1284230c3abf982e9180616e64c679d051 100644 +index 809ddbfcf873b4695257f599b882803f7fcc34fa..b348d33726b2b14ea2d12ce3430df2c0b94295f4 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -413,7 +413,7 @@ public abstract class PlayerList { diff --git a/work/Bukkit b/work/Bukkit index bf3239f7a3..dea9ce0a79 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit bf3239f7a3d8ff0359bcacd13012081146ff3c3b +Subproject commit dea9ce0a799f48e90e17e0f8c3db89bfb7cda3cd diff --git a/work/CraftBukkit b/work/CraftBukkit index 19e6be0209..eecb4c0dc0 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 19e6be0209d7547c7cdcceae54d4b299f9cd751c +Subproject commit eecb4c0dc069b91ea5be52ca8fa831ecde666c19 diff --git a/work/Spigot b/work/Spigot index 61bffe0cce..d90018e043 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 61bffe0cce4e22325a65715f407823d860a32c5c +Subproject commit d90018e043c1bdf8dd894701e61927c4f1a8b064