diff --git a/patches/removed/1.17/0517-Remove-some-streams-from-structures.patch b/patches/removed/1.17/0517-Remove-some-streams-from-structures.patch deleted file mode 100644 index 6587728a2..000000000 --- a/patches/removed/1.17/0517-Remove-some-streams-from-structures.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: JRoy -Date: Mon, 29 Jun 2020 17:03:06 -0400 -Subject: [PATCH] Remove some streams from structures - -This showed up a lot in the spark profiler, should have a low-medium performance improvement. - -Update 1.17: looks like some things in here have been moved to some weird beardifier - has to be investigated further -diff --git a/src/main/java/net/minecraft/world/level/StructureFeatureManager.java b/src/main/java/net/minecraft/world/level/StructureFeatureManager.java -index e842dbc586234799a05b6df213b686e17b8ed1ac..2f88e015708cadb43a348ba2b144c3dd92bb95a5 100644 ---- a/src/main/java/net/minecraft/world/level/StructureFeatureManager.java -+++ b/src/main/java/net/minecraft/world/level/StructureFeatureManager.java -@@ -2,21 +2,22 @@ - package net.minecraft.world.level; - - import com.mojang.datafixers.DataFixUtils; -+import it.unimi.dsi.fastutil.objects.ObjectArrayList; // Paper - import java.util.stream.Stream; - import javax.annotation.Nullable; - import net.minecraft.core.BlockPos; - import net.minecraft.core.SectionPos; --import net.minecraft.core.Vec3i; - import net.minecraft.server.level.WorldGenRegion; - import net.minecraft.world.level.chunk.ChunkStatus; - import net.minecraft.world.level.chunk.FeatureAccess; - import net.minecraft.world.level.levelgen.WorldGenSettings; - import net.minecraft.world.level.levelgen.feature.StructureFeature; -+import net.minecraft.world.level.levelgen.structure.StructurePiece; - import net.minecraft.world.level.levelgen.structure.StructureStart; - - public class StructureFeatureManager { - -- private final LevelAccessor level; -+ private final LevelAccessor level; public LevelAccessor getLevel() { return level; } // Paper - OBFHELPER - private final WorldGenSettings worldGenSettings; - - public StructureFeatureManager(LevelAccessor world, WorldGenSettings options) { -@@ -42,6 +43,20 @@ public class StructureFeatureManager { - }); - } - -+ // Paper start - remove structure streams -+ public java.util.List> getFeatureStarts(SectionPos sectionPosition, StructureFeature structureGenerator) { -+ java.util.List> list = new ObjectArrayList<>(); -+ for (Long curLong: getLevel().getChunk(sectionPosition.x(), sectionPosition.z(), ChunkStatus.STRUCTURE_REFERENCES).getReferencesForFeature(structureGenerator)) { -+ SectionPos sectionPosition1 = SectionPos.of(new ChunkPos(curLong), 0); -+ StructureStart structurestart = getStartForFeature(sectionPosition1, structureGenerator, getLevel().getChunk(sectionPosition1.x(), sectionPosition1.z(), ChunkStatus.STRUCTURE_STARTS)); -+ if (structurestart != null && structurestart.e()) { -+ list.add(structurestart); -+ } -+ } -+ return list; -+ } -+ // Paper end -+ - @Nullable - public StructureStart getStartForFeature(SectionPos pos, StructureFeature feature, FeatureAccess holder) { - return holder.getStartForFeature(feature); -@@ -60,13 +75,21 @@ public class StructureFeatureManager { - } - - public StructureStart getStructureAt(BlockPos pos, boolean matchChildren, StructureFeature feature) { -- return (StructureStart) DataFixUtils.orElse(this.startsForFeature(SectionPos.of(pos), feature).filter((structurestart) -> { -- return structurestart.c().b((Vec3i) pos); -- }).filter((structurestart) -> { -- return !matchChildren || structurestart.d().stream().anyMatch((structurepiece) -> { -- return structurepiece.g().b((BaseBlockPosition) blockposition); -- }); -- }).findFirst(), StructureStart.a); -+ // Paper start - remove structure streams -+ for (StructureStart structurestart : getFeatureStarts(SectionPos.of(pos), feature)) { -+ if (structurestart.c().b(pos)) { -+ if (!matchChildren) { -+ return structurestart; -+ } -+ for (StructurePiece structurepiece : structurestart.d()) { -+ if (structurepiece.g().b(pos)) { -+ return structurestart; -+ } -+ } -+ } -+ } -+ return StructureStart.a; -+ // Paper end - } - - // Spigot start -diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java -index ed83335175bb882741dfaef251ab30ce1590f74c..2422dbb8691b8c45401a68602a33d4d7f1718dfb 100644 ---- a/src/main/java/net/minecraft/world/level/biome/Biome.java -+++ b/src/main/java/net/minecraft/world/level/biome/Biome.java -@@ -39,6 +39,7 @@ import net.minecraft.world.level.levelgen.WorldgenRandom; - import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; - import net.minecraft.world.level.levelgen.feature.StructureFeature; - import net.minecraft.world.level.levelgen.structure.BoundingBox; -+import net.minecraft.world.level.levelgen.structure.StructureStart; - import net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder; - import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise; - import net.minecraft.world.level.material.FluidState; -@@ -238,9 +239,11 @@ public final class Biome { - int l1 = j1 << 4; - - try { -- structureAccessor.startsForFeature(SectionPos.of(pos), structuregenerator).forEach((structurestart) -> { -- structurestart.a(region, structureAccessor, chunkGenerator, random, new BoundingBox(k1, l1, k1 + 15, l1 + 15), new ChunkPos(i1, j1)); -- }); -+ // Paper start - remove structure streams -+ for (StructureStart structureStart : structureAccessor.getFeatureStarts(SectionPos.of(pos), structuregenerator)) { -+ structureStart.a(region, structureAccessor, chunkGenerator, random, new BoundingBox(k1, l1, k1 + 15, l1 + 15), new ChunkPos(i1, j1)); -+ } -+ // Paper end - } catch (Exception exception) { - CrashReport crashreport = CrashReport.forThrowable(exception, "Feature placement"); - -diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java -index 04adec255e4650ead8d80bee32a681c98686fb95..20f3899b7e39033ebc0f833e75fbdba29777a168 100644 ---- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java -+++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java -@@ -41,6 +41,7 @@ import net.minecraft.world.level.levelgen.feature.structures.StructureTemplatePo - import net.minecraft.world.level.levelgen.structure.BoundingBox; - import net.minecraft.world.level.levelgen.structure.PoolElementStructurePiece; - import net.minecraft.world.level.levelgen.structure.StructurePiece; -+import net.minecraft.world.level.levelgen.structure.StructureStart; - import net.minecraft.world.level.levelgen.synth.ImprovedNoise; - import net.minecraft.world.level.levelgen.synth.PerlinNoise; - import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise; -@@ -455,7 +456,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator { - while (iterator.hasNext()) { - StructureFeature structuregenerator = (StructureFeature) iterator.next(); - -- accessor.startsForFeature(SectionPos.of(chunkcoordintpair, 0), structuregenerator).forEach((structurestart) -> { -+ for (StructureStart structurestart : accessor.getFeatureStarts(SectionPos.of(chunkcoordintpair, 0), structuregenerator)) { // Paper - remove structure streams - Iterator iterator1 = structurestart.d().iterator(); - - while (iterator1.hasNext()) { -@@ -487,7 +488,7 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator { - } - } - -- }); -+ } // Paper - remove structure streams - } - - double[][][] adouble = new double[2][this.chunkCountZ + 1][this.chunkCountY + 1]; diff --git a/patches/server/0470-Remove-some-streams-from-structures.patch b/patches/server/0470-Remove-some-streams-from-structures.patch new file mode 100644 index 000000000..072f341f2 --- /dev/null +++ b/patches/server/0470-Remove-some-streams-from-structures.patch @@ -0,0 +1,106 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: JRoy +Date: Mon, 29 Jun 2020 17:03:06 -0400 +Subject: [PATCH] Remove some streams from structures + +This showed up a lot in the spark profiler, should have a low-medium performance improvement. + +diff --git a/src/main/java/net/minecraft/world/level/StructureFeatureManager.java b/src/main/java/net/minecraft/world/level/StructureFeatureManager.java +index 21f67cf20dede30a056a7807a0e7338e858da142..9a8e44fb3b1cffec3f70c9812c80175bd07f10e2 100644 +--- a/src/main/java/net/minecraft/world/level/StructureFeatureManager.java ++++ b/src/main/java/net/minecraft/world/level/StructureFeatureManager.java +@@ -45,6 +45,20 @@ public class StructureFeatureManager { + }); + } + ++ // Paper start - remove structure streams - based on method above ++ public java.util.List> streamlessStartsForFeature(SectionPos sectionPosition, StructureFeature structureGenerator) { ++ java.util.List> list = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(); ++ for (Long curLong : this.level.getChunk(sectionPosition.x(), sectionPosition.z(), ChunkStatus.STRUCTURE_REFERENCES).getReferencesForFeature(structureGenerator)) { ++ SectionPos sectionPosition1 = SectionPos.of(new ChunkPos(curLong), 0); ++ StructureStart structurestart = getStartForFeature(sectionPosition1, structureGenerator, this.level.getChunk(sectionPosition1.x(), sectionPosition1.z(), ChunkStatus.STRUCTURE_STARTS)); ++ if (structurestart != null && structurestart.isValid()) { ++ list.add(structurestart); ++ } ++ } ++ return list; ++ } ++ // Paper end ++ + @Nullable + public StructureStart getStartForFeature(SectionPos pos, StructureFeature feature, FeatureAccess holder) { + return holder.getStartForFeature(feature); +@@ -63,11 +77,20 @@ public class StructureFeatureManager { + } + + public StructureStart getStructureAt(BlockPos pos, boolean matchChildren, StructureFeature feature) { +- return (StructureStart) DataFixUtils.orElse(this.startsForFeature(SectionPos.of(pos), feature).filter((structurestart) -> { +- return matchChildren ? structurestart.getPieces().stream().anyMatch((structurepiece) -> { +- return structurepiece.getBoundingBox().isInside((Vec3i) pos); +- }) : structurestart.getBoundingBox().isInside((Vec3i) pos); +- }).findFirst(), StructureStart.INVALID_START); ++ // Paper start - remove structure streams ++ for (StructureStart structureStart : streamlessStartsForFeature(SectionPos.of(pos), feature)) { ++ if (matchChildren) { ++ for (net.minecraft.world.level.levelgen.structure.StructurePiece piece : structureStart.getPieces()) { ++ if (piece.getBoundingBox().isInside(pos)) { ++ return structureStart; ++ } ++ } ++ } else if (structureStart.getBoundingBox().isInside(pos)) { ++ return structureStart; ++ } ++ } ++ return StructureStart.INVALID_START; ++ // Paper end + } + + // Spigot start +diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java +index 3f3b4e4ea8231fdcc799bd9de3e20747a5634603..a7a7e6cd87270e64a92448f03f8b0b0c7e375ec7 100644 +--- a/src/main/java/net/minecraft/world/level/biome/Biome.java ++++ b/src/main/java/net/minecraft/world/level/biome/Biome.java +@@ -44,6 +44,7 @@ import net.minecraft.world.level.levelgen.WorldgenRandom; + import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; + import net.minecraft.world.level.levelgen.feature.StructureFeature; + import net.minecraft.world.level.levelgen.structure.BoundingBox; ++import net.minecraft.world.level.levelgen.structure.StructureStart; + import net.minecraft.world.level.levelgen.surfacebuilders.ConfiguredSurfaceBuilder; + import net.minecraft.world.level.levelgen.synth.PerlinSimplexNoise; + import net.minecraft.world.level.material.FluidState; +@@ -241,9 +242,11 @@ public final class Biome { + int p = region.getMinBuildHeight() + 1; + int q = region.getMaxBuildHeight() - 1; + region.setCurrentlyGenerating(supplier); +- structureAccessor.startsForFeature(SectionPos.of(origin), structureFeature).forEach((structureStart) -> { ++ // Paper start - remove structure streams ++ for (StructureStart structureStart : structureAccessor.streamlessStartsForFeature(SectionPos.of(origin), structureFeature)) { + structureStart.placeInChunk(region, structureAccessor, chunkGenerator, random, new BoundingBox(n, p, o, n + 15, q, o + 15), new ChunkPos(l, m)); +- }); ++ } ++ // Paper end + } catch (Exception var24) { + CrashReport crashReport = CrashReport.forThrowable(var24, "Feature placement"); + crashReport.addCategory("Feature").setDetail("Description", supplier::get); +diff --git a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java +index ed3bfe13d0e3835ce0dbe3ae5af8cd22a7ea25e6..c52d1a23a0f0bdde062f73a435bc6b9cef51c437 100644 +--- a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java ++++ b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java +@@ -44,7 +44,7 @@ public class Beardifier { + this.rigids = new ObjectArrayList<>(10); + + for(StructureFeature structureFeature : StructureFeature.NOISE_AFFECTING_FEATURES) { +- accessor.startsForFeature(SectionPos.bottomOf(chunk), structureFeature).forEach((start) -> { ++ for (net.minecraft.world.level.levelgen.structure.StructureStart start : accessor.streamlessStartsForFeature(SectionPos.of(chunkPos, 0), structureFeature)) { // Paper - remove structure streams + for(StructurePiece structurePiece : start.getPieces()) { + if (structurePiece.isCloseToChunk(chunkPos, 12)) { + if (structurePiece instanceof PoolElementStructurePiece) { +@@ -67,7 +67,7 @@ public class Beardifier { + } + } + +- }); ++ } // Paper - remove structure streams + } + + this.pieceIterator = this.rigids.iterator(); diff --git a/patches/server/0470-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0471-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0470-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0471-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0471-Support-components-in-ItemMeta.patch b/patches/server/0472-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0471-Support-components-in-ItemMeta.patch rename to patches/server/0472-Support-components-in-ItemMeta.patch diff --git a/patches/server/0472-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0473-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0472-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/server/0473-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0473-Add-entity-liquid-API.patch b/patches/server/0474-Add-entity-liquid-API.patch similarity index 96% rename from patches/server/0473-Add-entity-liquid-API.patch rename to patches/server/0474-Add-entity-liquid-API.patch index 81e7a4809..3600a0f8a 100644 --- a/patches/server/0473-Add-entity-liquid-API.patch +++ b/patches/server/0474-Add-entity-liquid-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 96da70f1077f70c4bd5ba1196292a856deb25286..466de2bbdbf0c9e3ed28ec8fee5fcfeb75c54398 100644 +index 28f9b58c379306138f1528d91f2112c21ae9cb0a..0f37c205fe401126a19191fb5382cc1b4d3f43b4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1305,13 +1305,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0474-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0475-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0474-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0475-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0475-Spawn-player-in-correct-world-on-login.patch b/patches/server/0476-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0475-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0476-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0476-Add-PrepareResultEvent.patch b/patches/server/0477-Add-PrepareResultEvent.patch similarity index 98% rename from patches/server/0476-Add-PrepareResultEvent.patch rename to patches/server/0477-Add-PrepareResultEvent.patch index 53d3c6585..77eb7d1eb 100644 --- a/patches/server/0476-Add-PrepareResultEvent.patch +++ b/patches/server/0477-Add-PrepareResultEvent.patch @@ -106,7 +106,7 @@ index ddd34b07f7cf39a8b5ad51bdefb6e9d7cbf8f393..eac9765ecf0b33cab8b04204591de8d5 private void setupRecipeList(Container input, ItemStack stack) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d4b8035160332d98c37918f62ee9e0d630e23ee8..fc9c63b73211d05321776648d6ba9c54f14ba83d 100644 +index e508f75158423e8c4a59af18a094dfa36b9c180c..ff5d9baa5f961a6be7d5d73bfb78cb5de1b8cfe9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1529,19 +1529,44 @@ public class CraftEventFactory { diff --git a/patches/server/0477-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0478-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 97% rename from patches/server/0477-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0478-Allow-delegation-to-vanilla-chunk-gen.patch index 287d85372..840cdeb9a 100644 --- a/patches/server/0477-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/server/0478-Allow-delegation-to-vanilla-chunk-gen.patch @@ -42,7 +42,7 @@ index 6bc5ba51c90723c7138b1b5d2381cb215f1e5271..beb8b7d06ef47c80ede95c884598fedc public BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag... flags) { return new CraftBossBar(title, color, style, flags); diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java -index 7f8d9e82c1fadc0621f6e94adbc31f7774f9568f..2f0849dd05605e693dcc12c3d0842e8dfa53a869 100644 +index 3d905c98704da64cefd009b2c796b24e729396a5..6e8018241664d2cc2a6a8d52d87946740ac8bb97 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java @@ -20,7 +20,7 @@ import org.bukkit.material.MaterialData; diff --git a/patches/server/0478-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0479-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0478-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0479-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0479-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0480-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0479-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0480-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0480-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0481-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0480-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0481-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0481-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0482-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0481-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0482-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0482-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0483-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0482-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0483-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0483-Move-range-check-for-block-placing-up.patch b/patches/server/0484-Move-range-check-for-block-placing-up.patch similarity index 96% rename from patches/server/0483-Move-range-check-for-block-placing-up.patch rename to patches/server/0484-Move-range-check-for-block-placing-up.patch index 4614ed8f8..dc297131f 100644 --- a/patches/server/0483-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0484-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2b8a9d16add3ac81ede029a909a40feaa07c51d3..afd5f5efdd6b47811fdbc23adeacace594602046 100644 +index 91a06e1ac325fe80aaadaf213d40495f4ce15e53..d1574bf0a326212898378b72b44c1b08e633dc27 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1694,17 +1694,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0484-Fix-SPIGOT-5989.patch b/patches/server/0485-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0484-Fix-SPIGOT-5989.patch rename to patches/server/0485-Fix-SPIGOT-5989.patch diff --git a/patches/server/0485-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0486-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0485-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0486-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0486-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0487-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0486-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0487-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0487-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0488-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0487-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0488-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0488-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0489-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from patches/server/0488-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/server/0489-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/patches/server/0489-Fix-some-rails-connecting-improperly.patch b/patches/server/0490-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0489-Fix-some-rails-connecting-improperly.patch rename to patches/server/0490-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0490-Incremental-player-saving.patch b/patches/server/0491-Incremental-player-saving.patch similarity index 98% rename from patches/server/0490-Incremental-player-saving.patch rename to patches/server/0491-Incremental-player-saving.patch index cc01e0838..d2651f5fd 100644 --- a/patches/server/0490-Incremental-player-saving.patch +++ b/patches/server/0491-Incremental-player-saving.patch @@ -55,7 +55,7 @@ index 1feda8b44364c748497174944b26abc4f058f354..1889de77a5e3d9371005b6bd451e2c0e } // Paper start for (ServerLevel level : this.getAllLevels()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b106a972a76e856d6cdab78dec5daef77b135f98..de50d3de98490b5620a085c1af7fb100b8b8ad99 100644 +index 2bf25f90f760c1a5ee025a0ebaaccd9285a4db7f..fb56655df35c8a2cee8f5c4bb47a155054d850f8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -169,6 +169,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0491-Fix-MC-187716-Use-configured-height.patch b/patches/server/0492-Fix-MC-187716-Use-configured-height.patch similarity index 100% rename from patches/server/0491-Fix-MC-187716-Use-configured-height.patch rename to patches/server/0492-Fix-MC-187716-Use-configured-height.patch diff --git a/patches/server/0492-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0493-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0492-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0493-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0493-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0494-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0493-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0494-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0494-Brand-support.patch b/patches/server/0495-Brand-support.patch similarity index 97% rename from patches/server/0494-Brand-support.patch rename to patches/server/0495-Brand-support.patch index 148208218..ea3f01793 100644 --- a/patches/server/0494-Brand-support.patch +++ b/patches/server/0495-Brand-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Brand support diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index afd5f5efdd6b47811fdbc23adeacace594602046..30cdacbefb07c7b3e7d64cbb78ff821a5f6c7567 100644 +index d1574bf0a326212898378b72b44c1b08e633dc27..d7c0d82eecb6c601a0ef038ec970a3b657691107 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; diff --git a/patches/server/0495-Add-setMaxPlayers-API.patch b/patches/server/0496-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0495-Add-setMaxPlayers-API.patch rename to patches/server/0496-Add-setMaxPlayers-API.patch diff --git a/patches/server/0496-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0497-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0496-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0497-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0497-Don-t-require-FACING-data.patch b/patches/server/0498-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0497-Don-t-require-FACING-data.patch rename to patches/server/0498-Don-t-require-FACING-data.patch diff --git a/patches/server/0498-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0499-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0498-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0499-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0499-Add-moon-phase-API.patch b/patches/server/0500-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0499-Add-moon-phase-API.patch rename to patches/server/0500-Add-moon-phase-API.patch diff --git a/patches/server/0500-Prevent-headless-pistons-from-being-created.patch b/patches/server/0501-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0500-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0501-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0501-Add-BellRingEvent.patch b/patches/server/0502-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0501-Add-BellRingEvent.patch rename to patches/server/0502-Add-BellRingEvent.patch diff --git a/patches/server/0502-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0503-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0502-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0503-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0503-Buffer-joins-to-world.patch b/patches/server/0504-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0503-Buffer-joins-to-world.patch rename to patches/server/0504-Buffer-joins-to-world.patch diff --git a/patches/server/0504-Optimize-redstone-algorithm.patch b/patches/server/0505-Optimize-redstone-algorithm.patch similarity index 100% rename from patches/server/0504-Optimize-redstone-algorithm.patch rename to patches/server/0505-Optimize-redstone-algorithm.patch diff --git a/patches/server/0505-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0506-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0505-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0506-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0506-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0507-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0506-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0507-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0507-Fix-CraftTeam-null-check.patch b/patches/server/0508-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0507-Fix-CraftTeam-null-check.patch rename to patches/server/0508-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0508-Add-more-Evoker-API.patch b/patches/server/0509-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0508-Add-more-Evoker-API.patch rename to patches/server/0509-Add-more-Evoker-API.patch diff --git a/patches/server/0509-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0510-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 100% rename from patches/server/0509-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to patches/server/0510-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch diff --git a/patches/server/0510-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0511-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0510-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0511-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0511-Cache-block-data-strings.patch b/patches/server/0512-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0511-Cache-block-data-strings.patch rename to patches/server/0512-Cache-block-data-strings.patch diff --git a/patches/server/0512-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0513-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 96% rename from patches/server/0512-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0513-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index dd9aef643..8599c641f 100644 --- a/patches/server/0512-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0513-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -9,7 +9,7 @@ as this is how Vanilla teleports entities. Cancel any pending motion when teleported. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 30cdacbefb07c7b3e7d64cbb78ff821a5f6c7567..1a085522026d6a7d549ca9975e02336bcd495aa4 100644 +index d7c0d82eecb6c601a0ef038ec970a3b657691107..5b923254ea7c8106e4ce9f7792c9c044ab06acc9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -682,7 +682,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -31,7 +31,7 @@ index 30cdacbefb07c7b3e7d64cbb78ff821a5f6c7567..1a085522026d6a7d549ca9975e02336b this.player.connection.send(new ClientboundPlayerPositionPacket(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.awaitingTeleport, flag)); } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 466de2bbdbf0c9e3ed28ec8fee5fcfeb75c54398..a9c90e41af1cc67a88a639dc795dd8023a7acb89 100644 +index 0f37c205fe401126a19191fb5382cc1b4d3f43b4..b964efb6afb090ffec505493e9bbbb88ba3efd9d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -152,6 +152,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0513-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0514-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0513-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0514-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0514-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0515-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0514-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0515-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0515-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0516-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0515-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0516-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0516-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0517-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from patches/server/0516-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to patches/server/0517-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/patches/server/0517-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0518-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 94% rename from patches/server/0517-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0518-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index 64a555e00..1500ec007 100644 --- a/patches/server/0517-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/patches/server/0518-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a9c90e41af1cc67a88a639dc795dd8023a7acb89..dac4585ba1bfc782b3e381dfba0a1b9abbb6a2d7 100644 +index b964efb6afb090ffec505493e9bbbb88ba3efd9d..2de83f4f507c87347b58ba2102a87bbb2d7ceb7b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3904,4 +3904,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0518-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0519-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0518-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0519-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0519-Entity-isTicking.patch b/patches/server/0520-Entity-isTicking.patch similarity index 95% rename from patches/server/0519-Entity-isTicking.patch rename to patches/server/0520-Entity-isTicking.patch index cf7794741..0ddc48599 100644 --- a/patches/server/0519-Entity-isTicking.patch +++ b/patches/server/0520-Entity-isTicking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index dac4585ba1bfc782b3e381dfba0a1b9abbb6a2d7..d1199a166dfc88722e13dbdfeb86d9c89e7e8513 100644 +index 2de83f4f507c87347b58ba2102a87bbb2d7ceb7b..15b48d9e6caf8d28438e161dcf2c1499e938984c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -52,6 +52,7 @@ import net.minecraft.resources.ResourceKey; diff --git a/patches/server/0520-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0521-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0520-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0521-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0521-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0522-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch similarity index 89% rename from patches/server/0521-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch rename to patches/server/0522-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch index c2938746f..d08258182 100644 --- a/patches/server/0521-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch +++ b/patches/server/0522-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix CME on adding a passenger in CreatureSpawnEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d1199a166dfc88722e13dbdfeb86d9c89e7e8513..d64caca72a5302392df944d4c60ed2ba79a19ee7 100644 +index 15b48d9e6caf8d28438e161dcf2c1499e938984c..c3b05e73f9f42bdc2ab5d43fa905dd4cf5e39440 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3413,7 +3413,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0522-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0523-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0522-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0523-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0523-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0524-Fix-for-large-move-vectors-crashing-server.patch similarity index 97% rename from patches/server/0523-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0524-Fix-for-large-move-vectors-crashing-server.patch index a1a4688c6..e95f85d44 100644 --- a/patches/server/0523-Fix-for-large-move-vectors-crashing-server.patch +++ b/patches/server/0524-Fix-for-large-move-vectors-crashing-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server Check movement distance also based on current position. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1a085522026d6a7d549ca9975e02336bcd495aa4..1fffa32bd193fa122c7f7b5381f57975c2e895fe 100644 +index 5b923254ea7c8106e4ce9f7792c9c044ab06acc9..70f82d410dd12d4f162ff38f7222f9d099e11e1f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -507,19 +507,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0524-Optimise-getType-calls.patch b/patches/server/0525-Optimise-getType-calls.patch similarity index 98% rename from patches/server/0524-Optimise-getType-calls.patch rename to patches/server/0525-Optimise-getType-calls.patch index 714fa391a..e67e76e8d 100644 --- a/patches/server/0524-Optimise-getType-calls.patch +++ b/patches/server/0525-Optimise-getType-calls.patch @@ -80,7 +80,7 @@ index 6dc8f9f269db6971b8b46819e017357899ccd118..7f49c7c7048b5778f20ddce1d844d4b3 public BlockState getState() { diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java -index 2f0849dd05605e693dcc12c3d0842e8dfa53a869..612241ad511cb515fe28c69452c66efcfe62bd7e 100644 +index 6e8018241664d2cc2a6a8d52d87946740ac8bb97..8038fe792533617023e9667fa2763ce98975318c 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java @@ -75,7 +75,7 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData { diff --git a/patches/server/0525-Villager-resetOffers.patch b/patches/server/0526-Villager-resetOffers.patch similarity index 100% rename from patches/server/0525-Villager-resetOffers.patch rename to patches/server/0526-Villager-resetOffers.patch diff --git a/patches/server/0526-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0527-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from patches/server/0526-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to patches/server/0527-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/patches/server/0527-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0528-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0527-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0528-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0528-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0529-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0528-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0529-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0529-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0530-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0529-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0530-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0530-Player-elytra-boost-API.patch b/patches/server/0531-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0530-Player-elytra-boost-API.patch rename to patches/server/0531-Player-elytra-boost-API.patch diff --git a/patches/server/0531-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0532-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0531-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0532-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0532-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0533-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0532-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0533-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0533-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0534-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0533-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0534-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0534-Add-ignore-discounts-API.patch b/patches/server/0535-Add-ignore-discounts-API.patch similarity index 98% rename from patches/server/0534-Add-ignore-discounts-API.patch rename to patches/server/0535-Add-ignore-discounts-API.patch index 467e7a664..a947fd725 100644 --- a/patches/server/0534-Add-ignore-discounts-API.patch +++ b/patches/server/0535-Add-ignore-discounts-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add ignore discounts API 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 94e742856244b99236ba458fa38801abb5acf286..f534d3afaa20abacfd9e6e15d31d592855667c57 100644 +index 23ea91449a04e8457273db34c4a388bdf85d7dfc..fe9ee43bf0c49c0541bc4fb114e63b8a0fcf1967 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -474,6 +474,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/patches/server/0535-Toggle-for-removing-existing-dragon.patch b/patches/server/0536-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0535-Toggle-for-removing-existing-dragon.patch rename to patches/server/0536-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0536-Fix-client-lag-on-advancement-loading.patch b/patches/server/0537-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0536-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0537-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0537-Item-no-age-no-player-pickup.patch b/patches/server/0538-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0537-Item-no-age-no-player-pickup.patch rename to patches/server/0538-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0538-Beacon-API-custom-effect-ranges.patch b/patches/server/0539-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0538-Beacon-API-custom-effect-ranges.patch rename to patches/server/0539-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0539-Add-API-for-quit-reason.patch b/patches/server/0540-Add-API-for-quit-reason.patch similarity index 96% rename from patches/server/0539-Add-API-for-quit-reason.patch rename to patches/server/0540-Add-API-for-quit-reason.patch index dd04749f8..c43ced524 100644 --- a/patches/server/0539-Add-API-for-quit-reason.patch +++ b/patches/server/0540-Add-API-for-quit-reason.patch @@ -25,7 +25,7 @@ index d32b96a5f51d745869cfc40c01c54de58e1eb843..759e563d1ed13249fada8a8eab6b6a10 Connection.LOGGER.debug("Failed to sent packet", throwable); ConnectionProtocol enumprotocol = this.getCurrentProtocol(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index de50d3de98490b5620a085c1af7fb100b8b8ad99..2be97d1024b15691fb2aaa8516d6447f47da4937 100644 +index fb56655df35c8a2cee8f5c4bb47a155054d850f8..c289664c317c9059d131f9e8f703d2304999a3cb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -254,6 +254,7 @@ public class ServerPlayer extends Player { @@ -37,7 +37,7 @@ index de50d3de98490b5620a085c1af7fb100b8b8ad99..2be97d1024b15691fb2aaa8516d6447f public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) { super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1fffa32bd193fa122c7f7b5381f57975c2e895fe..c495525da3dda12977d70ea85c87701988aa5929 100644 +index 70f82d410dd12d4f162ff38f7222f9d099e11e1f..642c525d09fcb580d14dab2e544816e62dc59a7a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -444,6 +444,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0540-Seed-based-feature-search.patch b/patches/server/0541-Seed-based-feature-search.patch similarity index 100% rename from patches/server/0540-Seed-based-feature-search.patch rename to patches/server/0541-Seed-based-feature-search.patch diff --git a/patches/server/0541-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0542-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0541-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0542-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0542-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0543-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0542-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0543-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0543-Expose-world-spawn-angle.patch b/patches/server/0544-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0543-Expose-world-spawn-angle.patch rename to patches/server/0544-Expose-world-spawn-angle.patch diff --git a/patches/server/0544-Add-Destroy-Speed-API.patch b/patches/server/0545-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0544-Add-Destroy-Speed-API.patch rename to patches/server/0545-Add-Destroy-Speed-API.patch diff --git a/patches/server/0545-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0546-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0545-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0546-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0546-Add-LivingEntity-clearActiveItem.patch b/patches/server/0547-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0546-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0547-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0547-Add-PlayerItemCooldownEvent.patch b/patches/server/0548-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0547-Add-PlayerItemCooldownEvent.patch rename to patches/server/0548-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0548-More-lightning-API.patch b/patches/server/0549-More-lightning-API.patch similarity index 100% rename from patches/server/0548-More-lightning-API.patch rename to patches/server/0549-More-lightning-API.patch diff --git a/patches/server/0549-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0550-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0549-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0550-Climbing-should-not-bypass-cramming-gamerule.patch index cb9304652..536443218 100644 --- a/patches/server/0549-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0550-Climbing-should-not-bypass-cramming-gamerule.patch @@ -21,7 +21,7 @@ index afc637476380da272e61c10663dc77b30901c03a..247b30b2b2edbb1043b6385039ba830d private void keepLoadedRange() { keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d64caca72a5302392df944d4c60ed2ba79a19ee7..785970057ceb7a58049f9d36ac0eaa122637430f 100644 +index c3b05e73f9f42bdc2ab5d43fa905dd4cf5e39440..3ca07887bc67587cd820556d160037ca62c32c10 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1704,6 +1704,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0550-Added-missing-default-perms-for-commands.patch b/patches/server/0551-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0550-Added-missing-default-perms-for-commands.patch rename to patches/server/0551-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0551-Add-PlayerShearBlockEvent.patch b/patches/server/0552-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0551-Add-PlayerShearBlockEvent.patch rename to patches/server/0552-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0552-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0553-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0552-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0553-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0553-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0554-Fix-curing-zombie-villager-discount-exploit.patch similarity index 96% rename from patches/server/0553-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0554-Fix-curing-zombie-villager-discount-exploit.patch index d4d9695b5..015e81c61 100644 --- a/patches/server/0553-Fix-curing-zombie-villager-discount-exploit.patch +++ b/patches/server/0554-Fix-curing-zombie-villager-discount-exploit.patch @@ -24,7 +24,7 @@ index 247b30b2b2edbb1043b6385039ba830dea877c55..618f47567ca9d4704f4686d7ca789286 private void keepLoadedRange() { keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16); 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 f534d3afaa20abacfd9e6e15d31d592855667c57..ee23149411a49f08d2eb4808ef78cb5a50785977 100644 +index fe9ee43bf0c49c0541bc4fb114e63b8a0fcf1967..18b35c8d2160d24c31483edef13cc5e8d93ed09b 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -1056,6 +1056,15 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/patches/server/0554-Limit-recipe-packets.patch b/patches/server/0555-Limit-recipe-packets.patch similarity index 97% rename from patches/server/0554-Limit-recipe-packets.patch rename to patches/server/0555-Limit-recipe-packets.patch index 261cfcff4..383406629 100644 --- a/patches/server/0554-Limit-recipe-packets.patch +++ b/patches/server/0555-Limit-recipe-packets.patch @@ -23,7 +23,7 @@ index 7d50aded88f5b7dfebaea1aebc86231f7b5c4e25..652d87fc5d566dba8018c81676329f0e public static boolean velocityOnlineMode; public static byte[] velocitySecretKey; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c495525da3dda12977d70ea85c87701988aa5929..2a1c524941e50d6a16076f57460d0cb05ed57f7c 100644 +index 642c525d09fcb580d14dab2e544816e62dc59a7a..2e8c7703f450e8f6fc872d78fa909f9f3d947b0c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -232,6 +232,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0555-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0556-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0555-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0556-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0556-MC-4-Fix-item-position-desync.patch b/patches/server/0557-MC-4-Fix-item-position-desync.patch similarity index 97% rename from patches/server/0556-MC-4-Fix-item-position-desync.patch rename to patches/server/0557-MC-4-Fix-item-position-desync.patch index aaad2cd0d..d2b8ffa80 100644 --- a/patches/server/0556-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0557-MC-4-Fix-item-position-desync.patch @@ -41,7 +41,7 @@ index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f9 public Vec3 updateEntityPosition(Vec3 orig) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 785970057ceb7a58049f9d36ac0eaa122637430f..fec2a44c4a110407d33002a955fe5dacbccc840c 100644 +index 3ca07887bc67587cd820556d160037ca62c32c10..487923bcd5abe933f739e55f17a3c94d80af63b3 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3731,6 +3731,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0557-Player-Chunk-Load-Unload-Events.patch b/patches/server/0558-Player-Chunk-Load-Unload-Events.patch similarity index 94% rename from patches/server/0557-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0558-Player-Chunk-Load-Unload-Events.patch index 54e121ece..19773457e 100644 --- a/patches/server/0557-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0558-Player-Chunk-Load-Unload-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2be97d1024b15691fb2aaa8516d6447f47da4937..f412f3b9f3af498b9ced4a808849442efad01b69 100644 +index c289664c317c9059d131f9e8f703d2304999a3cb..4d29671e38876bc6b8a2b80fa6e6f5d4200f0e9e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2087,11 +2087,21 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0558-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0559-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0558-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0559-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0559-Expose-LivingEntity-hurt-direction.patch b/patches/server/0560-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0559-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0560-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0560-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0561-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 91% rename from patches/server/0560-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0561-Add-OBSTRUCTED-reason-to-BedEnterResult.patch index 56f636a0c..b698f457c 100644 --- a/patches/server/0560-Add-OBSTRUCTED-reason-to-BedEnterResult.patch +++ b/patches/server/0561-Add-OBSTRUCTED-reason-to-BedEnterResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index fc9c63b73211d05321776648d6ba9c54f14ba83d..0f120d72816667ef8d50502b1e7e7dc3848f0ab4 100644 +index ff5d9baa5f961a6be7d5d73bfb78cb5de1b8cfe9..d6d6bc1ff3b9c1d303434bfc373a784b41557ed9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -257,6 +257,10 @@ public class CraftEventFactory { diff --git a/patches/server/0561-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0562-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0561-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0562-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0562-added-PlayerTradeEvent.patch b/patches/server/0563-added-PlayerTradeEvent.patch similarity index 100% rename from patches/server/0562-added-PlayerTradeEvent.patch rename to patches/server/0563-added-PlayerTradeEvent.patch diff --git a/patches/server/0563-Implement-TargetHitEvent.patch b/patches/server/0564-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0563-Implement-TargetHitEvent.patch rename to patches/server/0564-Implement-TargetHitEvent.patch diff --git a/patches/server/0564-Additional-Block-Material-API-s.patch b/patches/server/0565-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0564-Additional-Block-Material-API-s.patch rename to patches/server/0565-Additional-Block-Material-API-s.patch diff --git a/patches/server/0565-Fix-harming-potion-dupe.patch b/patches/server/0566-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0565-Fix-harming-potion-dupe.patch rename to patches/server/0566-Fix-harming-potion-dupe.patch diff --git a/patches/server/0566-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0567-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0566-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0567-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0567-Cache-burn-durations.patch b/patches/server/0568-Cache-burn-durations.patch similarity index 100% rename from patches/server/0567-Cache-burn-durations.patch rename to patches/server/0568-Cache-burn-durations.patch diff --git a/patches/server/0568-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0569-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0568-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0569-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0569-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0570-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0569-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0570-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0570-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0571-Fix-interact-event-not-being-called-in-adventure.patch similarity index 95% rename from patches/server/0570-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0571-Fix-interact-event-not-being-called-in-adventure.patch index df7ae51e7..557725c21 100644 --- a/patches/server/0570-Fix-interact-event-not-being-called-in-adventure.patch +++ b/patches/server/0571-Fix-interact-event-not-being-called-in-adventure.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure Call PlayerInteractEvent when left-clicking on a block in adventure mode diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2a1c524941e50d6a16076f57460d0cb05ed57f7c..8051cc5950b71f284e7ad8be685977fd098fe022 100644 +index 2e8c7703f450e8f6fc872d78fa909f9f3d947b0c..2eeca5c4cdeaf694700046fd6326608143605efe 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1734,7 +1734,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0571-Zombie-API-breaking-doors.patch b/patches/server/0572-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0571-Zombie-API-breaking-doors.patch rename to patches/server/0572-Zombie-API-breaking-doors.patch diff --git a/patches/server/0572-Fix-nerfed-slime-when-splitting.patch b/patches/server/0573-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0572-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0573-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0573-Add-EntityLoadCrossbowEvent.patch b/patches/server/0574-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0573-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0574-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0574-Guardian-beam-workaround.patch b/patches/server/0575-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0574-Guardian-beam-workaround.patch rename to patches/server/0575-Guardian-beam-workaround.patch diff --git a/patches/server/0575-Added-WorldGameRuleChangeEvent.patch b/patches/server/0576-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0575-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0576-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0576-Added-ServerResourcesReloadedEvent.patch b/patches/server/0577-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0576-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0577-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0577-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0578-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0577-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0578-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0578-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0579-Implemented-BlockFailedDispenseEvent.patch similarity index 96% rename from patches/server/0578-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0579-Implemented-BlockFailedDispenseEvent.patch index 3199535c1..739be08f2 100644 --- a/patches/server/0578-Implemented-BlockFailedDispenseEvent.patch +++ b/patches/server/0579-Implemented-BlockFailedDispenseEvent.patch @@ -32,7 +32,7 @@ index 51723c8f740c7b0bbd15acc0f1c848790c2ff299..5a95b550c767284563c124df1ff45322 } else { ItemStack itemstack = tileentitydispenser.getItem(i); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 0f120d72816667ef8d50502b1e7e7dc3848f0ab4..263aaf312efcc8c8bda57448710ef6eb36a3a5bd 100644 +index d6d6bc1ff3b9c1d303434bfc373a784b41557ed9..55e64b4bbb60e793516a684ad877f356d6100db9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1791,4 +1791,12 @@ public class CraftEventFactory { diff --git a/patches/server/0579-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0580-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0579-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0580-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0580-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0581-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0580-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0581-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0581-Configurable-door-breaking-difficulty.patch b/patches/server/0582-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0581-Configurable-door-breaking-difficulty.patch rename to patches/server/0582-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0582-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0583-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0582-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0583-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0583-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0584-Implement-API-to-expose-exact-interaction-point.patch similarity index 97% rename from patches/server/0583-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0584-Implement-API-to-expose-exact-interaction-point.patch index fcb5a17e2..410f64669 100644 --- a/patches/server/0583-Implement-API-to-expose-exact-interaction-point.patch +++ b/patches/server/0584-Implement-API-to-expose-exact-interaction-point.patch @@ -18,7 +18,7 @@ index de4fdd46f23b2b17da752a8afc0faecc1ad8344f..2a0f313365a25c1780027f1536dbb88c this.interactResult = event.useItemInHand() == Event.Result.DENY; this.interactPosition = blockposition.immutable(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 263aaf312efcc8c8bda57448710ef6eb36a3a5bd..f6f2856c407abe195f1dfee7f4a7e30baea585f7 100644 +index 55e64b4bbb60e793516a684ad877f356d6100db9..223029264288c6470f624d2cdc19282dddd13240 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -55,7 +55,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; diff --git a/patches/server/0584-Remove-stale-POIs.patch b/patches/server/0585-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0584-Remove-stale-POIs.patch rename to patches/server/0585-Remove-stale-POIs.patch diff --git a/patches/server/0585-Fix-villager-boat-exploit.patch b/patches/server/0586-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0585-Fix-villager-boat-exploit.patch rename to patches/server/0586-Fix-villager-boat-exploit.patch diff --git a/patches/server/0586-Add-sendOpLevel-API.patch b/patches/server/0587-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0586-Add-sendOpLevel-API.patch rename to patches/server/0587-Add-sendOpLevel-API.patch diff --git a/patches/server/0587-Add-StructureLocateEvent.patch b/patches/server/0588-Add-StructureLocateEvent.patch similarity index 100% rename from patches/server/0587-Add-StructureLocateEvent.patch rename to patches/server/0588-Add-StructureLocateEvent.patch diff --git a/patches/server/0588-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0589-Collision-option-for-requiring-a-player-participant.patch similarity index 98% rename from patches/server/0588-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0589-Collision-option-for-requiring-a-player-participant.patch index f3649e114..a27b7eae7 100644 --- a/patches/server/0588-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0589-Collision-option-for-requiring-a-player-participant.patch @@ -28,7 +28,7 @@ index dd5c092a035a30c477fe828b58bc918fc48daa03..16b80fe4c55c51d3afaefba7eef97d1e public int wanderingTraderSpawnDayTicks = 24000; public int wanderingTraderSpawnChanceFailureIncrement = 25; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fec2a44c4a110407d33002a955fe5dacbccc840c..9023cee63d77886683840f8d5650a8e07426b4c6 100644 +index 487923bcd5abe933f739e55f17a3c94d80af63b3..5d4bee5470795bd9f362fff5ae653794223fa182 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1587,6 +1587,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0589-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0590-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0589-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0590-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0590-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0591-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0590-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0591-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0591-Make-schedule-command-per-world.patch b/patches/server/0592-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0591-Make-schedule-command-per-world.patch rename to patches/server/0592-Make-schedule-command-per-world.patch diff --git a/patches/server/0592-Configurable-max-leash-distance.patch b/patches/server/0593-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0592-Configurable-max-leash-distance.patch rename to patches/server/0593-Configurable-max-leash-distance.patch diff --git a/patches/server/0593-Implement-BlockPreDispenseEvent.patch b/patches/server/0594-Implement-BlockPreDispenseEvent.patch similarity index 95% rename from patches/server/0593-Implement-BlockPreDispenseEvent.patch rename to patches/server/0594-Implement-BlockPreDispenseEvent.patch index 7dd8f1e5f..2e97f6d99 100644 --- a/patches/server/0593-Implement-BlockPreDispenseEvent.patch +++ b/patches/server/0594-Implement-BlockPreDispenseEvent.patch @@ -17,7 +17,7 @@ index 501a5483160dba050261bb3448317a097cdb7ef2..2dcac4b638073aa1748f26f61219dbf9 tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack)); } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f6f2856c407abe195f1dfee7f4a7e30baea585f7..ea7082ab595f7bce572eec66ce7790a0afa8dae1 100644 +index 223029264288c6470f624d2cdc19282dddd13240..d66622db96abb553abe05eb917e233f1be7c873b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1809,5 +1809,11 @@ public class CraftEventFactory { diff --git a/patches/server/0594-Added-Vanilla-Entity-Tags.patch b/patches/server/0595-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from patches/server/0594-Added-Vanilla-Entity-Tags.patch rename to patches/server/0595-Added-Vanilla-Entity-Tags.patch diff --git a/patches/server/0595-added-Wither-API.patch b/patches/server/0596-added-Wither-API.patch similarity index 100% rename from patches/server/0595-added-Wither-API.patch rename to patches/server/0596-added-Wither-API.patch diff --git a/patches/server/0596-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0597-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0596-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0597-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0597-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0598-Fix-console-spam-when-removing-chests-in-water.patch similarity index 100% rename from patches/server/0597-Fix-console-spam-when-removing-chests-in-water.patch rename to patches/server/0598-Fix-console-spam-when-removing-chests-in-water.patch diff --git a/patches/server/0598-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0599-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0598-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0599-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0599-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0600-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0599-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0600-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0600-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0601-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 98% rename from patches/server/0600-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0601-Add-dropLeash-variable-to-EntityUnleashEvent.patch index fbf737e2d..c0cf8f7c1 100644 --- a/patches/server/0600-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/patches/server/0601-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -122,7 +122,7 @@ index b9b67134f02fd7484ed19905c9ae1f9b8a26ce26..c05f173b7642380900fdd77ce5d2c020 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index ea7082ab595f7bce572eec66ce7790a0afa8dae1..2b5f63c3f0ff3039fbef9afdfa46e0e715d347bc 100644 +index d66622db96abb553abe05eb917e233f1be7c873b..badba94d2a797952507d422b4ea92fc23bc5550f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1466,8 +1466,10 @@ public class CraftEventFactory { diff --git a/patches/server/0601-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0602-Skip-distance-map-update-when-spawning-disabled.patch similarity index 100% rename from patches/server/0601-Skip-distance-map-update-when-spawning-disabled.patch rename to patches/server/0602-Skip-distance-map-update-when-spawning-disabled.patch diff --git a/patches/server/0602-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0603-Reset-shield-blocking-on-dimension-change.patch similarity index 89% rename from patches/server/0602-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0603-Reset-shield-blocking-on-dimension-change.patch index aa3eb4e6c..f718d3b81 100644 --- a/patches/server/0602-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0603-Reset-shield-blocking-on-dimension-change.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f412f3b9f3af498b9ced4a808849442efad01b69..d0e9bbecb4b0cf980116c72b96ae8edd74f9bfd6 100644 +index 4d29671e38876bc6b8a2b80fa6e6f5d4200f0e9e..76e179089a419d4dae6bc64ef0122d03bcdd26e5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1139,6 +1139,11 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0603-add-DragonEggFormEvent.patch b/patches/server/0604-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0603-add-DragonEggFormEvent.patch rename to patches/server/0604-add-DragonEggFormEvent.patch diff --git a/patches/server/0604-EntityMoveEvent.patch b/patches/server/0605-EntityMoveEvent.patch similarity index 100% rename from patches/server/0604-EntityMoveEvent.patch rename to patches/server/0605-EntityMoveEvent.patch diff --git a/patches/server/0605-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0606-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0605-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0606-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0606-Inline-shift-direction-fields.patch b/patches/server/0607-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0606-Inline-shift-direction-fields.patch rename to patches/server/0607-Inline-shift-direction-fields.patch diff --git a/patches/server/0607-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0608-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 95% rename from patches/server/0607-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0608-Allow-adding-items-to-BlockDropItemEvent.patch index 169393cd2..d15def057 100644 --- a/patches/server/0607-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/patches/server/0608-Allow-adding-items-to-BlockDropItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2b5f63c3f0ff3039fbef9afdfa46e0e715d347bc..dcd59630c9e8870128859b9022827aeefebec963 100644 +index badba94d2a797952507d422b4ea92fc23bc5550f..f2bb96b13b3621af0079bd075798ed7f9bcb0b54 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -390,13 +390,30 @@ public class CraftEventFactory { diff --git a/patches/server/0608-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0609-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0608-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0609-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0609-living-entity-allow-attribute-registration.patch b/patches/server/0610-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0609-living-entity-allow-attribute-registration.patch rename to patches/server/0610-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0610-fix-dead-slime-setSize-invincibility.patch b/patches/server/0611-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0610-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0611-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0611-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0612-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0611-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0612-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0612-misc-debugging-dumps.patch b/patches/server/0613-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0612-misc-debugging-dumps.patch rename to patches/server/0613-misc-debugging-dumps.patch diff --git a/patches/server/0613-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0614-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0613-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0614-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0614-Expose-Tracked-Players.patch b/patches/server/0615-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0614-Expose-Tracked-Players.patch rename to patches/server/0615-Expose-Tracked-Players.patch diff --git a/patches/server/0615-Remove-streams-from-SensorNearest.patch b/patches/server/0616-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0615-Remove-streams-from-SensorNearest.patch rename to patches/server/0616-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0616-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0617-MC-29274-Fix-Wither-hostility-towards-players.patch similarity index 100% rename from patches/server/0616-MC-29274-Fix-Wither-hostility-towards-players.patch rename to patches/server/0617-MC-29274-Fix-Wither-hostility-towards-players.patch diff --git a/patches/server/0617-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0618-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0617-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0618-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0618-Improve-ServerGUI.patch b/patches/server/0619-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0618-Improve-ServerGUI.patch rename to patches/server/0619-Improve-ServerGUI.patch diff --git a/patches/server/0619-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0620-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0619-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0620-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0620-fix-converting-txt-to-json-file.patch b/patches/server/0621-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0620-fix-converting-txt-to-json-file.patch rename to patches/server/0621-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0621-Add-worldborder-events.patch b/patches/server/0622-Add-worldborder-events.patch similarity index 100% rename from patches/server/0621-Add-worldborder-events.patch rename to patches/server/0622-Add-worldborder-events.patch diff --git a/patches/server/0622-added-PlayerNameEntityEvent.patch b/patches/server/0623-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0622-added-PlayerNameEntityEvent.patch rename to patches/server/0623-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0623-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0624-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0623-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0624-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0624-Add-recipe-to-cook-events.patch b/patches/server/0625-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0624-Add-recipe-to-cook-events.patch rename to patches/server/0625-Add-recipe-to-cook-events.patch diff --git a/patches/server/0625-Add-Block-isValidTool.patch b/patches/server/0626-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0625-Add-Block-isValidTool.patch rename to patches/server/0626-Add-Block-isValidTool.patch diff --git a/patches/server/0626-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0627-Allow-using-signs-inside-spawn-protection.patch similarity index 96% rename from patches/server/0626-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0627-Allow-using-signs-inside-spawn-protection.patch index 1c8a0a68b..300b35345 100644 --- a/patches/server/0626-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0627-Allow-using-signs-inside-spawn-protection.patch @@ -20,7 +20,7 @@ index caa15973d78e21725b5dd9e5fc91cede4cc0dac4..46601a98d9f06c6cfadc8120bcffab08 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8051cc5950b71f284e7ad8be685977fd098fe022..f5de1e31b62a4e04b865ab041e122d33c7efd54e 100644 +index 2eeca5c4cdeaf694700046fd6326608143605efe..7f7b34cc8a2c5fbf7dff8e785b067cb777808c52 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1723,7 +1723,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0627-Implement-Keyed-on-World.patch b/patches/server/0628-Implement-Keyed-on-World.patch similarity index 100% rename from patches/server/0627-Implement-Keyed-on-World.patch rename to patches/server/0628-Implement-Keyed-on-World.patch diff --git a/patches/server/0628-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0629-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0628-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0629-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0629-Item-Rarity-API.patch b/patches/server/0630-Item-Rarity-API.patch similarity index 100% rename from patches/server/0629-Item-Rarity-API.patch rename to patches/server/0630-Item-Rarity-API.patch diff --git a/patches/server/0630-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0631-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0630-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0631-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0631-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0632-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0631-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0632-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0632-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0633-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0632-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0633-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0633-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0634-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0633-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0634-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0634-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0635-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0634-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0635-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0635-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0636-fix-cancelling-block-falling-causing-client-desync.patch similarity index 100% rename from patches/server/0635-fix-cancelling-block-falling-causing-client-desync.patch rename to patches/server/0636-fix-cancelling-block-falling-causing-client-desync.patch diff --git a/patches/server/0636-Expose-protocol-version.patch b/patches/server/0637-Expose-protocol-version.patch similarity index 100% rename from patches/server/0636-Expose-protocol-version.patch rename to patches/server/0637-Expose-protocol-version.patch diff --git a/patches/server/0637-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0638-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 98% rename from patches/server/0637-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/server/0638-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch index 90d013302..c3c570375 100644 --- a/patches/server/0637-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch +++ b/patches/server/0638-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow for Component suggestion tooltips in diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 95b229081a4d51d63f477ef7894a938584d87fd0..f5c79ec1293c72b738bb6bc1d0aa9d495eefe194 100644 +index 11c2dac045e78b778a82246123ced159bfd2c1de..65219df9409c6c5165288a4e255b548c06e5f307 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -758,12 +758,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0638-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0639-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0638-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0639-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0639-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0640-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0639-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0640-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0640-Add-bypass-host-check.patch b/patches/server/0641-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0640-Add-bypass-host-check.patch rename to patches/server/0641-Add-bypass-host-check.patch diff --git a/patches/server/0641-Set-area-affect-cloud-rotation.patch b/patches/server/0642-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0641-Set-area-affect-cloud-rotation.patch rename to patches/server/0642-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0642-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0643-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0642-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0643-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0643-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0644-Fix-duplicating-give-items-on-item-drop-cancel.patch similarity index 100% rename from patches/server/0643-Fix-duplicating-give-items-on-item-drop-cancel.patch rename to patches/server/0644-Fix-duplicating-give-items-on-item-drop-cancel.patch diff --git a/patches/server/0644-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0645-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0644-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0645-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0645-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0646-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0645-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0646-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0646-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0647-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0646-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0647-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0647-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0648-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0647-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0648-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0648-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0649-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 93% rename from patches/server/0648-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0649-fix-PlayerItemHeldEvent-firing-twice.patch index 21430d3a8..82e941936 100644 --- a/patches/server/0648-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/server/0649-fix-PlayerItemHeldEvent-firing-twice.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f5c79ec1293c72b738bb6bc1d0aa9d495eefe194..b154aa2d151babbe4341c6dbaec1753d1472215c 100644 +index 65219df9409c6c5165288a4e255b548c06e5f307..efec476df92cd6563d7eafe120ff90bf3f959685 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1927,6 +1927,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0649-Added-PlayerDeepSleepEvent.patch b/patches/server/0650-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0649-Added-PlayerDeepSleepEvent.patch rename to patches/server/0650-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0650-More-World-API.patch b/patches/server/0651-More-World-API.patch similarity index 100% rename from patches/server/0650-More-World-API.patch rename to patches/server/0651-More-World-API.patch diff --git a/patches/server/0651-Added-PlayerBedFailEnterEvent.patch b/patches/server/0652-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0651-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0652-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0652-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0653-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0652-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0653-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0653-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0654-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0653-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0654-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0654-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0655-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0654-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0655-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0655-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0656-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 97% rename from patches/server/0655-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0656-add-RespawnFlags-to-PlayerRespawnEvent.patch index 6d960c967..1cf0db1c8 100644 --- a/patches/server/0655-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/server/0656-add-RespawnFlags-to-PlayerRespawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b154aa2d151babbe4341c6dbaec1753d1472215c..e896057274434eea97d78777dcf303fd83e9cd79 100644 +index efec476df92cd6563d7eafe120ff90bf3f959685..3bee52c6a9d449599b8547437db50daee5014017 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2461,7 +2461,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0656-Add-Channel-initialization-listeners.patch b/patches/server/0657-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0656-Add-Channel-initialization-listeners.patch rename to patches/server/0657-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0657-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0658-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0657-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0658-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0658-Add-more-WanderingTrader-API.patch b/patches/server/0659-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0658-Add-more-WanderingTrader-API.patch rename to patches/server/0659-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0659-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0660-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0659-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0660-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0660-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0661-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0660-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0661-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0661-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0662-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0661-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0662-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0662-Inventory-close.patch b/patches/server/0663-Inventory-close.patch similarity index 100% rename from patches/server/0662-Inventory-close.patch rename to patches/server/0663-Inventory-close.patch diff --git a/patches/server/0663-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0664-call-PortalCreateEvent-players-and-end-platform.patch similarity index 96% rename from patches/server/0663-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0664-call-PortalCreateEvent-players-and-end-platform.patch index 2488018cb..068b62193 100644 --- a/patches/server/0663-call-PortalCreateEvent-players-and-end-platform.patch +++ b/patches/server/0664-call-PortalCreateEvent-players-and-end-platform.patch @@ -17,7 +17,7 @@ index fd5c22a3d281d8d913c353c8a668ec51b885066a..8c3b34b3d55af4aa8e3619a5bdf0eadb return this.set(this.getX() + dx, this.getY() + dy, this.getZ() + dz); } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d0e9bbecb4b0cf980116c72b96ae8edd74f9bfd6..3b5feea941eba2ee2c6d93fd5141f2f8f1dbae42 100644 +index 76e179089a419d4dae6bc64ef0122d03bcdd26e5..753ad5a12bc523eddfffa336a20ab3e3284e6f7c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1166,15 +1166,21 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0664-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0665-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0664-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0665-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0665-Fix-CraftPotionBrewer-cache.patch b/patches/server/0666-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0665-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0666-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0666-Add-basic-Datapack-API.patch b/patches/server/0667-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0666-Add-basic-Datapack-API.patch rename to patches/server/0667-Add-basic-Datapack-API.patch diff --git a/patches/server/0667-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0668-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0667-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0668-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0668-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0669-additions-to-PlayerGameModeChangeEvent.patch similarity index 97% rename from patches/server/0668-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0669-additions-to-PlayerGameModeChangeEvent.patch index 3fa2f1209..dda1537e3 100644 --- a/patches/server/0668-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0669-additions-to-PlayerGameModeChangeEvent.patch @@ -45,7 +45,7 @@ index d75f78d2e3fb1376e8f6a8668c98a04a693c99e1..79f6089b934124c3309c6bee2e48b36b } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3b5feea941eba2ee2c6d93fd5141f2f8f1dbae42..8d39c5314c2566d0193e10ad7c91c314fa16385a 100644 +index 753ad5a12bc523eddfffa336a20ab3e3284e6f7c..9f218a4b253fe2ab0e70e871eeee05bb4f0b3fcf 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1783,8 +1783,15 @@ public class ServerPlayer extends Player { @@ -123,7 +123,7 @@ index 2a0f313365a25c1780027f1536dbb88ccdab61e2..013ed10b8eca812309a2c9a10acd668a } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e896057274434eea97d78777dcf303fd83e9cd79..b369d400e34fc8b6d161d79c57bcd26d57147ff8 100644 +index 3bee52c6a9d449599b8547437db50daee5014017..7ea9f362c19e5f3a67e4b5a46e708014953db480 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2470,7 +2470,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0669-ItemStack-repair-check-API.patch b/patches/server/0670-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0669-ItemStack-repair-check-API.patch rename to patches/server/0670-ItemStack-repair-check-API.patch diff --git a/patches/server/0670-More-Enchantment-API.patch b/patches/server/0671-More-Enchantment-API.patch similarity index 100% rename from patches/server/0670-More-Enchantment-API.patch rename to patches/server/0671-More-Enchantment-API.patch diff --git a/patches/server/0671-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0672-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0671-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0672-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0672-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0673-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0672-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0673-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0673-Add-Mob-lookAt-API.patch b/patches/server/0674-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0673-Add-Mob-lookAt-API.patch rename to patches/server/0674-Add-Mob-lookAt-API.patch diff --git a/patches/server/0674-Add-Unix-domain-socket-support.patch b/patches/server/0675-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0674-Add-Unix-domain-socket-support.patch rename to patches/server/0675-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0675-Add-EntityInsideBlockEvent.patch b/patches/server/0676-Add-EntityInsideBlockEvent.patch similarity index 99% rename from patches/server/0675-Add-EntityInsideBlockEvent.patch rename to patches/server/0676-Add-EntityInsideBlockEvent.patch index 31db26683..da1baff23 100644 --- a/patches/server/0675-Add-EntityInsideBlockEvent.patch +++ b/patches/server/0676-Add-EntityInsideBlockEvent.patch @@ -101,7 +101,7 @@ index 63c7f2cf530ac9562960ae5a3cbc6e511a009377..3705452f1b57d3bc1307411c7367529d if (!(Boolean) state.getValue(DetectorRailBlock.POWERED)) { this.checkPressed(world, pos, state); diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java -index cc76a17492a67c1d2b97a8b6cd991db893de4414..834be24478b801d75be96ada91a4f18ccc3ee7b4 100644 +index 2cd9584aae80e5bf40d0a53417692758a17d05d6..739c9c3a49fd3893ac39962a02a5e3620dc4fe06 100644 --- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java +++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java @@ -44,6 +44,7 @@ public class EndPortalBlock extends BaseEntityBlock { diff --git a/patches/server/0676-Attributes-API-for-item-defaults.patch b/patches/server/0677-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0676-Attributes-API-for-item-defaults.patch rename to patches/server/0677-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0677-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0678-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0677-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch rename to patches/server/0678-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch diff --git a/patches/server/0678-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0679-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0678-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0679-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0679-More-Lidded-Block-API.patch b/patches/server/0680-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0679-More-Lidded-Block-API.patch rename to patches/server/0680-More-Lidded-Block-API.patch diff --git a/patches/server/0680-Limit-item-frame-cursors-on-maps.patch b/patches/server/0681-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0680-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0681-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0681-Add-PufferFishStateChangeEvent.patch b/patches/server/0682-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0681-Add-PufferFishStateChangeEvent.patch rename to patches/server/0682-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0682-Add-PlayerKickEvent-causes.patch b/patches/server/0683-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0682-Add-PlayerKickEvent-causes.patch rename to patches/server/0683-Add-PlayerKickEvent-causes.patch index 7959f099e..010bdf05b 100644 --- a/patches/server/0682-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0683-Add-PlayerKickEvent-causes.patch @@ -57,7 +57,7 @@ index 708ac03d5a849bf09c49547306e4a8c5a5ef8d91..5a8df368a4a25839cd4ac9be6972da2e } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b369d400e34fc8b6d161d79c57bcd26d57147ff8..8e7a8e7b6d44255044a34ed374f106435cf1ba07 100644 +index 7ea9f362c19e5f3a67e4b5a46e708014953db480..f1ffabb1226e568b64e3aadd695197d0c9742de8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -321,7 +321,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0683-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0684-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0683-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0684-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0684-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0685-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0684-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0685-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0685-Add-BellRevealRaiderEvent.patch b/patches/server/0686-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0685-Add-BellRevealRaiderEvent.patch rename to patches/server/0686-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0686-Fix-invulnerable-end-crystals.patch b/patches/server/0687-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0686-Fix-invulnerable-end-crystals.patch rename to patches/server/0687-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0687-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0688-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0687-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0688-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0688-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0689-Reset-villager-inventory-on-cancelled-pickup-event.patch similarity index 96% rename from patches/server/0688-Reset-villager-inventory-on-cancelled-pickup-event.patch rename to patches/server/0689-Reset-villager-inventory-on-cancelled-pickup-event.patch index 502eba844..4a6a05338 100644 --- a/patches/server/0688-Reset-villager-inventory-on-cancelled-pickup-event.patch +++ b/patches/server/0689-Reset-villager-inventory-on-cancelled-pickup-event.patch @@ -26,7 +26,7 @@ index 502e29644504aabe3834351d3b479e21bd8f4be7..4e47ea7359ae56efeb2b74161dc9e738 this.transaction.add(who); } diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index ee23149411a49f08d2eb4808ef78cb5a50785977..4591054d5f106f2d630fc7bd3304a8ff7f426007 100644 +index 18b35c8d2160d24c31483edef13cc5e8d93ed09b..27530389690ec329bd92a722e4faf87e367bce91 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -888,15 +888,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/patches/server/0689-Fix-dangerous-end-portal-logic.patch b/patches/server/0690-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0689-Fix-dangerous-end-portal-logic.patch rename to patches/server/0690-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0690-Make-item-validations-configurable.patch b/patches/server/0691-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0690-Make-item-validations-configurable.patch rename to patches/server/0691-Make-item-validations-configurable.patch diff --git a/patches/server/0691-Add-more-line-of-sight-methods.patch b/patches/server/0692-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/server/0691-Add-more-line-of-sight-methods.patch rename to patches/server/0692-Add-more-line-of-sight-methods.patch diff --git a/patches/server/0692-add-per-world-spawn-limits.patch b/patches/server/0693-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0692-add-per-world-spawn-limits.patch rename to patches/server/0693-add-per-world-spawn-limits.patch diff --git a/patches/server/0693-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0694-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0693-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0694-Fix-PotionSplashEvent-for-water-splash-potions.patch