diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index fc709129d9..b5071c6988 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -27,7 +27,7 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943 +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..73bc33e7a498f8eca2d68c4588b04de4eaf8fc7a +index 0000000000000000000000000000000000000000..232cc8fafb1d7d9730cf2f58777e8977995ec28b --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,85 @@ @@ -51,9 +51,9 @@ index 0000000000000000000000000000000000000000..73bc33e7a498f8eca2d68c4588b04de4 + api("org.yaml:snakeyaml:2.0") + api("org.joml:joml:1.10.5") + -+ compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") -+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") -+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") ++ compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") ++ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") ++ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") + + val annotations = "org.jetbrains:annotations-java5:$annotationsVersion" + compileOnly(annotations) @@ -118,7 +118,7 @@ index 0000000000000000000000000000000000000000..73bc33e7a498f8eca2d68c4588b04de4 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index e6d48b5fdc484ed2443ddf1d60079a13ea2c9677..0000000000000000000000000000000000000000 +index d3b75bb8b9cb0623ed9e13226ced09c5fa7c3f2c..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,270 +0,0 @@ @@ -193,19 +193,19 @@ index e6d48b5fdc484ed2443ddf1d60079a13ea2c9677..00000000000000000000000000000000 - - org.apache.maven - maven-resolver-provider -- 3.9.2 +- 3.8.5 - provided - - - org.apache.maven.resolver - maven-resolver-connector-basic -- 1.9.10 +- 1.7.3 - provided - - - org.apache.maven.resolver - maven-resolver-transport-http -- 1.9.10 +- 1.7.3 - provided - - diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch index 4204d5f382..75258f5655 100644 --- a/patches/api/0002-Build-system-changes.patch +++ b/patches/api/0002-Build-system-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index 73bc33e7a498f8eca2d68c4588b04de4eaf8fc7a..34117c1178e04885ff9be5b73c7c2547e77ed4d5 100644 +index 232cc8fafb1d7d9730cf2f58777e8977995ec28b..3faf250d59eeefb8477a6e1454914bdd88ff11d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,15 +17,27 @@ dependencies { @@ -18,9 +18,9 @@ index 73bc33e7a498f8eca2d68c4588b04de4eaf8fc7a..34117c1178e04885ff9be5b73c7c2547 + } + // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") - compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") + compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") + compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") + compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper - val annotations = "org.jetbrains:annotations-java5:$annotationsVersion" diff --git a/patches/api/0004-Add-FastUtil-to-Bukkit.patch b/patches/api/0004-Add-FastUtil-to-Bukkit.patch index fb0060fc79..caffa5647e 100644 --- a/patches/api/0004-Add-FastUtil-to-Bukkit.patch +++ b/patches/api/0004-Add-FastUtil-to-Bukkit.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/build.gradle.kts b/build.gradle.kts -index c174d9d6534382ae9d002b883bde929d46e32789..3e571743e76b26167e329dbd0a4c04ffd6427572 100644 +index 4a5f1737910c1c87838baf01366f20c814a39a8f..3dec6ab39000edd3e90d1bf734d24cc779ce0e3b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,6 +21,7 @@ dependencies { @@ -16,4 +16,4 @@ index c174d9d6534382ae9d002b883bde929d46e32789..3e571743e76b26167e329dbd0a4c04ff + api("it.unimi.dsi:fastutil:8.5.6") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") + compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch index e00d83832d..ba7f181417 100644 --- a/patches/api/0005-Adventure.patch +++ b/patches/api/0005-Adventure.patch @@ -7,7 +7,7 @@ Co-authored-by: zml Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 3e571743e76b26167e329dbd0a4c04ffd6427572..7671b795188adfea56daea2d957e173c8d07c086 100644 +index 3dec6ab39000edd3e90d1bf734d24cc779ce0e3b..cbab63d2f3b045f6193f5a3422ae4b5509d3003b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,13 +8,26 @@ java { @@ -51,7 +51,7 @@ index 3e571743e76b26167e329dbd0a4c04ffd6427572..7671b795188adfea56daea2d957e173c + apiAndDocs("net.kyori:adventure-text-logger-slf4j") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") + compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") @@ -82,10 +102,26 @@ tasks.withType { "https://guava.dev/releases/31.1-jre/api/docs/", "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/", diff --git a/patches/api/0007-Use-ASM-for-event-executors.patch b/patches/api/0007-Use-ASM-for-event-executors.patch index c77657240f..1ba536fbbb 100644 --- a/patches/api/0007-Use-ASM-for-event-executors.patch +++ b/patches/api/0007-Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/build.gradle.kts b/build.gradle.kts -index a6001fec6b8ff6a0d41336802d202e005ad2db81..a626bbad85f8d1b348d4e67f328f4b0141b267c1 100644 +index cbab63d2f3b045f6193f5a3422ae4b5509d3003b..ba6f0a70ba2442dbe60ed6cc92e4fb91a48d9f3b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,6 +42,9 @@ dependencies { @@ -18,7 +18,7 @@ index a6001fec6b8ff6a0d41336802d202e005ad2db81..a626bbad85f8d1b348d4e67f328f4b01 + implementation("org.ow2.asm:asm-commons:9.4") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") + compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java new file mode 100644 index 0000000000000000000000000000000000000000..5b28e9b1daba7834af67dbc193dd656bedd9a994 diff --git a/patches/api/0008-Paper-Plugins.patch b/patches/api/0008-Paper-Plugins.patch index 48a2b45dc9..9be771242d 100644 --- a/patches/api/0008-Paper-Plugins.patch +++ b/patches/api/0008-Paper-Plugins.patch @@ -5,17 +5,17 @@ Subject: [PATCH] Paper Plugins diff --git a/build.gradle.kts b/build.gradle.kts -index a626bbad85f8d1b348d4e67f328f4b0141b267c1..b0ca0ddffce2524e82d891c7a4d69d3ef9f2c097 100644 +index ba6f0a70ba2442dbe60ed6cc92e4fb91a48d9f3b..22b65c3ad4ed6e19b88a51a2e001f0e5846d9ae6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,7 +47,7 @@ dependencies { implementation("org.ow2.asm:asm-commons:9.4") // Paper end -- compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") -+ api("org.apache.maven:maven-resolver-provider:3.9.2") - compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") +- compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") ++ api("org.apache.maven:maven-resolver-provider:3.8.5") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") + compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper diff --git a/src/main/java/io/papermc/paper/plugin/PermissionManager.java b/src/main/java/io/papermc/paper/plugin/PermissionManager.java new file mode 100644 diff --git a/patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch index afc3f45d28..c25fbd796f 100644 --- a/patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch +++ b/patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add API to get exact interaction point in PlayerInteractEvent diff --git a/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java b/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java -index 1208e1f8c2163d83c5b12bbb9b7ac044c72380e0..a01f86e6aba8b66ecc713da0787cd861e2930a2a 100644 +index ed72095b5cf669d9f25852e8ef772a710c54012a..ddea08e4de2198a0a7565e2fd7a05571ed48f27b 100644 --- a/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerInteractEvent.java @@ -1,5 +1,6 @@ @@ -15,39 +15,17 @@ index 1208e1f8c2163d83c5b12bbb9b7ac044c72380e0..a01f86e6aba8b66ecc713da0787cd861 import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -@@ -34,22 +35,30 @@ public class PlayerInteractEvent extends PlayerEvent implements Cancellable { - private Result useClickedBlock; - private Result useItemInHand; - private EquipmentSlot hand; -+ private Location interactionPoint; // Paper - - public PlayerInteractEvent(@NotNull final Player who, @NotNull final Action action, @Nullable final ItemStack item, @Nullable final Block clickedBlock, @NotNull final BlockFace clickedFace) { - this(who, action, item, clickedBlock, clickedFace, EquipmentSlot.HAND); - } - - public PlayerInteractEvent(@NotNull final Player who, @NotNull final Action action, @Nullable final ItemStack item, @Nullable final Block clickedBlock, @NotNull final BlockFace clickedFace, @Nullable final EquipmentSlot hand) { -+ // Paper start - Add interactionPoint -+ this(who, action, item, clickedBlock, clickedFace, hand, null); -+ } -+ -+ public PlayerInteractEvent(@NotNull final Player who, @NotNull final Action action, @Nullable final ItemStack item, @Nullable final Block clickedBlock, @NotNull final BlockFace clickedFace, @Nullable final EquipmentSlot hand, @Nullable final Location interactionPoint) { - super(who); - this.action = action; - this.item = item; - this.blockClicked = clickedBlock; - this.blockFace = clickedFace; - this.hand = hand; -+ this.interactionPoint = interactionPoint; - - useItemInHand = Result.DEFAULT; - useClickedBlock = clickedBlock == null ? Result.DENY : Result.ALLOW; - } -+ // Paper end - - /** - * Returns the action type -@@ -221,6 +230,18 @@ public class PlayerInteractEvent extends PlayerEvent implements Cancellable { - return hand; +@@ -234,13 +235,30 @@ public class PlayerInteractEvent extends PlayerEvent implements Cancellable { + *

+ * All vector components are between 0.0 and 1.0 inclusive. + * ++ * @deprecated misleading, use {@link #getInteractionPoint()} + * @return the clicked position. May be null. + */ + @Nullable ++ @Deprecated // Paper + public Vector getClickedPosition() { + return clickedPosistion; } + // Paper start @@ -58,7 +36,10 @@ index 1208e1f8c2163d83c5b12bbb9b7ac044c72380e0..a01f86e6aba8b66ecc713da0787cd861 + */ + @Nullable + public Location getInteractionPoint() { -+ return interactionPoint; ++ if (this.blockClicked == null || this.clickedPosistion == null) { ++ return null; ++ } ++ return this.blockClicked.getLocation().add(this.clickedPosistion); + } + // Paper end + diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index a98810c6eb..35eeac6761 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -28,7 +28,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..9a355bbbe57629d0b66f8260ecf461e3bf1a539b +index 0000000000000000000000000000000000000000..f7d5f785f659aa905000d974f573e43f841e7fc0 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,138 @@ @@ -51,9 +51,9 @@ index 0000000000000000000000000000000000000000..9a355bbbe57629d0b66f8260ecf461e3 + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.0.33") + -+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2") -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") ++ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") + + testImplementation("junit:junit:4.13.2") + testImplementation("org.hamcrest:hamcrest-library:1.3") @@ -172,7 +172,7 @@ index 0000000000000000000000000000000000000000..9a355bbbe57629d0b66f8260ecf461e3 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index ccb57a056138549ec39ddaef2f09590b1fddd127..0000000000000000000000000000000000000000 +index 76dce1e84f5f8f61a866eb3bbdc3e23cc8cc7a5a..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,587 +0,0 @@ @@ -419,19 +419,19 @@ index ccb57a056138549ec39ddaef2f09590b1fddd127..00000000000000000000000000000000 - - org.apache.maven - maven-resolver-provider -- 3.9.2 +- 3.8.5 - runtime - - - org.apache.maven.resolver - maven-resolver-connector-basic -- 1.9.10 +- 1.7.3 - runtime - - - org.apache.maven.resolver - maven-resolver-transport-http -- 1.9.10 +- 1.7.3 - runtime - - diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch index ee402ab423..95cec40b68 100644 --- a/patches/server/0010-Adventure.patch +++ b/patches/server/0010-Adventure.patch @@ -2387,7 +2387,7 @@ index ba89c0d7ae99e53350249365d0e035e6f14e1c5f..dc87e56cfcd59bc1505f5b3c0363038e // CraftBukkit end this.chatVisibility = packet.chatVisibility(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a7b85cf4fbdb04747e46f49293a2e63c744cdc5e..fa3d02895d57c17416e742d2ea1e51253bce4fad 100644 +index c77e561ab7598846cb3de2aaee3e59e34d48215f..9e47f748ff6ccdb5791828ac8c41684ba2682fbd 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -187,6 +187,8 @@ import net.minecraft.world.phys.shapes.VoxelShape; @@ -3653,7 +3653,7 @@ index 446fdca49a5a6999626a7ee3a1d5c168b15a09dd..f9863e138994f6c7a7975a852f106faa public boolean isOp() { return true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 39a6c870c08ae5847dc5859316b1b616b3a0fa5b..41ec9e0adb2a17f8cab4fb1f1735d8b2679f92d0 100644 +index 02b62fa3b5a472728c5f2daaa15b2595c8f01864..a513bef2e9b9329f129cc2d5028815e2a0b1b14b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -286,14 +286,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -4148,10 +4148,10 @@ index 2becf197a5c2d94f23f72a9b20cb2cd05a0807df..99096c1e3f045e4a99335faedfb8e77e @Override public int getLineWidth() { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 5f994a64bf29545a528b91604c1f2e19bcfd9b2f..e0bb58d92e47516138261a673b56c5f8ce68a59c 100644 +index eb2b9aa73913ef6dde8e0909dbd4064f0147ead0..551fd24885cee87a3ca579f2f4bf0a18b9505e79 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -838,9 +838,9 @@ public class CraftEventFactory { +@@ -846,9 +846,9 @@ public class CraftEventFactory { return event; } @@ -4163,7 +4163,7 @@ index 5f994a64bf29545a528b91604c1f2e19bcfd9b2f..e0bb58d92e47516138261a673b56c5f8 event.setKeepInventory(keepInventory); event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel org.bukkit.World world = entity.getWorld(); -@@ -865,7 +865,7 @@ public class CraftEventFactory { +@@ -873,7 +873,7 @@ public class CraftEventFactory { * Server methods */ public static ServerListPingEvent callServerListPingEvent(Server craftServer, InetAddress address, String motd, int numPlayers, int maxPlayers) { @@ -4570,7 +4570,7 @@ index 507fa96a3fb904b74429df5756c9a6378ec8c5b7..abb9e88abc74135284b941e040d40586 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 02856de529023f4d63440e2f2cef28e41f2103a7..b01c268d179591a0113e4bfb46f3d6d22933efaf 100644 +index 03e5058810553be884c87f9f7b793cb5fadb7284..44244166ec4e8ac070404101219efbc0e5f1d168 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -749,6 +749,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch index b52904d516..2dda8ef42d 100644 --- a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch +++ b/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch @@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the ItemMeta API equivalents, and should deprecate the old API's. diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 2e948330c4951e3df7091fa870573f163d2af286..4b19057fba6c6645dc79f6572a3fb01cb2c4c26c 100644 +index 6758e72177c0a407cf6c392b10263f095e4d06e8..369f7d470fc6f7235fc5bd6b67e16c4182d5ed36 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -156,6 +156,23 @@ public final class ItemStack { @@ -168,7 +168,7 @@ index 34a54a99e7484b2934e1d174c1b55f0472ff3812..7fd9a3a7f4cb98d89b7c4cbfda756d58 static Map getEnchantments(net.minecraft.world.item.ItemStack item) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index b01c268d179591a0113e4bfb46f3d6d22933efaf..bfd5661d55a6ed767cb3bed2d9bb24535c1f7335 100644 +index 44244166ec4e8ac070404101219efbc0e5f1d168..092695d4b45205fe2290f8f4375e881aaf89817d 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList; @@ -280,7 +280,7 @@ index b01c268d179591a0113e4bfb46f3d6d22933efaf..bfd5661d55a6ed767cb3bed2d9bb2453 } if (this.hasAttributeModifiers()) { clone.attributeModifiers = LinkedHashMultimap.create(this.attributeModifiers); -@@ -1464,4 +1467,22 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1469,4 +1472,22 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { return CraftMetaItem.HANDLED_TAGS; } } diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/server/0109-Add-EntityZapEvent.patch index 83e60f2e1a..5655f89084 100644 --- a/patches/server/0109-Add-EntityZapEvent.patch +++ b/patches/server/0109-Add-EntityZapEvent.patch @@ -28,10 +28,10 @@ index f9704b20e71564ac721a24655b2792c689edf6ba..e04f3f1159c5d5fa2e3956a36e95f8af entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null); entitywitch.setNoAi(this.isNoAi()); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e0bb58d92e47516138261a673b56c5f8ce68a59c..d3584001c92593d4471eeb473b345d30d4dc960e 100644 +index 551fd24885cee87a3ca579f2f4bf0a18b9505e79..a6fa9f85835ca2ced58a0564b8f31527698885bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1193,6 +1193,14 @@ public class CraftEventFactory { +@@ -1201,6 +1201,14 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch index 7b01ee8998..af34f88564 100644 --- a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch +++ b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch @@ -18,10 +18,10 @@ index 93c83cfedc7d3a169ad0504aa6e63f600873501b..9dffdfe5bbd0517e9a2c6a6770eea07b --this.count; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d3584001c92593d4471eeb473b345d30d4dc960e..192d48ed576b2918d7cce9a4969bcf2db17da9d7 100644 +index a6fa9f85835ca2ced58a0564b8f31527698885bb..e9094e0d5b84f9427353ab903da15c748e14a2c1 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1152,6 +1152,17 @@ public class CraftEventFactory { +@@ -1160,6 +1160,17 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/server/0114-Add-ProjectileCollideEvent.patch index c2c4d8c42a..ab2d1ada57 100644 --- a/patches/server/0114-Add-ProjectileCollideEvent.patch +++ b/patches/server/0114-Add-ProjectileCollideEvent.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add ProjectileCollideEvent Deprecated now and replaced with ProjectileHitEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 192d48ed576b2918d7cce9a4969bcf2db17da9d7..f882b007756edc2f25e913393b7e8b400ccbe50e 100644 +index e9094e0d5b84f9427353ab903da15c748e14a2c1..8e8401dec4d3157a05216b790db5481ec8e0495a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1296,6 +1296,17 @@ public class CraftEventFactory { +@@ -1304,6 +1304,17 @@ public class CraftEventFactory { return CraftItemStack.asNMSCopy(bitem); } @@ -27,7 +27,7 @@ index 192d48ed576b2918d7cce9a4969bcf2db17da9d7..f882b007756edc2f25e913393b7e8b40 public static ProjectileLaunchEvent callProjectileLaunchEvent(Entity entity) { Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); -@@ -1320,8 +1331,15 @@ public class CraftEventFactory { +@@ -1328,8 +1339,15 @@ public class CraftEventFactory { if (position.getType() == HitResult.Type.ENTITY) { hitEntity = ((EntityHitResult) position).getEntity().getBukkitEntity(); } diff --git a/patches/server/0175-Add-ArmorStand-Item-Meta.patch b/patches/server/0175-Add-ArmorStand-Item-Meta.patch index 382ebbe746..ce31026c13 100644 --- a/patches/server/0175-Add-ArmorStand-Item-Meta.patch +++ b/patches/server/0175-Add-ArmorStand-Item-Meta.patch @@ -255,10 +255,10 @@ index 4017933f2244fca32cf9d39444f3a4f550e8af01..e721517ce7b52a1aa10d039aa9f309eb + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index bfd5661d55a6ed767cb3bed2d9bb24535c1f7335..01e09dfc00b2ae9ecd39bea37f229ad826de121c 100644 +index 092695d4b45205fe2290f8f4375e881aaf89817d..8ada3a7c5539293d4e2c1a5b83e00fc2542f10ff 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -1457,6 +1457,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1462,6 +1462,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { CraftMetaCrossbow.CHARGED.NBT, CraftMetaCrossbow.CHARGED_PROJECTILES.NBT, CraftMetaSuspiciousStew.EFFECTS.NBT, diff --git a/patches/server/0216-InventoryCloseEvent-Reason-API.patch b/patches/server/0216-InventoryCloseEvent-Reason-API.patch index 4a56c9aea7..fd0e67f902 100644 --- a/patches/server/0216-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0216-InventoryCloseEvent-Reason-API.patch @@ -75,7 +75,7 @@ index dda3b911fcaa294ec7b8e9d696880fcb8325f69c..8e2340ca473c8cacfe9d888091834986 this.doCloseContainer(); } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 391295bf6898320421272ad5dfb14e4c5e2d2be0..92d359cfbe6fc5ae6be4931754cdf48ccd92ba13 100644 +index 5cac531de81a38fa79826e65477c5e31f9af35cd..925ef9f0f8b6d65a206c1b301f39a2571d3d4c82 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -220,6 +220,7 @@ import org.bukkit.event.inventory.ClickType; @@ -173,7 +173,7 @@ index f59733b6918dcbbb2190f76d8b8841a2d8818cdf..ba6105a970381d642cd7955754cc4713 @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 70b499e4c6d50cb55219033fd67356295239316a..dceea046eb4becbfa7be8bd91459f7aabea27914 100644 +index 2072778d96fc5616ec6e6b85b29585fbb43775bb..0561e8cf242d9da126779d3beba46cbc7d59a7a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1182,7 +1182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -186,10 +186,10 @@ index 70b499e4c6d50cb55219033fd67356295239316a..dceea046eb4becbfa7be8bd91459f7aa // Check if the fromWorld and toWorld are the same. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f882b007756edc2f25e913393b7e8b400ccbe50e..1a0a4f2d94b65179426d7b5715847e5ed19489b5 100644 +index 8e8401dec4d3157a05216b790db5481ec8e0495a..6cf79ea58448853a6e8f26609b1b8987d30588a6 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1265,7 +1265,7 @@ public class CraftEventFactory { +@@ -1273,7 +1273,7 @@ public class CraftEventFactory { public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) { if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open @@ -198,7 +198,7 @@ index f882b007756edc2f25e913393b7e8b400ccbe50e..1a0a4f2d94b65179426d7b5715847e5e } CraftServer server = player.level().getCraftServer(); -@@ -1439,8 +1439,18 @@ public class CraftEventFactory { +@@ -1447,8 +1447,18 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index 88ab68ad27..6c8e36d816 100644 --- a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread diff --git a/build.gradle.kts b/build.gradle.kts -index 588d5370a10de25f80022d64abb8af0f16ce943b..de1586eb07570ab7daf1775550522bb911699d0e 100644 +index a06b75a78ab96229a6e9b97de913df9050325c04..d5602e9020ff233b93987140d143ff5d00154b1c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,6 +30,7 @@ dependencies { @@ -14,8 +14,8 @@ index 588d5370a10de25f80022d64abb8af0f16ce943b..de1586eb07570ab7daf1775550522bb9 runtimeOnly("com.mysql:mysql-connector-j:8.0.33") + runtimeOnly("com.lmax:disruptor:3.4.4") // Paper - runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2") - runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") + runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 88957220d5574e5590e8a545605d76c0c7b0a10e..ea4e2161c0bd43884055cc6b8d70b2139f70e720 100644 --- a/src/main/resources/log4j2.xml diff --git a/patches/server/0226-Vanished-players-don-t-have-rights.patch b/patches/server/0226-Vanished-players-don-t-have-rights.patch index 957e9557c2..c21faa773c 100644 --- a/patches/server/0226-Vanished-players-don-t-have-rights.patch +++ b/patches/server/0226-Vanished-players-don-t-have-rights.patch @@ -89,10 +89,10 @@ index 1beff41c02fb4c22b5474da7c514be2f50f16055..8a53284a5846b25864352e18a5e6b2de public boolean isClientSide() { return this.isClientSide; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 1a0a4f2d94b65179426d7b5715847e5ed19489b5..2bb2c3ae7584d45ab9e32f1b9d0fa848e8667fc0 100644 +index 6cf79ea58448853a6e8f26609b1b8987d30588a6..dff2623112aa09a585d5110e9039c2034b5f0928 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1302,6 +1302,14 @@ public class CraftEventFactory { +@@ -1310,6 +1310,14 @@ public class CraftEventFactory { Projectile projectile = (Projectile) entity.getBukkitEntity(); org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity(); com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided); diff --git a/patches/server/0253-Improve-death-events.patch b/patches/server/0253-Improve-death-events.patch index 917a7f6ffd..35e2933348 100644 --- a/patches/server/0253-Improve-death-events.patch +++ b/patches/server/0253-Improve-death-events.patch @@ -357,7 +357,7 @@ index 719f68f96e58ddcdd3592131c691d21263c81915..4413b609f1250cf9477fcb3fecd7b67a this.gameEvent(GameEvent.ENTITY_DIE); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 91b858ef2ef063b5f91dc017836d37e19b329101..e572dbdbd02e6b7307172e0b6f80d9b6e7fbce60 100644 +index 56b7d7fb2a317a1a7a7f461ddb6667e01117ec90..dc0802c35836009d2411135d91a25de0746e64e6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2248,7 +2248,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -377,10 +377,10 @@ index 91b858ef2ef063b5f91dc017836d37e19b329101..e572dbdbd02e6b7307172e0b6f80d9b6 public void injectScaledMaxHealth(Collection collection, boolean force) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2bb2c3ae7584d45ab9e32f1b9d0fa848e8667fc0..e8783b2c7083c847770e9f08e796b58e9f8ea6ec 100644 +index dff2623112aa09a585d5110e9039c2034b5f0928..3ab9346bfd4efc27abdaed69fba365c3fa262d47 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -824,9 +824,16 @@ public class CraftEventFactory { +@@ -832,9 +832,16 @@ public class CraftEventFactory { public static EntityDeathEvent callEntityDeathEvent(net.minecraft.world.entity.LivingEntity victim, List drops) { CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity(); EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward()); @@ -397,7 +397,7 @@ index 2bb2c3ae7584d45ab9e32f1b9d0fa848e8667fc0..e8783b2c7083c847770e9f08e796b58e victim.expToDrop = event.getDroppedExp(); for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { -@@ -843,8 +850,15 @@ public class CraftEventFactory { +@@ -851,8 +858,15 @@ public class CraftEventFactory { PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage, stringDeathMessage); // Paper - Adventure event.setKeepInventory(keepInventory); event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel @@ -413,7 +413,7 @@ index 2bb2c3ae7584d45ab9e32f1b9d0fa848e8667fc0..e8783b2c7083c847770e9f08e796b58e victim.keepLevel = event.getKeepLevel(); victim.newLevel = event.getNewLevel(); -@@ -861,6 +875,31 @@ public class CraftEventFactory { +@@ -869,6 +883,31 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index 5b6a8a9f46..91b9e0e37b 100644 --- a/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 01e09dfc00b2ae9ecd39bea37f229ad826de121c..7c803a928f41938c03b0239cf04e2ee765ecefb8 100644 +index 8ada3a7c5539293d4e2c1a5b83e00fc2542f10ff..d7102d83bb781b6cf296cf9c637f8270f4ee8b14 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -83,6 +83,12 @@ import org.bukkit.persistence.PersistentDataContainer; @@ -244,7 +244,7 @@ index 01e09dfc00b2ae9ecd39bea37f229ad826de121c..7c803a928f41938c03b0239cf04e2ee7 final Map internalTags = new HashMap(this.unhandledTags); this.serializeInternal(internalTags); if (!internalTags.isEmpty()) { -@@ -1464,6 +1605,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1469,6 +1610,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { CraftMetaArmorStand.SHOW_ARMS.NBT, CraftMetaArmorStand.SMALL.NBT, CraftMetaArmorStand.MARKER.NBT, @@ -253,7 +253,7 @@ index 01e09dfc00b2ae9ecd39bea37f229ad826de121c..7c803a928f41938c03b0239cf04e2ee7 // Paper end CraftMetaCompass.LODESTONE_DIMENSION.NBT, CraftMetaCompass.LODESTONE_POS.NBT, -@@ -1493,4 +1636,146 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1498,4 +1641,146 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { } // Paper end diff --git a/patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch index c28dd4a82b..ac4409c49c 100644 --- a/patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch +++ b/patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e8783b2c7083c847770e9f08e796b58e9f8ea6ec..8fbe5a10ba6eeff70c9b4907717c281b6f30a454 100644 +index 3ab9346bfd4efc27abdaed69fba365c3fa262d47..7b46cf7f39f77d593bbf1a4abe500077ab580166 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -366,13 +366,18 @@ public class CraftEventFactory { +@@ -369,13 +369,18 @@ public class CraftEventFactory { } org.bukkit.inventory.ItemStack item; diff --git a/patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch index 95bd7a94e7..bc698eb6fb 100644 --- a/patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -135,10 +135,10 @@ index 4413b609f1250cf9477fcb3fecd7b67afee0b896..101e3a1f0f52b67b55c99c2619cc4329 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 8fbe5a10ba6eeff70c9b4907717c281b6f30a454..f9f9292a99bf35d49916e1380781cc9bc0e19842 100644 +index 7b46cf7f39f77d593bbf1a4abe500077ab580166..a6b0433b36c9b21871166384cee734a9c0dfbe82 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -827,6 +827,11 @@ public class CraftEventFactory { +@@ -835,6 +835,11 @@ public class CraftEventFactory { } public static EntityDeathEvent callEntityDeathEvent(net.minecraft.world.entity.LivingEntity victim, List drops) { @@ -150,7 +150,7 @@ index 8fbe5a10ba6eeff70c9b4907717c281b6f30a454..f9f9292a99bf35d49916e1380781cc9b CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity(); EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward()); populateFields(victim, event); // Paper - make cancellable -@@ -840,11 +845,13 @@ public class CraftEventFactory { +@@ -848,11 +853,13 @@ public class CraftEventFactory { playDeathSound(victim, event); // Paper end victim.expToDrop = event.getDroppedExp(); diff --git a/patches/server/0393-Implement-Mob-Goal-API.patch b/patches/server/0393-Implement-Mob-Goal-API.patch index 13ff8a4c78..181ec50cdb 100644 --- a/patches/server/0393-Implement-Mob-Goal-API.patch +++ b/patches/server/0393-Implement-Mob-Goal-API.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/build.gradle.kts b/build.gradle.kts -index 4162d6a040a20a4ef8e1adb90f215a8d80fb48a3..d63f6a46244b9dd133f12e9cfae16c8cf3b394da 100644 +index 24cc85285f221cee63eb6feb2aabc3e193d76dd7..e3e6318e0c83ae6f6ff699918ab0faff9f84c63d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,6 +38,7 @@ dependencies { - runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") - runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") + runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") + testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test testImplementation("junit:junit:4.13.2") diff --git a/patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch index d4ec4f243f..65da6f15f8 100644 --- a/patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f9f9292a99bf35d49916e1380781cc9bc0e19842..e8532d35f8c3bf10e5c9c17839dbce2bf927ec77 100644 +index a6b0433b36c9b21871166384cee734a9c0dfbe82..c3a524da52b9588746a13f2107bfbef2af1a5d50 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -648,16 +648,30 @@ public class CraftEventFactory { +@@ -656,16 +656,30 @@ public class CraftEventFactory { net.minecraft.world.entity.ExperienceOrb xp = (net.minecraft.world.entity.ExperienceOrb) entity; double radius = world.spigotConfig.expMerge; if (radius > 0) { diff --git a/patches/server/0396-ExperienceOrbMergeEvent.patch b/patches/server/0396-ExperienceOrbMergeEvent.patch index a2a81f9fa5..5ea88275be 100644 --- a/patches/server/0396-ExperienceOrbMergeEvent.patch +++ b/patches/server/0396-ExperienceOrbMergeEvent.patch @@ -9,10 +9,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e8532d35f8c3bf10e5c9c17839dbce2bf927ec77..f35cba8f45f96cd9504ccce73fea592532c36702 100644 +index c3a524da52b9588746a13f2107bfbef2af1a5d50..7d1c551e92b6f2eb183bbb206bd3b19af907c31b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -658,7 +658,7 @@ public class CraftEventFactory { +@@ -666,7 +666,7 @@ public class CraftEventFactory { if (e instanceof net.minecraft.world.entity.ExperienceOrb) { net.minecraft.world.entity.ExperienceOrb loopItem = (net.minecraft.world.entity.ExperienceOrb) e; // Paper start diff --git a/patches/server/0432-Support-components-in-ItemMeta.patch b/patches/server/0432-Support-components-in-ItemMeta.patch index 45ae7502c3..d08ab5c3a5 100644 --- a/patches/server/0432-Support-components-in-ItemMeta.patch +++ b/patches/server/0432-Support-components-in-ItemMeta.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 3d500e8be2478840669b236421c6908f8d288014..fa94030ac80c8c68ee429e6b7350395208e4348f 100644 +index d1f21b5f5600dba41a93378853aadacd24f4a1f3..b34f364f8580ae900e25ef3f31f58f4e8fee88e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -877,11 +877,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @@ -79,5 +79,5 @@ index 3d500e8be2478840669b236421c6908f8d288014..fa94030ac80c8c68ee429e6b73503952 + } else + // Paper end if (!(object instanceof String)) { - Preconditions.checkArgument(object == null, "%s cannot contain non-string %s", addFrom, object.getClass().getName()); - + if (object != null) { + // SPIGOT-7399: Null check via if is important, diff --git a/patches/server/0437-Add-PrepareResultEvent.patch b/patches/server/0437-Add-PrepareResultEvent.patch index b01a35ac4d..35927da451 100644 --- a/patches/server/0437-Add-PrepareResultEvent.patch +++ b/patches/server/0437-Add-PrepareResultEvent.patch @@ -94,10 +94,10 @@ index 8734a129244271b370f965fcbf488a14ce04684a..00f01ab2eff69c18b50ec07b7623af66 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 f35cba8f45f96cd9504ccce73fea592532c36702..019a486f40256771341358509a5abe0b1284d248 100644 +index 7d1c551e92b6f2eb183bbb206bd3b19af907c31b..5d5b1c2ec06680516fd6058a1b22ba7169dd50d4 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1628,26 +1628,53 @@ public class CraftEventFactory { +@@ -1636,26 +1636,53 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0455-Add-BellRingEvent.patch b/patches/server/0455-Add-BellRingEvent.patch index f9865e6e0b..1fdfe17e72 100644 --- a/patches/server/0455-Add-BellRingEvent.patch +++ b/patches/server/0455-Add-BellRingEvent.patch @@ -7,10 +7,10 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a village bell. Passes along the bell block and the player who rang it. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 019a486f40256771341358509a5abe0b1284d248..9761302bb1ca66242ae46d26001837dd881cb9fa 100644 +index 5d5b1c2ec06680516fd6058a1b22ba7169dd50d4..6ea51428a8abfdceff1eb0ae1469ef05c88803ee 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -332,10 +332,11 @@ public class CraftEventFactory { +@@ -335,10 +335,11 @@ public class CraftEventFactory { return tradeSelectEvent; } diff --git a/patches/server/0509-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0509-Add-OBSTRUCTED-reason-to-BedEnterResult.patch index 92a22c8ba6..14cb165548 100644 --- a/patches/server/0509-Add-OBSTRUCTED-reason-to-BedEnterResult.patch +++ b/patches/server/0509-Add-OBSTRUCTED-reason-to-BedEnterResult.patch @@ -5,10 +5,10 @@ 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 9761302bb1ca66242ae46d26001837dd881cb9fa..0c177a3165ea61bf31f030111084920a3a048256 100644 +index 6ea51428a8abfdceff1eb0ae1469ef05c88803ee..98db6ecab2ae7adf24d415e743c78731d9cd03f7 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -267,6 +267,10 @@ public class CraftEventFactory { +@@ -270,6 +270,10 @@ public class CraftEventFactory { return BedEnterResult.TOO_FAR_AWAY; case NOT_SAFE: return BedEnterResult.NOT_SAFE; diff --git a/patches/server/0528-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0528-Implemented-BlockFailedDispenseEvent.patch index b1b85563fe..068438410c 100644 --- a/patches/server/0528-Implemented-BlockFailedDispenseEvent.patch +++ b/patches/server/0528-Implemented-BlockFailedDispenseEvent.patch @@ -32,10 +32,10 @@ index 1415ad60163f6584619cc7caa61f1848d6ebaa93..801c4c120e98584bcf218a4ef9bd66d7 } 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 0c177a3165ea61bf31f030111084920a3a048256..edd27b8e2535b520c4f6e6309269ab84799f2a3a 100644 +index 98db6ecab2ae7adf24d415e743c78731d9cd03f7..acc292bd5f22e0d20279f5abcb4f12eae84649e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1920,4 +1920,12 @@ public class CraftEventFactory { +@@ -1928,4 +1928,12 @@ public class CraftEventFactory { return !event.isCancelled(); } diff --git a/patches/server/0533-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0533-Implement-API-to-expose-exact-interaction-point.patch deleted file mode 100644 index b411c78421..0000000000 --- a/patches/server/0533-Implement-API-to-expose-exact-interaction-point.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Madeline Miller -Date: Mon, 4 Jan 2021 16:40:27 +1000 -Subject: [PATCH] Implement API to expose exact interaction point - - -diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 180dc7ec0202fd6c24682631dedc066976f17fa4..43221bf57fb4eeb70823c12b48f4df0bb817eb0b 100644 ---- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -517,7 +517,7 @@ public class ServerPlayerGameMode { - cancelledBlock = true; - } - -- PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, hand); -+ PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, hand, hitResult.getLocation()); // Paper - this.firedInteract = true; - 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 edd27b8e2535b520c4f6e6309269ab84799f2a3a..3799eec69ef45c77e032faee91ce45205dcd3675 100644 ---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -58,7 +58,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; - import net.minecraft.world.phys.BlockHitResult; - import net.minecraft.world.phys.EntityHitResult; - import net.minecraft.world.phys.HitResult; -+import net.minecraft.world.phys.Vec3; - import org.bukkit.Bukkit; -+import org.bukkit.Location; // Paper - import org.bukkit.Material; - import org.bukkit.NamespacedKey; - import org.bukkit.Server; -@@ -492,7 +494,13 @@ public class CraftEventFactory { - return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, false, hand); - } - -+ // Paper start - Add interactionPoint - public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, InteractionHand hand) { -+ return callPlayerInteractEvent(who, action, position, direction, itemstack, cancelledBlock, hand, null); -+ } -+ -+ public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, InteractionHand hand, Vec3 hitVec) { -+ // Paper end - Player player = (who == null) ? null : (Player) who.getBukkitEntity(); - CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack); - -@@ -518,7 +526,10 @@ public class CraftEventFactory { - itemInHand = null; - } - -- PlayerInteractEvent event = new PlayerInteractEvent(player, action, itemInHand, blockClicked, blockFace, (hand == null) ? null : ((hand == InteractionHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND)); -+ // Paper start -+ Location interactionPoint = hitVec == null ? null : new Location(craftWorld, hitVec.x, hitVec.y, hitVec.z); -+ PlayerInteractEvent event = new PlayerInteractEvent(player, action, itemInHand, blockClicked, blockFace, (hand == null) ? null : ((hand == InteractionHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND), interactionPoint); -+ // Paper end - if (cancelledBlock) { - event.setUseInteractedBlock(Event.Result.DENY); - } diff --git a/patches/server/0534-Remove-stale-POIs.patch b/patches/server/0533-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0534-Remove-stale-POIs.patch rename to patches/server/0533-Remove-stale-POIs.patch diff --git a/patches/server/0535-Fix-villager-boat-exploit.patch b/patches/server/0534-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0535-Fix-villager-boat-exploit.patch rename to patches/server/0534-Fix-villager-boat-exploit.patch diff --git a/patches/server/0536-Add-sendOpLevel-API.patch b/patches/server/0535-Add-sendOpLevel-API.patch similarity index 95% rename from patches/server/0536-Add-sendOpLevel-API.patch rename to patches/server/0535-Add-sendOpLevel-API.patch index 64ad4215e0..d521837944 100644 --- a/patches/server/0536-Add-sendOpLevel-API.patch +++ b/patches/server/0535-Add-sendOpLevel-API.patch @@ -32,7 +32,7 @@ index 13e2fb9e48ed8722b68b2ce2994d9d84bb22cee4..600bb44d97b477960108ea8cd84a8e73 public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e163daf31a1e3318f9127920e5ef0d36af2f6664..0906de2fb92cbdcc47ed1b2393430a7ac33ae920 100644 +index 94c3fe30679be2004b92b542b4be9766c0e77b9d..aa14be1871aa069b45004829912392e9fbf27990 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -631,6 +631,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0537-TODO-Registry-Modification-API.patch b/patches/server/0536-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0537-TODO-Registry-Modification-API.patch rename to patches/server/0536-TODO-Registry-Modification-API.patch diff --git a/patches/server/0538-Add-StructuresLocateEvent.patch b/patches/server/0537-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0538-Add-StructuresLocateEvent.patch rename to patches/server/0537-Add-StructuresLocateEvent.patch diff --git a/patches/server/0539-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0538-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0539-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0538-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0540-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0539-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0540-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0539-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0541-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0540-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0541-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0540-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0542-Make-schedule-command-per-world.patch b/patches/server/0541-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0542-Make-schedule-command-per-world.patch rename to patches/server/0541-Make-schedule-command-per-world.patch diff --git a/patches/server/0543-Configurable-max-leash-distance.patch b/patches/server/0542-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0543-Configurable-max-leash-distance.patch rename to patches/server/0542-Configurable-max-leash-distance.patch diff --git a/patches/server/0544-Implement-BlockPreDispenseEvent.patch b/patches/server/0543-Implement-BlockPreDispenseEvent.patch similarity index 93% rename from patches/server/0544-Implement-BlockPreDispenseEvent.patch rename to patches/server/0543-Implement-BlockPreDispenseEvent.patch index 3749486d75..b9fac44ca0 100644 --- a/patches/server/0544-Implement-BlockPreDispenseEvent.patch +++ b/patches/server/0543-Implement-BlockPreDispenseEvent.patch @@ -17,10 +17,10 @@ index 9ec043ff2cd38e589066a3eb7f42834e4e7592cf..4720b884e1e311f44a012f1219fe648a 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 3799eec69ef45c77e032faee91ce45205dcd3675..2567c229eb14a8bf54cd99e852a4c31fde86646d 100644 +index acc292bd5f22e0d20279f5abcb4f12eae84649e0..f37ec9043069bc683485a2c766168a1c1979e208 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1938,5 +1938,11 @@ public class CraftEventFactory { +@@ -1935,5 +1935,11 @@ public class CraftEventFactory { io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block); return event.callEvent(); } diff --git a/patches/server/0545-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0544-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0545-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0544-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0546-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0545-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0546-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0545-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0547-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0546-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0547-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0546-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0548-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0547-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 98% rename from patches/server/0548-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0547-Add-dropLeash-variable-to-EntityUnleashEvent.patch index fdcf6c0771..ca8874c501 100644 --- a/patches/server/0548-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/patches/server/0547-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -122,10 +122,10 @@ index 16784fcc853e23689a854e7dc6c03ed8182a164e..4eb97572a97a8d98af37c4223f42fc63 flag1 = true; } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2567c229eb14a8bf54cd99e852a4c31fde86646d..2dc961eedf4da8175bad709fbb9f0fcce7d23330 100644 +index f37ec9043069bc683485a2c766168a1c1979e208..381ff70e1b5af9dbe084292bc44d0f4d9d077702 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1562,8 +1562,10 @@ public class CraftEventFactory { +@@ -1559,8 +1559,10 @@ public class CraftEventFactory { return itemInHand; } diff --git a/patches/server/0549-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0548-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0549-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0548-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0550-add-DragonEggFormEvent.patch b/patches/server/0549-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0550-add-DragonEggFormEvent.patch rename to patches/server/0549-add-DragonEggFormEvent.patch diff --git a/patches/server/0551-EntityMoveEvent.patch b/patches/server/0550-EntityMoveEvent.patch similarity index 100% rename from patches/server/0551-EntityMoveEvent.patch rename to patches/server/0550-EntityMoveEvent.patch diff --git a/patches/server/0552-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0551-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0552-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0551-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0553-Inline-shift-direction-fields.patch b/patches/server/0552-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0553-Inline-shift-direction-fields.patch rename to patches/server/0552-Inline-shift-direction-fields.patch diff --git a/patches/server/0554-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0553-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 92% rename from patches/server/0554-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0553-Allow-adding-items-to-BlockDropItemEvent.patch index 64ee1fccfe..17b8d4564a 100644 --- a/patches/server/0554-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/patches/server/0553-Allow-adding-items-to-BlockDropItemEvent.patch @@ -5,10 +5,10 @@ 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 2dc961eedf4da8175bad709fbb9f0fcce7d23330..64e1e46bd6c4b225fe9b86c4cf632b9bb1c4af09 100644 +index 381ff70e1b5af9dbe084292bc44d0f4d9d077702..440edfe374b44e6da34975398db1ece28b7a0afc 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -418,13 +418,30 @@ public class CraftEventFactory { +@@ -419,13 +419,30 @@ public class CraftEventFactory { } public static void handleBlockDropItemEvent(Block block, BlockState state, ServerPlayer player, List items) { diff --git a/patches/server/0555-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0554-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0555-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0554-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0556-living-entity-allow-attribute-registration.patch b/patches/server/0555-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0556-living-entity-allow-attribute-registration.patch rename to patches/server/0555-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0557-fix-dead-slime-setSize-invincibility.patch b/patches/server/0556-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0557-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0556-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0558-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0557-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0558-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0557-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0559-Expose-Tracked-Players.patch b/patches/server/0558-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0559-Expose-Tracked-Players.patch rename to patches/server/0558-Expose-Tracked-Players.patch diff --git a/patches/server/0560-Remove-streams-from-SensorNearest.patch b/patches/server/0559-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0560-Remove-streams-from-SensorNearest.patch rename to patches/server/0559-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0561-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0560-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0561-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0560-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0562-Improve-ServerGUI.patch b/patches/server/0561-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0562-Improve-ServerGUI.patch rename to patches/server/0561-Improve-ServerGUI.patch diff --git a/patches/server/0563-fix-converting-txt-to-json-file.patch b/patches/server/0562-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0563-fix-converting-txt-to-json-file.patch rename to patches/server/0562-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0564-Add-worldborder-events.patch b/patches/server/0563-Add-worldborder-events.patch similarity index 100% rename from patches/server/0564-Add-worldborder-events.patch rename to patches/server/0563-Add-worldborder-events.patch diff --git a/patches/server/0565-added-PlayerNameEntityEvent.patch b/patches/server/0564-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0565-added-PlayerNameEntityEvent.patch rename to patches/server/0564-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0566-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0565-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0566-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0565-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0567-Add-recipe-to-cook-events.patch b/patches/server/0566-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0567-Add-recipe-to-cook-events.patch rename to patches/server/0566-Add-recipe-to-cook-events.patch diff --git a/patches/server/0568-Add-Block-isValidTool.patch b/patches/server/0567-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0568-Add-Block-isValidTool.patch rename to patches/server/0567-Add-Block-isValidTool.patch diff --git a/patches/server/0569-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0568-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0569-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0568-Allow-using-signs-inside-spawn-protection.patch index 017a3c1472..924685b66c 100644 --- a/patches/server/0569-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0568-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4a20980ee00b52ee12537ad9cd9095ba3da39166..f893d9f8dc5f087a63efa91338ad4118f9d67d47 100644 +index 6e96f75f16636d5f117d00d5f0aff4bb7f24f23b..40e7a897033bd66ffe07a5bf875dc66a478591fd 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1829,7 +1829,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0570-Expand-world-key-API.patch b/patches/server/0569-Expand-world-key-API.patch similarity index 100% rename from patches/server/0570-Expand-world-key-API.patch rename to patches/server/0569-Expand-world-key-API.patch diff --git a/patches/server/0571-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0570-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0571-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0570-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0572-Item-Rarity-API.patch b/patches/server/0571-Item-Rarity-API.patch similarity index 100% rename from patches/server/0572-Item-Rarity-API.patch rename to patches/server/0571-Item-Rarity-API.patch diff --git a/patches/server/0573-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0573-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0574-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0573-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0574-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0573-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0575-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 91% rename from patches/server/0575-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch index d9ee7915ec..e1945be586 100644 --- a/patches/server/0575-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f893d9f8dc5f087a63efa91338ad4118f9d67d47..f2e5bffd43e36b47af51e516409830fa5a5acbbe 100644 +index 40e7a897033bd66ffe07a5bf875dc66a478591fd..a06eaaa38406ad8c7ec46a0283a340990b157002 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1290,7 +1290,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0576-Expose-protocol-version.patch b/patches/server/0575-Expose-protocol-version.patch similarity index 100% rename from patches/server/0576-Expose-protocol-version.patch rename to patches/server/0575-Expose-protocol-version.patch diff --git a/patches/server/0577-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0577-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0578-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0578-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0579-Add-bypass-host-check.patch b/patches/server/0578-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0579-Add-bypass-host-check.patch rename to patches/server/0578-Add-bypass-host-check.patch diff --git a/patches/server/0580-Set-area-affect-cloud-rotation.patch b/patches/server/0579-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0580-Set-area-affect-cloud-rotation.patch rename to patches/server/0579-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0581-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0581-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0582-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0582-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0583-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0583-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0584-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0584-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0585-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 93% rename from patches/server/0585-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch index 8382a6c206..865c11354d 100644 --- a/patches/server/0585-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/server/0584-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 f2e5bffd43e36b47af51e516409830fa5a5acbbe..1067ff8cb82f44ef3f67b4db5ee7697aabae22a8 100644 +index a06eaaa38406ad8c7ec46a0283a340990b157002..073be5bda93aa32613f0f4994e5e266a3e7872a4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2043,6 +2043,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0586-Added-PlayerDeepSleepEvent.patch b/patches/server/0585-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0586-Added-PlayerDeepSleepEvent.patch rename to patches/server/0585-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0587-More-World-API.patch b/patches/server/0586-More-World-API.patch similarity index 100% rename from patches/server/0587-More-World-API.patch rename to patches/server/0586-More-World-API.patch diff --git a/patches/server/0588-Added-PlayerBedFailEnterEvent.patch b/patches/server/0587-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0588-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0587-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0589-Entity-load-save-limit-per-chunk.patch b/patches/server/0588-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0589-Entity-load-save-limit-per-chunk.patch rename to patches/server/0588-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0590-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0589-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0590-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0589-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0591-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0590-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0591-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0590-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0592-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0591-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0592-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0591-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0593-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0592-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 97% rename from patches/server/0593-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0592-add-RespawnFlags-to-PlayerRespawnEvent.patch index 49c9535187..55730dad91 100644 --- a/patches/server/0593-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/server/0592-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 1067ff8cb82f44ef3f67b4db5ee7697aabae22a8..84c49a70c32c07580748d9a55f24902ce5be8c5b 100644 +index 073be5bda93aa32613f0f4994e5e266a3e7872a4..1375e48ed01bdd627c204938fed816e9e6b437c4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2783,7 +2783,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0594-Add-Channel-initialization-listeners.patch b/patches/server/0593-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0594-Add-Channel-initialization-listeners.patch rename to patches/server/0593-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0595-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0594-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0595-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0594-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0596-Add-more-WanderingTrader-API.patch b/patches/server/0595-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0596-Add-more-WanderingTrader-API.patch rename to patches/server/0595-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0597-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0596-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0597-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0596-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0598-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0597-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0598-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0597-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0599-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0598-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0599-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0598-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0600-Inventory-close.patch b/patches/server/0599-Inventory-close.patch similarity index 100% rename from patches/server/0600-Inventory-close.patch rename to patches/server/0599-Inventory-close.patch diff --git a/patches/server/0601-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0600-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0601-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0600-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0602-Fix-CraftPotionBrewer-cache.patch b/patches/server/0601-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0602-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0601-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0603-Add-basic-Datapack-API.patch b/patches/server/0602-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0603-Add-basic-Datapack-API.patch rename to patches/server/0602-Add-basic-Datapack-API.patch diff --git a/patches/server/0604-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0603-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0604-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0603-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0605-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0604-additions-to-PlayerGameModeChangeEvent.patch similarity index 97% rename from patches/server/0605-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0604-additions-to-PlayerGameModeChangeEvent.patch index 2b20e4d74c..54e1c9faa3 100644 --- a/patches/server/0605-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0604-additions-to-PlayerGameModeChangeEvent.patch @@ -94,7 +94,7 @@ index fba3ac571fafd5c738d0dcfd5492112817c443e3..a340a190b223efb6fafba3c7c9e99681 } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 43221bf57fb4eeb70823c12b48f4df0bb817eb0b..e903371b370034f6447c5f23562fe5c9d2b48dbe 100644 +index df0d66e148688aa8c22536376f660e4614271d4c..a09df00d0be1621012466d6ea46a19e0087a6fa6 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -73,21 +73,28 @@ public class ServerPlayerGameMode { @@ -131,7 +131,7 @@ index 43221bf57fb4eeb70823c12b48f4df0bb817eb0b..e903371b370034f6447c5f23562fe5c9 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 84c49a70c32c07580748d9a55f24902ce5be8c5b..582697f5bb1423ee5eae91d28b19c10889bf8904 100644 +index 1375e48ed01bdd627c204938fed816e9e6b437c4..322cea4cd9b5d9e01984a6c986bb89350b0c7d12 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2792,7 +2792,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -144,7 +144,7 @@ index 84c49a70c32c07580748d9a55f24902ce5be8c5b..582697f5bb1423ee5eae91d28b19c108 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0906de2fb92cbdcc47ed1b2393430a7ac33ae920..eab8e34a3768b380e6c171080adc8d22c6f4f85b 100644 +index aa14be1871aa069b45004829912392e9fbf27990..116eabbe59132736273ba29678fd027fce8cc4ad 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1501,7 +1501,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0606-ItemStack-repair-check-API.patch b/patches/server/0605-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0606-ItemStack-repair-check-API.patch rename to patches/server/0605-ItemStack-repair-check-API.patch diff --git a/patches/server/0607-More-Enchantment-API.patch b/patches/server/0606-More-Enchantment-API.patch similarity index 100% rename from patches/server/0607-More-Enchantment-API.patch rename to patches/server/0606-More-Enchantment-API.patch diff --git a/patches/server/0608-Move-range-check-for-block-placing-up.patch b/patches/server/0607-Move-range-check-for-block-placing-up.patch similarity index 92% rename from patches/server/0608-Move-range-check-for-block-placing-up.patch rename to patches/server/0607-Move-range-check-for-block-placing-up.patch index 07cdf86b26..62a9967384 100644 --- a/patches/server/0608-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0607-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 582697f5bb1423ee5eae91d28b19c10889bf8904..2e2b9f69914f727488aec0c7863783c41eb8f006 100644 +index 322cea4cd9b5d9e01984a6c986bb89350b0c7d12..d38d1827e1180781ad25e4580ce25c6dfa217453 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1815,6 +1815,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0609-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0608-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0609-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0608-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0610-Add-Mob-lookAt-API.patch b/patches/server/0609-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0610-Add-Mob-lookAt-API.patch rename to patches/server/0609-Add-Mob-lookAt-API.patch diff --git a/patches/server/0611-Add-Unix-domain-socket-support.patch b/patches/server/0610-Add-Unix-domain-socket-support.patch similarity index 98% rename from patches/server/0611-Add-Unix-domain-socket-support.patch rename to patches/server/0610-Add-Unix-domain-socket-support.patch index 78e4900413..ef9e8b230d 100644 --- a/patches/server/0611-Add-Unix-domain-socket-support.patch +++ b/patches/server/0610-Add-Unix-domain-socket-support.patch @@ -91,7 +91,7 @@ index 29a0a720f22f56ca3d844efef1ecde3980fb1c12..838244e3680ea6020701e10bafbde7f5 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2e2b9f69914f727488aec0c7863783c41eb8f006..75ab3e102caead4f9bdfbf74772d998f9da9c723 100644 +index d38d1827e1180781ad25e4580ce25c6dfa217453..1b8a09769f2f896c81ce89bd52d3eb1547dcb26a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2627,6 +2627,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0612-Add-EntityInsideBlockEvent.patch b/patches/server/0611-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0612-Add-EntityInsideBlockEvent.patch rename to patches/server/0611-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0613-Attributes-API-for-item-defaults.patch b/patches/server/0612-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0613-Attributes-API-for-item-defaults.patch rename to patches/server/0612-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0614-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0613-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0614-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0613-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0615-More-Lidded-Block-API.patch b/patches/server/0614-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0615-More-Lidded-Block-API.patch rename to patches/server/0614-More-Lidded-Block-API.patch diff --git a/patches/server/0616-Limit-item-frame-cursors-on-maps.patch b/patches/server/0615-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0616-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0615-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0617-Add-PlayerKickEvent-causes.patch b/patches/server/0616-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0617-Add-PlayerKickEvent-causes.patch rename to patches/server/0616-Add-PlayerKickEvent-causes.patch index 9980e252bf..fcefe340e4 100644 --- a/patches/server/0617-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0616-Add-PlayerKickEvent-causes.patch @@ -88,7 +88,7 @@ index c68bac4727f6b2ca95fc8c438303097af14286f2..bb629ec263959c8268de88ca807bddb6 return Component.translatable("commands.kick.success", serverPlayer.getDisplayName(), reason); }, true); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 75ab3e102caead4f9bdfbf74772d998f9da9c723..76d8c5c5029ac564d05144cef5030c6b64df9a98 100644 +index 1b8a09769f2f896c81ce89bd52d3eb1547dcb26a..9761fdca1f991d2d3714de425584c4cfcb83e894 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -362,7 +362,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -491,7 +491,7 @@ index 984c288abf94d9fe47fada33722fea035b832f3b..addd20237b87c9a87bb09fd7addb101a } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index eab8e34a3768b380e6c171080adc8d22c6f4f85b..c11ca0b9601ef90f19f61cce029cafcfac3c1619 100644 +index 116eabbe59132736273ba29678fd027fce8cc4ad..948feffe63d23f6f3a8a85adc6e6d579c07a0fd4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -577,7 +577,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0618-Add-PufferFishStateChangeEvent.patch b/patches/server/0617-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0618-Add-PufferFishStateChangeEvent.patch rename to patches/server/0617-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0619-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0618-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0619-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0618-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0620-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0619-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0620-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0619-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0621-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0620-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0621-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0620-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0622-Add-BellRevealRaiderEvent.patch b/patches/server/0621-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0622-Add-BellRevealRaiderEvent.patch rename to patches/server/0621-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0623-Fix-invulnerable-end-crystals.patch b/patches/server/0622-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0623-Fix-invulnerable-end-crystals.patch rename to patches/server/0622-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0624-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0623-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0624-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0623-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0625-Fix-dangerous-end-portal-logic.patch b/patches/server/0624-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0625-Fix-dangerous-end-portal-logic.patch rename to patches/server/0624-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0626-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0625-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0626-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0625-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0627-Make-item-validations-configurable.patch b/patches/server/0626-Make-item-validations-configurable.patch similarity index 97% rename from patches/server/0627-Make-item-validations-configurable.patch rename to patches/server/0626-Make-item-validations-configurable.patch index 15390d1f92..00627de224 100644 --- a/patches/server/0627-Make-item-validations-configurable.patch +++ b/patches/server/0626-Make-item-validations-configurable.patch @@ -32,7 +32,7 @@ index cf928745c36af0e6fa0a95e177395c5fb1aa821a..2a08b1ac6e9aac81012997637b4cad59 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index fa94030ac80c8c68ee429e6b7350395208e4348f..ac9fb7cf96ed36162c4f6c2a834b627d0120f3cc 100644 +index b34f364f8580ae900e25ef3f31f58f4e8fee88e0..1481c8ca684eddca3eb5db3aceac4877043b9fcd 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -360,7 +360,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/0628-Line-Of-Sight-Changes.patch b/patches/server/0627-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0628-Line-Of-Sight-Changes.patch rename to patches/server/0627-Line-Of-Sight-Changes.patch diff --git a/patches/server/0629-add-per-world-spawn-limits.patch b/patches/server/0628-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0629-add-per-world-spawn-limits.patch rename to patches/server/0628-add-per-world-spawn-limits.patch diff --git a/patches/server/0630-Fix-potions-splash-events.patch b/patches/server/0629-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0630-Fix-potions-splash-events.patch rename to patches/server/0629-Fix-potions-splash-events.patch diff --git a/patches/server/0631-Add-more-LimitedRegion-API.patch b/patches/server/0630-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0631-Add-more-LimitedRegion-API.patch rename to patches/server/0630-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0632-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0631-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0632-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0631-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0633-Missing-Entity-Behavior-API.patch b/patches/server/0632-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0633-Missing-Entity-Behavior-API.patch rename to patches/server/0632-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0634-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0633-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 92% rename from patches/server/0634-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0633-Ensure-disconnect-for-book-edit-is-called-on-main.patch index c89825748e..899394ba12 100644 --- a/patches/server/0634-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/server/0633-Ensure-disconnect-for-book-edit-is-called-on-main.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 76d8c5c5029ac564d05144cef5030c6b64df9a98..b8eba8f002bffacd4c4943d2e49045ddc753db8c 100644 +index 9761fdca1f991d2d3714de425584c4cfcb83e894..63a3c5626e89ed4e3c436f203c9e917a8d02eab5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1209,7 +1209,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0635-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0634-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0635-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0634-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0636-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0635-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0636-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0635-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0637-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0636-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0637-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0636-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0638-Adds-PlayerArmSwingEvent.patch b/patches/server/0637-Adds-PlayerArmSwingEvent.patch similarity index 93% rename from patches/server/0638-Adds-PlayerArmSwingEvent.patch rename to patches/server/0637-Adds-PlayerArmSwingEvent.patch index b3d3eef0c5..94274862fe 100644 --- a/patches/server/0638-Adds-PlayerArmSwingEvent.patch +++ b/patches/server/0637-Adds-PlayerArmSwingEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b8eba8f002bffacd4c4943d2e49045ddc753db8c..e0937f5437451c383e9a540d98b07f23120cb8f1 100644 +index 63a3c5626e89ed4e3c436f203c9e917a8d02eab5..c36b0203121ddcb4582b72521cc2f76b7373fedd 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2494,7 +2494,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0639-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0638-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 98% rename from patches/server/0639-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0638-Fixes-kick-event-leave-message-not-being-sent.patch index d2d5b852a1..ac500514a1 100644 --- a/patches/server/0639-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0638-Fixes-kick-event-leave-message-not-being-sent.patch @@ -17,7 +17,7 @@ index 7d5de33442fe4ba53c51cc7356323622c2c3022f..478dbba3519f8d2fdd4b203756403761 public boolean isRealPlayer; // Paper public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e0937f5437451c383e9a540d98b07f23120cb8f1..7b2c971dad894718825475f3af364f0c653e5beb 100644 +index c36b0203121ddcb4582b72521cc2f76b7373fedd..aaf1146f89f1150a97472a259cda12169e23d1cf 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -514,7 +514,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0640-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0639-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0640-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0639-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0641-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0640-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0641-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0640-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0642-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0641-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0642-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0641-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0643-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0642-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0643-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0642-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0644-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0643-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0644-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0643-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0645-Stinger-API.patch b/patches/server/0644-Stinger-API.patch similarity index 100% rename from patches/server/0645-Stinger-API.patch rename to patches/server/0644-Stinger-API.patch diff --git a/patches/server/0646-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0645-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0646-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0645-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0647-Add-System.out-err-catcher.patch b/patches/server/0646-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0647-Add-System.out-err-catcher.patch rename to patches/server/0646-Add-System.out-err-catcher.patch diff --git a/patches/server/0648-Fix-test-not-bootstrapping.patch b/patches/server/0647-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0648-Fix-test-not-bootstrapping.patch rename to patches/server/0647-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0649-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0648-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0649-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0648-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0650-Improve-boat-collision-performance.patch b/patches/server/0649-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0650-Improve-boat-collision-performance.patch rename to patches/server/0649-Improve-boat-collision-performance.patch diff --git a/patches/server/0651-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0650-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0651-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0650-Prevent-AFK-kick-while-watching-end-credits.patch index 8fbcf677c3..f4429575f4 100644 --- a/patches/server/0651-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0650-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7b2c971dad894718825475f3af364f0c653e5beb..5c98df63c36a01a70569894534f6059218ba83d2 100644 +index aaf1146f89f1150a97472a259cda12169e23d1cf..d8dfe272ae044f55158748b817dd266f0d47b21b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -431,7 +431,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0652-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0651-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0652-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0651-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0653-Add-PlayerSetSpawnEvent.patch b/patches/server/0652-Add-PlayerSetSpawnEvent.patch similarity index 99% rename from patches/server/0653-Add-PlayerSetSpawnEvent.patch rename to patches/server/0652-Add-PlayerSetSpawnEvent.patch index f929924374..3b26620999 100644 --- a/patches/server/0653-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0652-Add-PlayerSetSpawnEvent.patch @@ -187,7 +187,7 @@ index 1a27b7faa22e6b3dc5fce329ed06425de56c4315..b9903c29bdea8d1e3b6fce0e97be6bd9 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c11ca0b9601ef90f19f61cce029cafcfac3c1619..736b97517906f154158618ad92328ad34ab1882d 100644 +index 948feffe63d23f6f3a8a85adc6e6d579c07a0fd4..fdd2539576df733424fcd68a8ff7612f5dc39db8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1314,9 +1314,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0654-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0653-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0654-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0653-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0655-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0654-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0655-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0654-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0656-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0655-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0656-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0655-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0657-Added-EntityDamageItemEvent.patch b/patches/server/0656-Added-EntityDamageItemEvent.patch similarity index 97% rename from patches/server/0657-Added-EntityDamageItemEvent.patch rename to patches/server/0656-Added-EntityDamageItemEvent.patch index 7a458b966f..af2ee1d973 100644 --- a/patches/server/0657-Added-EntityDamageItemEvent.patch +++ b/patches/server/0656-Added-EntityDamageItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added EntityDamageItemEvent diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index a236d2826b6a2dff8b3e63e7c59cce2602393e62..9e7357c65c36da9cad2f4492dacfc60af2a1af70 100644 +index 226d024f222affba83479d44a7163d29207ae8f1..487f16f64ac3d4c22538032029925ed156cf119c 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -591,7 +591,7 @@ public final class ItemStack { diff --git a/patches/server/0658-Optimize-indirect-passenger-iteration.patch b/patches/server/0657-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0658-Optimize-indirect-passenger-iteration.patch rename to patches/server/0657-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0659-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0658-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0659-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0658-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0660-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0659-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0660-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0659-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0661-Clear-bucket-NBT-after-dispense.patch b/patches/server/0660-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0661-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0660-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0662-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0661-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0662-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0661-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0663-Add-BlockBreakBlockEvent.patch b/patches/server/0662-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0663-Add-BlockBreakBlockEvent.patch rename to patches/server/0662-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0664-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0663-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0664-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0663-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0665-More-CommandBlock-API.patch b/patches/server/0664-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0665-More-CommandBlock-API.patch rename to patches/server/0664-More-CommandBlock-API.patch diff --git a/patches/server/0666-Add-missing-team-sidebar-display-slots.patch b/patches/server/0665-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0666-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0665-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0667-Add-back-EntityPortalExitEvent.patch b/patches/server/0666-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0667-Add-back-EntityPortalExitEvent.patch rename to patches/server/0666-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0668-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0667-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0668-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0667-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0669-Get-entity-default-attributes.patch b/patches/server/0668-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0669-Get-entity-default-attributes.patch rename to patches/server/0668-Get-entity-default-attributes.patch diff --git a/patches/server/0670-Left-handed-API.patch b/patches/server/0669-Left-handed-API.patch similarity index 100% rename from patches/server/0670-Left-handed-API.patch rename to patches/server/0669-Left-handed-API.patch diff --git a/patches/server/0671-Add-more-advancement-API.patch b/patches/server/0670-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0671-Add-more-advancement-API.patch rename to patches/server/0670-Add-more-advancement-API.patch diff --git a/patches/server/0672-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0671-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0672-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0671-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0673-Add-critical-damage-API.patch b/patches/server/0672-Add-critical-damage-API.patch similarity index 96% rename from patches/server/0673-Add-critical-damage-API.patch rename to patches/server/0672-Add-critical-damage-API.patch index 8280cf1022..6953c3944a 100644 --- a/patches/server/0673-Add-critical-damage-API.patch +++ b/patches/server/0672-Add-critical-damage-API.patch @@ -71,10 +71,10 @@ index a0d688128a1268fa1acf7c339cde15df5dce1c82..372b9ec0c8eddf4a01b4b8203a88401d int k = entity.getRemainingFireTicks(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 64e1e46bd6c4b225fe9b86c4cf632b9bb1c4af09..94796cbe43546748b28aa921d22cb4b68ef23fa6 100644 +index 440edfe374b44e6da34975398db1ece28b7a0afc..9201e143ff520126c27a649bba62b359a01669c4 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -988,7 +988,7 @@ public class CraftEventFactory { +@@ -985,7 +985,7 @@ public class CraftEventFactory { } else { damageCause = DamageCause.ENTITY_EXPLOSION; } @@ -83,7 +83,7 @@ index 64e1e46bd6c4b225fe9b86c4cf632b9bb1c4af09..94796cbe43546748b28aa921d22cb4b6 } event.setCancelled(cancelled); -@@ -1020,7 +1020,7 @@ public class CraftEventFactory { +@@ -1017,7 +1017,7 @@ public class CraftEventFactory { cause = DamageCause.SONIC_BOOM; } @@ -92,7 +92,7 @@ index 64e1e46bd6c4b225fe9b86c4cf632b9bb1c4af09..94796cbe43546748b28aa921d22cb4b6 } else if (source.is(DamageTypes.FELL_OUT_OF_WORLD)) { EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, modifiers, modifierFunctions); event.setCancelled(cancelled); -@@ -1090,7 +1090,7 @@ public class CraftEventFactory { +@@ -1087,7 +1087,7 @@ public class CraftEventFactory { } else { throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.getMsgId())); } @@ -101,7 +101,7 @@ index 64e1e46bd6c4b225fe9b86c4cf632b9bb1c4af09..94796cbe43546748b28aa921d22cb4b6 event.setCancelled(cancelled); CraftEventFactory.callEvent(event); if (!event.isCancelled()) { -@@ -1139,20 +1139,28 @@ public class CraftEventFactory { +@@ -1136,20 +1136,28 @@ public class CraftEventFactory { } if (cause != null) { diff --git a/patches/server/0674-Fix-issues-with-mob-conversion.patch b/patches/server/0673-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0674-Fix-issues-with-mob-conversion.patch rename to patches/server/0673-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0675-Add-isCollidable-methods-to-various-places.patch b/patches/server/0674-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0675-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0674-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0676-Goat-ram-API.patch b/patches/server/0675-Goat-ram-API.patch similarity index 100% rename from patches/server/0676-Goat-ram-API.patch rename to patches/server/0675-Goat-ram-API.patch diff --git a/patches/server/0677-Add-API-for-resetting-a-single-score.patch b/patches/server/0676-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0677-Add-API-for-resetting-a-single-score.patch rename to patches/server/0676-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0678-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0677-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0678-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0677-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0679-Vanilla-command-permission-fixes.patch b/patches/server/0678-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0679-Vanilla-command-permission-fixes.patch rename to patches/server/0678-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0680-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0679-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0680-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0679-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0681-Fix-GameProfileCache-concurrency.patch b/patches/server/0680-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0681-Fix-GameProfileCache-concurrency.patch rename to patches/server/0680-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0682-Improve-and-expand-AsyncCatcher.patch b/patches/server/0681-Improve-and-expand-AsyncCatcher.patch similarity index 99% rename from patches/server/0682-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0681-Improve-and-expand-AsyncCatcher.patch index b2edc90b2d..89a2de4bd2 100644 --- a/patches/server/0682-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0681-Improve-and-expand-AsyncCatcher.patch @@ -17,7 +17,7 @@ Async catch modifications to critical entity state Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5c98df63c36a01a70569894534f6059218ba83d2..c76fa82020feba290787efb7eb6bb000ef98db8b 100644 +index d8dfe272ae044f55158748b817dd266f0d47b21b..b40bcdfaac568b248c67036de6e9d0969da38ae4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1656,6 +1656,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0683-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0682-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0683-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0682-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0684-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0683-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0684-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0683-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0685-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0684-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0685-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0684-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0686-Optimise-general-POI-access.patch b/patches/server/0685-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0686-Optimise-general-POI-access.patch rename to patches/server/0685-Optimise-general-POI-access.patch diff --git a/patches/server/0687-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0686-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/0687-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/server/0686-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/0688-Optimise-chunk-tick-iteration.patch b/patches/server/0687-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0688-Optimise-chunk-tick-iteration.patch rename to patches/server/0687-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0689-Execute-chunk-tasks-mid-tick.patch b/patches/server/0688-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0689-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0688-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0691-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0690-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0691-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0690-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0692-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0691-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0692-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0691-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0693-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0692-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0693-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0692-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0694-Distance-manager-tick-timings.patch b/patches/server/0693-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0694-Distance-manager-tick-timings.patch rename to patches/server/0693-Distance-manager-tick-timings.patch diff --git a/patches/server/0695-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0694-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0695-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0694-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0696-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0695-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0696-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0695-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0697-Add-packet-limiter-config.patch b/patches/server/0696-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0697-Add-packet-limiter-config.patch rename to patches/server/0696-Add-packet-limiter-config.patch diff --git a/patches/server/0698-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0697-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0698-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0697-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0699-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0698-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0699-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0698-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0700-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0699-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0700-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0699-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0701-Time-scoreboard-search.patch b/patches/server/0700-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0701-Time-scoreboard-search.patch rename to patches/server/0700-Time-scoreboard-search.patch diff --git a/patches/server/0702-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0701-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0702-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0701-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0703-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0702-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0703-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0702-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0704-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0703-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0704-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0703-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0705-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0704-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0705-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0704-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0706-Optimise-random-block-ticking.patch b/patches/server/0705-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0706-Optimise-random-block-ticking.patch rename to patches/server/0705-Optimise-random-block-ticking.patch diff --git a/patches/server/0707-Optimise-non-flush-packet-sending.patch b/patches/server/0706-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0707-Optimise-non-flush-packet-sending.patch rename to patches/server/0706-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0708-Optimise-nearby-player-lookups.patch b/patches/server/0707-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0708-Optimise-nearby-player-lookups.patch rename to patches/server/0707-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0709-Remove-streams-for-villager-AI.patch b/patches/server/0708-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0709-Remove-streams-for-villager-AI.patch rename to patches/server/0708-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0710-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0709-Use-Velocity-compression-and-cipher-natives.patch similarity index 99% rename from patches/server/0710-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0709-Use-Velocity-compression-and-cipher-natives.patch index 9848c6b07d..ba35504e57 100644 --- a/patches/server/0710-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/0709-Use-Velocity-compression-and-cipher-natives.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives diff --git a/build.gradle.kts b/build.gradle.kts -index d63f6a46244b9dd133f12e9cfae16c8cf3b394da..f783c349fe0f4c9ebd15ea20e04b3291d294e947 100644 +index e3e6318e0c83ae6f6ff699918ab0faff9f84c63d..5df3ca7173cf27eb01475b6dc2e5aad38cd5a324 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,6 +33,11 @@ dependencies { @@ -18,8 +18,8 @@ index d63f6a46244b9dd133f12e9cfae16c8cf3b394da..f783c349fe0f4c9ebd15ea20e04b3291 + } + // Paper end - runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2") - runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") + runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") diff --git a/src/main/java/net/minecraft/network/CipherDecoder.java b/src/main/java/net/minecraft/network/CipherDecoder.java index 778beb445eac5769b9e4e07b4d1294c50ae2602b..c712fb8193115e1ab71b5e40fb0ccb9413062b03 100644 --- a/src/main/java/net/minecraft/network/CipherDecoder.java diff --git a/patches/server/0711-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0710-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0711-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0710-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0712-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0711-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0712-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0711-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0713-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0712-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0713-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0712-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0714-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0713-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0714-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0713-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0715-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0714-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 92% rename from patches/server/0715-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0714-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index 07963d7944..be10fb5089 100644 --- a/patches/server/0715-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/server/0714-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c76fa82020feba290787efb7eb6bb000ef98db8b..9ae8bdc5d17f585257f61f3692117e82e718b6f4 100644 +index b40bcdfaac568b248c67036de6e9d0969da38ae4..150b3944ee840cccb494a87a96ee1eb47015ba79 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -847,6 +847,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0716-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0715-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0716-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0715-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0717-Ensure-valid-vehicle-status.patch b/patches/server/0716-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0717-Ensure-valid-vehicle-status.patch rename to patches/server/0716-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0718-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0717-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0718-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0717-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0719-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0718-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0719-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0718-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0720-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0719-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0720-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0719-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0721-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0720-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0721-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0720-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0722-Preserve-overstacked-loot.patch b/patches/server/0721-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0722-Preserve-overstacked-loot.patch rename to patches/server/0721-Preserve-overstacked-loot.patch diff --git a/patches/server/0723-Update-head-rotation-in-missing-places.patch b/patches/server/0722-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0723-Update-head-rotation-in-missing-places.patch rename to patches/server/0722-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0724-prevent-unintended-light-block-manipulation.patch b/patches/server/0723-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0724-prevent-unintended-light-block-manipulation.patch rename to patches/server/0723-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0725-Fix-CraftCriteria-defaults-map.patch b/patches/server/0724-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0725-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0724-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0726-Fix-upstreams-block-state-factories.patch b/patches/server/0725-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0726-Fix-upstreams-block-state-factories.patch rename to patches/server/0725-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0727-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0726-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0727-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0726-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0728-Configurable-feature-seeds.patch b/patches/server/0727-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0728-Configurable-feature-seeds.patch rename to patches/server/0727-Configurable-feature-seeds.patch diff --git a/patches/server/0729-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0728-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0729-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0728-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0730-Add-root-admin-user-detection.patch b/patches/server/0729-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0730-Add-root-admin-user-detection.patch rename to patches/server/0729-Add-root-admin-user-detection.patch diff --git a/patches/server/0731-Always-allow-item-changing-in-Fireball.patch b/patches/server/0730-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0731-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0730-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0732-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0731-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0732-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0731-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0733-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0732-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0733-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0732-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0734-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0733-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0734-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0733-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0735-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0734-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0735-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0734-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0736-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0735-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0736-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0735-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0737-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0736-Hide-unnecessary-itemmeta-from-clients.patch similarity index 98% rename from patches/server/0737-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0736-Hide-unnecessary-itemmeta-from-clients.patch index 0822fcc400..3729683282 100644 --- a/patches/server/0737-Hide-unnecessary-itemmeta-from-clients.patch +++ b/patches/server/0736-Hide-unnecessary-itemmeta-from-clients.patch @@ -18,7 +18,7 @@ index 71a8812365503d840f6702a21d504a37d67c7194..63561c0044375465fa0023b2b563a651 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9ae8bdc5d17f585257f61f3692117e82e718b6f4..a47e05e1955b7c0b11fa0c36b5a97d27be0f7e1d 100644 +index 150b3944ee840cccb494a87a96ee1eb47015ba79..3b61e9dcbc06ecba3cd47bd3fb06f8903fb2c8ee 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2708,8 +2708,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0738-Fix-Spigot-growth-modifiers.patch b/patches/server/0737-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0738-Fix-Spigot-growth-modifiers.patch rename to patches/server/0737-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0739-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0738-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0739-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0738-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0740-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0739-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0740-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0739-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0741-Add-player-health-update-API.patch b/patches/server/0740-Add-player-health-update-API.patch similarity index 95% rename from patches/server/0741-Add-player-health-update-API.patch rename to patches/server/0740-Add-player-health-update-API.patch index 39a40ee8e7..819b5e9da0 100644 --- a/patches/server/0741-Add-player-health-update-API.patch +++ b/patches/server/0740-Add-player-health-update-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add player health update API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 736b97517906f154158618ad92328ad34ab1882d..8406901601abbfda9d39482bed0a17f1ebc701b1 100644 +index fdd2539576df733424fcd68a8ff7612f5dc39db8..e41beff4c687917313f3a9c27b9079b979bd8c78 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2320,9 +2320,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0742-Optimize-HashMapPalette.patch b/patches/server/0741-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0742-Optimize-HashMapPalette.patch rename to patches/server/0741-Optimize-HashMapPalette.patch diff --git a/patches/server/0743-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0742-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0743-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0742-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0744-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0743-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/0744-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0743-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/0745-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0744-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 99% rename from patches/server/0745-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0744-Optimise-collision-checking-in-player-move-packet-ha.patch index 89716c784a..04033fb89e 100644 --- a/patches/server/0745-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/server/0744-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN CHECK ME diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a47e05e1955b7c0b11fa0c36b5a97d27be0f7e1d..0203c778e2cfd421d4e9516a00535a5f20e61679 100644 +index 3b61e9dcbc06ecba3cd47bd3fb06f8903fb2c8ee..df22e934f8d1fae8411a5829db73ba9680649f43 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -647,7 +647,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0746-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0745-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0746-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0745-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0747-Add-more-Campfire-API.patch b/patches/server/0746-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0747-Add-more-Campfire-API.patch rename to patches/server/0746-Add-more-Campfire-API.patch diff --git a/patches/server/0748-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0747-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0748-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0747-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0749-Fix-tripwire-state-inconsistency.patch b/patches/server/0748-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0749-Fix-tripwire-state-inconsistency.patch rename to patches/server/0748-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0750-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0749-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0750-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0749-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0751-Improve-scoreboard-entries.patch b/patches/server/0750-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0751-Improve-scoreboard-entries.patch rename to patches/server/0750-Improve-scoreboard-entries.patch diff --git a/patches/server/0752-Entity-powdered-snow-API.patch b/patches/server/0751-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0752-Entity-powdered-snow-API.patch rename to patches/server/0751-Entity-powdered-snow-API.patch diff --git a/patches/server/0753-Add-API-for-item-entity-health.patch b/patches/server/0752-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0753-Add-API-for-item-entity-health.patch rename to patches/server/0752-Add-API-for-item-entity-health.patch diff --git a/patches/server/0754-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0753-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0754-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0753-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0755-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0754-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0755-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0754-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0756-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0755-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0756-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0755-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0757-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0756-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0757-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0756-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0758-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0757-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0758-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0757-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0759-Fix-bees-aging-inside-hives.patch b/patches/server/0758-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0759-Fix-bees-aging-inside-hives.patch rename to patches/server/0758-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0760-Bucketable-API.patch b/patches/server/0759-Bucketable-API.patch similarity index 100% rename from patches/server/0760-Bucketable-API.patch rename to patches/server/0759-Bucketable-API.patch diff --git a/patches/server/0761-Validate-usernames.patch b/patches/server/0760-Validate-usernames.patch similarity index 100% rename from patches/server/0761-Validate-usernames.patch rename to patches/server/0760-Validate-usernames.patch diff --git a/patches/server/0762-Make-water-animal-spawn-height-configurable.patch b/patches/server/0761-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0762-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0761-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0763-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0762-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0763-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0762-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0764-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0763-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0764-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0763-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0765-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0764-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0765-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0764-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0766-Multiple-Entries-with-Scoreboards.patch b/patches/server/0765-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0766-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0765-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0767-Reset-placed-block-on-exception.patch b/patches/server/0766-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0767-Reset-placed-block-on-exception.patch rename to patches/server/0766-Reset-placed-block-on-exception.patch diff --git a/patches/server/0768-Add-configurable-height-for-slime-spawn.patch b/patches/server/0767-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0768-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0767-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0769-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0768-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0769-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0768-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0770-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0769-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0770-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0769-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0771-Kick-on-main-for-illegal-chat.patch b/patches/server/0770-Kick-on-main-for-illegal-chat.patch similarity index 96% rename from patches/server/0771-Kick-on-main-for-illegal-chat.patch rename to patches/server/0770-Kick-on-main-for-illegal-chat.patch index 345e23b0be..c1e3e1cc38 100644 --- a/patches/server/0771-Kick-on-main-for-illegal-chat.patch +++ b/patches/server/0770-Kick-on-main-for-illegal-chat.patch @@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for illegal characters or chat out-of-order errors. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0203c778e2cfd421d4e9516a00535a5f20e61679..446ef101ca506ec9fdce6cede70a1e51d97d7dfc 100644 +index df22e934f8d1fae8411a5829db73ba9680649f43..5df6f813599b6bb5dff34386f603793156d3ca7a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2165,7 +2165,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0772-Multi-Block-Change-API-Implementation.patch b/patches/server/0771-Multi-Block-Change-API-Implementation.patch similarity index 97% rename from patches/server/0772-Multi-Block-Change-API-Implementation.patch rename to patches/server/0771-Multi-Block-Change-API-Implementation.patch index 3e28241505..7a0ce2ea11 100644 --- a/patches/server/0772-Multi-Block-Change-API-Implementation.patch +++ b/patches/server/0771-Multi-Block-Change-API-Implementation.patch @@ -24,7 +24,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..e3f355c85eb7cc8c1683e3009502c10a public void write(FriendlyByteBuf buf) { buf.writeLong(this.sectionPos.asLong()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8406901601abbfda9d39482bed0a17f1ebc701b1..3120f72d2ba93625931da83c1e37678c07bd69cd 100644 +index e41beff4c687917313f3a9c27b9079b979bd8c78..86e397e54b56e46f5f5f75529b8ee8ea4715e61d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -882,6 +882,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0773-Fix-NotePlayEvent.patch b/patches/server/0772-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0773-Fix-NotePlayEvent.patch rename to patches/server/0772-Fix-NotePlayEvent.patch diff --git a/patches/server/0774-Freeze-Tick-Lock-API.patch b/patches/server/0773-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0774-Freeze-Tick-Lock-API.patch rename to patches/server/0773-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0775-Dolphin-API.patch b/patches/server/0774-Dolphin-API.patch similarity index 100% rename from patches/server/0775-Dolphin-API.patch rename to patches/server/0774-Dolphin-API.patch diff --git a/patches/server/0776-More-PotionEffectType-API.patch b/patches/server/0775-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0776-More-PotionEffectType-API.patch rename to patches/server/0775-More-PotionEffectType-API.patch diff --git a/patches/server/0777-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0776-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0777-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0776-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0778-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0777-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0778-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0777-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0779-Add-missing-structure-set-seed-configs.patch b/patches/server/0778-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0779-Add-missing-structure-set-seed-configs.patch rename to patches/server/0778-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0780-Implement-regenerateChunk.patch b/patches/server/0779-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0780-Implement-regenerateChunk.patch rename to patches/server/0779-Implement-regenerateChunk.patch diff --git a/patches/server/0781-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0780-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 96% rename from patches/server/0781-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0780-Fix-cancelled-powdered-snow-bucket-placement.patch index cd73c1c14d..7e8db55923 100644 --- a/patches/server/0781-Fix-cancelled-powdered-snow-bucket-placement.patch +++ b/patches/server/0780-Fix-cancelled-powdered-snow-bucket-placement.patch @@ -20,7 +20,7 @@ index e581dc10f3c805f7f8b6e4c842092609e7e1a0f8..b0204af850ee182773ad458208cccd94 } return InteractionResult.FAIL; diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 9e7357c65c36da9cad2f4492dacfc60af2a1af70..6b9924652ef3cb3b26042155b05df3458b2a25ab 100644 +index 487f16f64ac3d4c22538032029925ed156cf119c..9047d65b60203062dac6eeac3b90ef3417074c09 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -352,7 +352,7 @@ public final class ItemStack { diff --git a/patches/server/0782-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0781-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0782-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0781-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0783-Add-GameEvent-tags.patch b/patches/server/0782-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0783-Add-GameEvent-tags.patch rename to patches/server/0782-Add-GameEvent-tags.patch diff --git a/patches/server/0784-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0783-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0784-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0783-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0785-Furnace-RecipesUsed-API.patch b/patches/server/0784-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0785-Furnace-RecipesUsed-API.patch rename to patches/server/0784-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0786-Configurable-sculk-sensor-listener-range.patch b/patches/server/0785-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0786-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0785-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0787-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0786-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0787-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0786-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0788-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0787-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0788-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0787-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0789-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0788-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0789-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0788-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0790-Fix-Entity-Position-Desync.patch b/patches/server/0789-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0790-Fix-Entity-Position-Desync.patch rename to patches/server/0789-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0791-Custom-Potion-Mixes.patch b/patches/server/0790-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0791-Custom-Potion-Mixes.patch rename to patches/server/0790-Custom-Potion-Mixes.patch diff --git a/patches/server/0792-Force-close-world-loading-screen.patch b/patches/server/0791-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0792-Force-close-world-loading-screen.patch rename to patches/server/0791-Force-close-world-loading-screen.patch diff --git a/patches/server/0793-Fix-falling-block-spawn-methods.patch b/patches/server/0792-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0793-Fix-falling-block-spawn-methods.patch rename to patches/server/0792-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0794-Expose-furnace-minecart-push-values.patch b/patches/server/0793-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0794-Expose-furnace-minecart-push-values.patch rename to patches/server/0793-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0795-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0794-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0795-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0794-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0796-More-Projectile-API.patch b/patches/server/0795-More-Projectile-API.patch similarity index 100% rename from patches/server/0796-More-Projectile-API.patch rename to patches/server/0795-More-Projectile-API.patch diff --git a/patches/server/0797-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0796-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0797-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0796-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0798-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0797-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 93% rename from patches/server/0798-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0797-Don-t-allow-vehicle-movement-from-players-while-tele.patch index aa96a3253f..ab5762de22 100644 --- a/patches/server/0798-Don-t-allow-vehicle-movement-from-players-while-tele.patch +++ b/patches/server/0797-Don-t-allow-vehicle-movement-from-players-while-tele.patch @@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the regular player move packet. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 446ef101ca506ec9fdce6cede70a1e51d97d7dfc..3b6edec55939c4fddf28b59282652493b42a2b8d 100644 +index 5df6f813599b6bb5dff34386f603793156d3ca7a..db79b51cbe94c8c584fcc38298638d2cf196f0ac 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -576,6 +576,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0799-Implement-getComputedBiome-API.patch b/patches/server/0798-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0799-Implement-getComputedBiome-API.patch rename to patches/server/0798-Implement-getComputedBiome-API.patch diff --git a/patches/server/0800-Make-some-itemstacks-nonnull.patch b/patches/server/0799-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0800-Make-some-itemstacks-nonnull.patch rename to patches/server/0799-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0801-Implement-enchantWithLevels-API.patch b/patches/server/0800-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0801-Implement-enchantWithLevels-API.patch rename to patches/server/0800-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0802-Fix-saving-in-unloadWorld.patch b/patches/server/0801-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0802-Fix-saving-in-unloadWorld.patch rename to patches/server/0801-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0803-Buffer-OOB-setBlock-calls.patch b/patches/server/0802-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0803-Buffer-OOB-setBlock-calls.patch rename to patches/server/0802-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0804-Add-TameableDeathMessageEvent.patch b/patches/server/0803-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0804-Add-TameableDeathMessageEvent.patch rename to patches/server/0803-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0805-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0804-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0805-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0804-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0806-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0805-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0806-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0805-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0807-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0806-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0807-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0806-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0808-Guard-against-invalid-entity-positions.patch b/patches/server/0807-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0808-Guard-against-invalid-entity-positions.patch rename to patches/server/0807-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0809-cache-resource-keys.patch b/patches/server/0808-cache-resource-keys.patch similarity index 100% rename from patches/server/0809-cache-resource-keys.patch rename to patches/server/0808-cache-resource-keys.patch diff --git a/patches/server/0810-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0809-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0810-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0809-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0811-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0810-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0811-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0810-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0812-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0811-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0812-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0811-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0813-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0812-Prevent-tile-entity-copies-loading-chunks.patch similarity index 93% rename from patches/server/0813-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0812-Prevent-tile-entity-copies-loading-chunks.patch index 6f5b29b2a0..5d7ce07699 100644 --- a/patches/server/0813-Prevent-tile-entity-copies-loading-chunks.patch +++ b/patches/server/0812-Prevent-tile-entity-copies-loading-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3b6edec55939c4fddf28b59282652493b42a2b8d..2333252a3c46affb76c09731968117fdd46a9b1b 100644 +index db79b51cbe94c8c584fcc38298638d2cf196f0ac..308d954fccded0a396fabac993762dd32c24f031 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3311,7 +3311,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0814-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0813-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0814-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0813-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0815-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0814-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0815-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0814-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0816-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0815-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 99% rename from patches/server/0816-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0815-Pass-ServerLevel-for-gamerule-callbacks.patch index 79635fc588..52df88c9a6 100644 --- a/patches/server/0816-Pass-ServerLevel-for-gamerule-callbacks.patch +++ b/patches/server/0815-Pass-ServerLevel-for-gamerule-callbacks.patch @@ -18,7 +18,7 @@ index 9a45921cbb1e7a39e6ef46cc93c14766ee8229ad..8115cf64a30b6438721769df6045e1b7 if (dedicatedserverproperties.enableQuery) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2333252a3c46affb76c09731968117fdd46a9b1b..65b94c6e2d85637342ebfb5478189536759d8338 100644 +index 308d954fccded0a396fabac993762dd32c24f031..50e07efe00f4dd989f22e0c6a9ac2f76d0ea214b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2901,7 +2901,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0817-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0816-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 93% rename from patches/server/0817-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0816-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch index 46b984988b..d5e87f2276 100644 --- a/patches/server/0817-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch +++ b/patches/server/0816-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add pre-unbreaking amount to PlayerItemDamageEvent diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 6b9924652ef3cb3b26042155b05df3458b2a25ab..ac688d6175cc4c82cb454100b19738318503701a 100644 +index 9047d65b60203062dac6eeac3b90ef3417074c09..784623eefedfb601a8e0b8b42cbdb71eaebcac84 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -607,10 +607,11 @@ public final class ItemStack { diff --git a/patches/server/0818-WorldCreator-keepSpawnLoaded.patch b/patches/server/0817-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0818-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0817-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0819-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0818-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 97% rename from patches/server/0819-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0818-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch index 91934e5589..adaea7c292 100644 --- a/patches/server/0819-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch +++ b/patches/server/0818-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Trigger bee_nest_destroyed trigger in the correct place diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index e903371b370034f6447c5f23562fe5c9d2b48dbe..a88d9c733a647d4b3ad9e079b289f2979d092b07 100644 +index a09df00d0be1621012466d6ea46a19e0087a6fa6..0d9168613effe33245b1a2be48ae3ebf1d702d31 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -428,12 +428,16 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0820-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0819-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0820-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0819-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0821-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0820-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0821-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0820-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0822-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0821-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0822-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0821-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0823-Add-PlayerStopUsingItemEvent.patch b/patches/server/0822-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0823-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0822-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0824-FallingBlock-auto-expire-setting.patch b/patches/server/0823-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0824-FallingBlock-auto-expire-setting.patch rename to patches/server/0823-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0825-Don-t-tick-markers.patch b/patches/server/0824-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0825-Don-t-tick-markers.patch rename to patches/server/0824-Don-t-tick-markers.patch diff --git a/patches/server/0826-Do-not-accept-invalid-client-settings.patch b/patches/server/0825-Do-not-accept-invalid-client-settings.patch similarity index 93% rename from patches/server/0826-Do-not-accept-invalid-client-settings.patch rename to patches/server/0825-Do-not-accept-invalid-client-settings.patch index 8b6617459b..f385551768 100644 --- a/patches/server/0826-Do-not-accept-invalid-client-settings.patch +++ b/patches/server/0825-Do-not-accept-invalid-client-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 65b94c6e2d85637342ebfb5478189536759d8338..042dea0c808d21c97f3a26027625474c6440a372 100644 +index 50e07efe00f4dd989f22e0c6a9ac2f76d0ea214b..01c252c02b7a576676a88b5f03eda4412daa3b23 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3453,6 +3453,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0827-Add-support-for-Proxy-Protocol.patch b/patches/server/0826-Add-support-for-Proxy-Protocol.patch similarity index 97% rename from patches/server/0827-Add-support-for-Proxy-Protocol.patch rename to patches/server/0826-Add-support-for-Proxy-Protocol.patch index 10999e871e..ff940e842c 100644 --- a/patches/server/0827-Add-support-for-Proxy-Protocol.patch +++ b/patches/server/0826-Add-support-for-Proxy-Protocol.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol diff --git a/build.gradle.kts b/build.gradle.kts -index f783c349fe0f4c9ebd15ea20e04b3291d294e947..19186e436cd6a5f00f0b42ac11f8050ad2ef6713 100644 +index 5df3ca7173cf27eb01475b6dc2e5aad38cd5a324..6d3d573ffc118e7f4d76422dc014a7df0384bb49 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { diff --git a/patches/server/0828-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0827-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0828-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0827-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0829-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0828-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0829-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0828-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0830-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0829-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0830-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0829-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0831-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0830-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0831-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0830-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0832-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0831-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0832-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0831-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0833-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0832-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0833-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0832-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0834-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0833-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0834-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0833-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0835-Dont-resent-entity-on-art-update.patch b/patches/server/0834-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0835-Dont-resent-entity-on-art-update.patch rename to patches/server/0834-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0836-Add-WardenAngerChangeEvent.patch b/patches/server/0835-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0836-Add-WardenAngerChangeEvent.patch rename to patches/server/0835-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0837-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0836-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0837-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0836-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0838-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0837-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0838-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0837-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0839-Nameable-Banner-API.patch b/patches/server/0838-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0839-Nameable-Banner-API.patch rename to patches/server/0838-Nameable-Banner-API.patch diff --git a/patches/server/0840-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0839-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0840-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0839-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0841-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0840-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0841-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0840-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0842-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0841-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0842-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0841-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0843-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0842-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 94% rename from patches/server/0843-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/server/0842-Don-t-print-component-in-resource-pack-rejection-mes.patch index 14f42c194f..68228734e8 100644 --- a/patches/server/0843-Don-t-print-component-in-resource-pack-rejection-mes.patch +++ b/patches/server/0842-Don-t-print-component-in-resource-pack-rejection-mes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 042dea0c808d21c97f3a26027625474c6440a372..9823e0b5b1129d22ad449acf77794c6c9975381e 100644 +index 01c252c02b7a576676a88b5f03eda4412daa3b23..bcfdbe37ed8e49fdafd0835dfaa4af4d0573840c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2035,7 +2035,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0844-Add-Player-getFishHook.patch b/patches/server/0843-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0844-Add-Player-getFishHook.patch rename to patches/server/0843-Add-Player-getFishHook.patch diff --git a/patches/server/0845-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0844-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0845-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0844-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0846-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0845-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0846-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0845-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0847-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0846-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 94% rename from patches/server/0847-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0846-Add-some-minimal-debug-information-to-chat-packet-er.patch index 92447d0b2e..478278b0b4 100644 --- a/patches/server/0847-Add-some-minimal-debug-information-to-chat-packet-er.patch +++ b/patches/server/0846-Add-some-minimal-debug-information-to-chat-packet-er.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors TODO: potentially add some kick leeway diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9823e0b5b1129d22ad449acf77794c6c9975381e..472c86d4f54d54cd5bb84d886194b3ddf7485a6e 100644 +index bcfdbe37ed8e49fdafd0835dfaa4af4d0573840c..27e86df114811775e53da2617d78160478b4a326 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2293,7 +2293,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0848-Fix-Bee-flower-NPE.patch b/patches/server/0847-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0848-Fix-Bee-flower-NPE.patch rename to patches/server/0847-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0849-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0848-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 92% rename from patches/server/0849-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0848-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch index 011e5b929f..a57a611f53 100644 --- a/patches/server/0849-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch +++ b/patches/server/0848-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 472c86d4f54d54cd5bb84d886194b3ddf7485a6e..a8465cf4b21d376b37e88a3f9fd8b6e4360ee775 100644 +index 27e86df114811775e53da2617d78160478b4a326..1c46ab884dcc9ef22935d763e152c354fd7dd000 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2540,7 +2540,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0850-More-Teleport-API.patch b/patches/server/0849-More-Teleport-API.patch similarity index 98% rename from patches/server/0850-More-Teleport-API.patch rename to patches/server/0849-More-Teleport-API.patch index 391f9be147..fa2087fcfb 100644 --- a/patches/server/0850-More-Teleport-API.patch +++ b/patches/server/0849-More-Teleport-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] More Teleport API public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a8465cf4b21d376b37e88a3f9fd8b6e4360ee775..94c1c276998b76744122f98c18f65a4e8cbccf4d 100644 +index 1c46ab884dcc9ef22935d763e152c354fd7dd000..9b63aa58423bfd235690cacc94f57c2b40a97bc5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1711,11 +1711,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -74,7 +74,7 @@ index cc72d960d9a5f9481ec2214b1549a344907a68da..94b41e9e3abe9cfbe09af67b03bc841f // Let the server handle cross world teleports if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3120f72d2ba93625931da83c1e37678c07bd69cd..65e0a7e7b210107cd8882cc48da796c470b6eec4 100644 +index 86e397e54b56e46f5f5f75529b8ee8ea4715e61d..c2006bd45a6a02eb55fbdd5625bc3cb7101bdb00 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1203,13 +1203,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0851-Add-EntityPortalReadyEvent.patch b/patches/server/0850-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0851-Add-EntityPortalReadyEvent.patch rename to patches/server/0850-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0852-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0851-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0852-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0851-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0853-Send-block-entities-after-destroy-prediction.patch b/patches/server/0852-Send-block-entities-after-destroy-prediction.patch similarity index 96% rename from patches/server/0853-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0852-Send-block-entities-after-destroy-prediction.patch index 10bf2d17e5..2e233b1b8d 100644 --- a/patches/server/0853-Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/0852-Send-block-entities-after-destroy-prediction.patch @@ -7,7 +7,7 @@ Minecraft's prediction system does not handle block entities, so if we are manua block breaking we need to set it after the prediction is finished. This fixes block entities not showing when cancelling the BlockBreakEvent. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index a88d9c733a647d4b3ad9e079b289f2979d092b07..257fa5207b889f882b77885d375564a8a7a7ac8c 100644 +index 0d9168613effe33245b1a2be48ae3ebf1d702d31..8bbfd7ea9a29d9e5a8a2502ffbb802d32cbeaeeb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -62,6 +62,8 @@ public class ServerPlayerGameMode { @@ -57,7 +57,7 @@ index a88d9c733a647d4b3ad9e079b289f2979d092b07..257fa5207b889f882b77885d375564a8 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 94c1c276998b76744122f98c18f65a4e8cbccf4d..35ef7487060f81fb106a6a882006edf03023fd01 100644 +index 9b63aa58423bfd235690cacc94f57c2b40a97bc5..90c1cd80e0d3fd0d7d66541f3d17d71353e7f258 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1857,8 +1857,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0854-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0853-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0854-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0853-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0855-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0854-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/server/0855-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0854-Custom-Chat-Completion-Suggestions-API.patch index d23a9e98bc..8cea2fb01b 100644 --- a/patches/server/0855-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/server/0854-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 65e0a7e7b210107cd8882cc48da796c470b6eec4..8369fa30d713e9917473d9d6caf4ebc4e3aad228 100644 +index c2006bd45a6a02eb55fbdd5625bc3cb7101bdb00..b2f333b88f8282b01975c622c496ca796745b1d4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -643,6 +643,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0856-Add-missing-BlockFadeEvents.patch b/patches/server/0855-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0856-Add-missing-BlockFadeEvents.patch rename to patches/server/0855-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0857-Collision-API.patch b/patches/server/0856-Collision-API.patch similarity index 100% rename from patches/server/0857-Collision-API.patch rename to patches/server/0856-Collision-API.patch diff --git a/patches/server/0858-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0857-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0858-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0857-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0859-Block-Ticking-API.patch b/patches/server/0858-Block-Ticking-API.patch similarity index 100% rename from patches/server/0859-Block-Ticking-API.patch rename to patches/server/0858-Block-Ticking-API.patch diff --git a/patches/server/0860-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0859-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0860-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0859-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0861-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0860-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0861-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0860-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0862-Add-NamespacedKey-biome-methods.patch b/patches/server/0861-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0862-Add-NamespacedKey-biome-methods.patch rename to patches/server/0861-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0863-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0862-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0863-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0862-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0864-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0864-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0865-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0864-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0865-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0864-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0866-Missing-eating-regain-reason.patch b/patches/server/0865-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0866-Missing-eating-regain-reason.patch rename to patches/server/0865-Missing-eating-regain-reason.patch diff --git a/patches/server/0867-Missing-effect-cause.patch b/patches/server/0866-Missing-effect-cause.patch similarity index 100% rename from patches/server/0867-Missing-effect-cause.patch rename to patches/server/0866-Missing-effect-cause.patch diff --git a/patches/server/0868-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0867-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0868-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0867-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0869-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0868-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0869-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0868-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0870-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0869-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0870-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0869-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0871-Configurable-chat-thread-limit.patch b/patches/server/0870-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0871-Configurable-chat-thread-limit.patch rename to patches/server/0870-Configurable-chat-thread-limit.patch diff --git a/patches/server/0872-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0871-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0872-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0871-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0873-fix-Jigsaw-block-kicking-user.patch b/patches/server/0872-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0873-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0872-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0874-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0873-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0874-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0873-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0875-Add-getDrops-to-BlockState.patch b/patches/server/0874-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0875-Add-getDrops-to-BlockState.patch rename to patches/server/0874-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0876-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch similarity index 99% rename from patches/server/0876-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch index 193fb96886..58f6a034df 100644 --- a/patches/server/0876-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch @@ -92,7 +92,7 @@ index 06df21e55fdb70558b85fc095a04b3bb64fbe770..c6a7aace64785f76792b03be08fb69e4 if (!list.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 257fa5207b889f882b77885d375564a8a7a7ac8c..92340937194a985999a85c5d387f4d73e8354d24 100644 +index 8bbfd7ea9a29d9e5a8a2502ffbb802d32cbeaeeb..6a5e3649d9843d85eceb0eae225200fa2551e844 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -92,7 +92,7 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0877-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0876-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0877-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0876-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0878-Fix-custom-piglin-loved-items.patch b/patches/server/0877-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0878-Fix-custom-piglin-loved-items.patch rename to patches/server/0877-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0879-EntityPickupItemEvent-fixes.patch b/patches/server/0878-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0879-EntityPickupItemEvent-fixes.patch rename to patches/server/0878-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0880-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0879-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 81% rename from patches/server/0880-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0879-Correctly-handle-interactions-with-items-on-cooldown.patch index 9243e65aeb..e8591d0267 100644 --- a/patches/server/0880-Correctly-handle-interactions-with-items-on-cooldown.patch +++ b/patches/server/0879-Correctly-handle-interactions-with-items-on-cooldown.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Correctly handle interactions with items on cooldown diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 92340937194a985999a85c5d387f4d73e8354d24..1635fee928d64f4d2c336dca6675ed4641918830 100644 +index 6a5e3649d9843d85eceb0eae225200fa2551e844..1635fee928d64f4d2c336dca6675ed4641918830 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -521,6 +521,7 @@ public class ServerPlayerGameMode { @@ -24,29 +24,30 @@ index 92340937194a985999a85c5d387f4d73e8354d24..1635fee928d64f4d2c336dca6675ed46 + cancelledItem = true; // Paper - correctly handle items on cooldown } -- PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, hand, hitResult.getLocation()); // Paper +- PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, hand, hitResult.getLocation()); + PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, cancelledItem, hand, hitResult.getLocation()); // Paper this.firedInteract = true; 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 94796cbe43546748b28aa921d22cb4b68ef23fa6..22ebf307641f9aa7231df8607bb859785be60f7a 100644 +index 9201e143ff520126c27a649bba62b359a01669c4..e813b58d724b9e5900df68f763ad0b59c84e47f4 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -517,6 +517,12 @@ public class CraftEventFactory { +@@ -512,7 +512,13 @@ public class CraftEventFactory { + return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, false, hand, null); } - public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, InteractionHand hand, Vec3 hitVec) { -+ // Paper start - correctly handle items on cooldown -+ return callPlayerInteractEvent(who, action, position, direction, itemstack, cancelledBlock, false, hand, hitVec); -+ } + -+ public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, boolean cancelledItem, InteractionHand hand, Vec3 hitVec) { -+ // Paper end - correctly handle items on cooldown - // Paper end ++ // Paper start - cancelledItem param + public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, InteractionHand hand, Vec3 targetPos) { ++ return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, false, false, hand, null); ++ } ++ public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, boolean cancelledItem, InteractionHand hand, Vec3 targetPos) { ++ // Paper end - cancelledItem param Player player = (who == null) ? null : (Player) who.getBukkitEntity(); CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack); -@@ -550,6 +556,11 @@ public class CraftEventFactory { + +@@ -547,6 +553,11 @@ public class CraftEventFactory { if (cancelledBlock) { event.setUseInteractedBlock(Event.Result.DENY); } diff --git a/patches/server/0881-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0880-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0881-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0880-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0882-Elder-Guardian-appearance-API.patch b/patches/server/0881-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0882-Elder-Guardian-appearance-API.patch rename to patches/server/0881-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0883-Allow-changing-bed-s-occupied-property.patch b/patches/server/0882-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0883-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0882-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0884-Add-entity-knockback-API.patch b/patches/server/0883-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0884-Add-entity-knockback-API.patch rename to patches/server/0883-Add-entity-knockback-API.patch diff --git a/patches/server/0885-Detect-headless-JREs.patch b/patches/server/0884-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0885-Detect-headless-JREs.patch rename to patches/server/0884-Detect-headless-JREs.patch diff --git a/patches/server/0886-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0885-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0886-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0885-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0887-optimized-dirt-and-snow-spreading.patch b/patches/server/0886-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0887-optimized-dirt-and-snow-spreading.patch rename to patches/server/0886-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0888-Added-EntityToggleSitEvent.patch b/patches/server/0887-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0888-Added-EntityToggleSitEvent.patch rename to patches/server/0887-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0889-Add-fire-tick-delay-option.patch b/patches/server/0888-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0889-Add-fire-tick-delay-option.patch rename to patches/server/0888-Add-fire-tick-delay-option.patch diff --git a/patches/server/0890-Add-Moving-Piston-API.patch b/patches/server/0889-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0890-Add-Moving-Piston-API.patch rename to patches/server/0889-Add-Moving-Piston-API.patch diff --git a/patches/server/0891-Ignore-impossible-spawn-tick.patch b/patches/server/0890-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0891-Ignore-impossible-spawn-tick.patch rename to patches/server/0890-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0892-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0891-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0892-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0891-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0893-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0892-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0893-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0892-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0894-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0894-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0895-Prevent-compass-from-loading-chunks.patch b/patches/server/0894-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0895-Prevent-compass-from-loading-chunks.patch rename to patches/server/0894-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0896-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0895-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0896-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0895-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0897-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0896-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0897-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0896-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0898-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0897-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0898-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0897-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0899-Add-Player-Warden-Warning-API.patch b/patches/server/0898-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0899-Add-Player-Warden-Warning-API.patch rename to patches/server/0898-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0900-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0899-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0900-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0899-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0901-Add-paper-dumplisteners-command.patch b/patches/server/0900-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0901-Add-paper-dumplisteners-command.patch rename to patches/server/0900-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0902-check-global-player-list-where-appropriate.patch b/patches/server/0901-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0902-check-global-player-list-where-appropriate.patch rename to patches/server/0901-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0903-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0902-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0903-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0902-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0904-ItemStack-damage-API.patch b/patches/server/0903-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0904-ItemStack-damage-API.patch rename to patches/server/0903-ItemStack-damage-API.patch diff --git a/patches/server/0905-Friction-API.patch b/patches/server/0904-Friction-API.patch similarity index 100% rename from patches/server/0905-Friction-API.patch rename to patches/server/0904-Friction-API.patch diff --git a/patches/server/0906-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0905-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0906-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0905-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0907-Fix-player-kick-on-shutdown.patch b/patches/server/0906-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0907-Fix-player-kick-on-shutdown.patch rename to patches/server/0906-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0908-Sync-offhand-slot-in-menus.patch b/patches/server/0907-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0908-Sync-offhand-slot-in-menus.patch rename to patches/server/0907-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0909-Player-Entity-Tracking-Events.patch b/patches/server/0908-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0909-Player-Entity-Tracking-Events.patch rename to patches/server/0908-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0910-Limit-pet-look-distance.patch b/patches/server/0909-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0910-Limit-pet-look-distance.patch rename to patches/server/0909-Limit-pet-look-distance.patch diff --git a/patches/server/0911-Properly-resend-entities.patch b/patches/server/0910-Properly-resend-entities.patch similarity index 98% rename from patches/server/0911-Properly-resend-entities.patch rename to patches/server/0910-Properly-resend-entities.patch index c1cea9b974..1de10a420a 100644 --- a/patches/server/0911-Properly-resend-entities.patch +++ b/patches/server/0910-Properly-resend-entities.patch @@ -66,7 +66,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..bf6a70a69bb695ec1a202cd1e863c468 public static class DataItem { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 35ef7487060f81fb106a6a882006edf03023fd01..1f6a0ec6e42906466aa63fe81f2d651b8512e837 100644 +index 90c1cd80e0d3fd0d7d66541f3d17d71353e7f258..ab5b5e41017cd069903cee5394494352e7ff2adf 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2799,7 +2799,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0912-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0911-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0912-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0911-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0913-fix-Instruments.patch b/patches/server/0912-fix-Instruments.patch similarity index 100% rename from patches/server/0913-fix-Instruments.patch rename to patches/server/0912-fix-Instruments.patch diff --git a/patches/server/0914-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0913-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0914-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0913-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0915-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0914-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0915-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0914-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0916-Add-BlockLockCheckEvent.patch b/patches/server/0915-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0916-Add-BlockLockCheckEvent.patch rename to patches/server/0915-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0917-Add-Sneaking-API-for-Entities.patch b/patches/server/0916-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0917-Add-Sneaking-API-for-Entities.patch rename to patches/server/0916-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0918-Improve-logging-and-errors.patch b/patches/server/0917-Improve-logging-and-errors.patch similarity index 97% rename from patches/server/0918-Improve-logging-and-errors.patch rename to patches/server/0917-Improve-logging-and-errors.patch index ce2f62a657..cfa7c7ae7c 100644 --- a/patches/server/0918-Improve-logging-and-errors.patch +++ b/patches/server/0917-Improve-logging-and-errors.patch @@ -22,7 +22,7 @@ index f6e423a76d4c9cf639f1d44af80d33cf3072f6b5..135fc81414446f24c3adad71f5199c78 Properties properties; Properties properties1; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1f6a0ec6e42906466aa63fe81f2d651b8512e837..0d998395b65be269c2b5b58acd1b2b46408f8f8e 100644 +index ab5b5e41017cd069903cee5394494352e7ff2adf..c1696b5d9d48a520c1b9a3f5abdeb1909aed0b3c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3588,7 +3588,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0919-Improve-PortalEvents.patch b/patches/server/0918-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0919-Improve-PortalEvents.patch rename to patches/server/0918-Improve-PortalEvents.patch diff --git a/patches/server/0920-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0920-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0921-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch similarity index 92% rename from patches/server/0921-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch index 8ecc1a22e8..fd93a00358 100644 --- a/patches/server/0921-Add-missing-SpigotConfig-logCommands-check.patch +++ b/patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0d998395b65be269c2b5b58acd1b2b46408f8f8e..2232139c2dc183fe9827ed6c276a4ed0f6ef3fd9 100644 +index c1696b5d9d48a520c1b9a3f5abdeb1909aed0b3c..09be9631f06705fc8f82e0de7f032bbea21dca03 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2257,7 +2257,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0922-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0921-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0922-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0921-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0923-Flying-Fall-Damage.patch b/patches/server/0922-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0923-Flying-Fall-Damage.patch rename to patches/server/0922-Flying-Fall-Damage.patch diff --git a/patches/server/0924-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0923-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/server/0924-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/server/0923-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/server/0925-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0925-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0926-config-for-disabling-entity-tag-tags.patch b/patches/server/0925-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0926-config-for-disabling-entity-tag-tags.patch rename to patches/server/0925-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0927-Use-single-player-info-update-packet-on-join.patch b/patches/server/0926-Use-single-player-info-update-packet-on-join.patch similarity index 97% rename from patches/server/0927-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0926-Use-single-player-info-update-packet-on-join.patch index 222434b107..d834385b0a 100644 --- a/patches/server/0927-Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/0926-Use-single-player-info-update-packet-on-join.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2232139c2dc183fe9827ed6c276a4ed0f6ef3fd9..ad7b15eb0a4907d3ef02e4bd57ff4d482a278099 100644 +index 09be9631f06705fc8f82e0de7f032bbea21dca03..a6eeb1dd1a7623a9ff9e1124b539cdd2c89f517c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3603,7 +3603,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0928-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0928-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0929-Win-Screen-API.patch b/patches/server/0928-Win-Screen-API.patch similarity index 100% rename from patches/server/0929-Win-Screen-API.patch rename to patches/server/0928-Win-Screen-API.patch diff --git a/patches/server/0930-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0929-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0930-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0929-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0931-Fix-force-opening-enchantment-tables.patch b/patches/server/0930-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0931-Fix-force-opening-enchantment-tables.patch rename to patches/server/0930-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0932-Add-Entity-Body-Yaw-API.patch b/patches/server/0931-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0932-Add-Entity-Body-Yaw-API.patch rename to patches/server/0931-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0933-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0932-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0933-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0932-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0934-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0933-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0934-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0933-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0935-Add-EntityFertilizeEggEvent.patch b/patches/server/0934-Add-EntityFertilizeEggEvent.patch similarity index 97% rename from patches/server/0935-Add-EntityFertilizeEggEvent.patch rename to patches/server/0934-Add-EntityFertilizeEggEvent.patch index 1d6a8aeb2c..11c26f4178 100644 --- a/patches/server/0935-Add-EntityFertilizeEggEvent.patch +++ b/patches/server/0934-Add-EntityFertilizeEggEvent.patch @@ -69,10 +69,10 @@ index c0f19138c6a00ce6ae837c972ae4af522ddd2895..a6d98f64910c816a5c11867d12698f5c world.addFreshEntity(entityitem); } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 22ebf307641f9aa7231df8607bb859785be60f7a..5cc8d5403058638ddecbed08059ecd96257f9dcb 100644 +index e813b58d724b9e5900df68f763ad0b59c84e47f4..847144ef0943e509827b06fa4668bd729e356e50 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1983,4 +1983,29 @@ public class CraftEventFactory { +@@ -1980,4 +1980,29 @@ public class CraftEventFactory { return event.callEvent(); } // Paper end diff --git a/patches/server/0936-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0935-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0936-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0935-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0937-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0936-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0937-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0936-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0938-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0937-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0938-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0937-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0939-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0939-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0940-Fix-text-display-error-on-spawn.patch b/patches/server/0939-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0940-Fix-text-display-error-on-spawn.patch rename to patches/server/0939-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0941-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0940-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0941-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0940-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0942-Add-Shearable-API.patch b/patches/server/0941-Add-Shearable-API.patch similarity index 100% rename from patches/server/0942-Add-Shearable-API.patch rename to patches/server/0941-Add-Shearable-API.patch diff --git a/patches/server/0943-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0942-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0943-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0942-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0944-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0943-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 95% rename from patches/server/0944-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/0943-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch index 9f3b11aee1..3706154e05 100644 --- a/patches/server/0944-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch +++ b/patches/server/0943-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix chiseled bookshelf and jukebox setItem with air diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java -index 1f09eaa36b670212f6f02569de3312ad0382493e..4fb5328855fe0700fbc997b9801ef2e1c14c8c8f 100644 +index bf39b8b061dd12d33217d80a4620e13ec921fe98..fd8a38dc031621b4e1bfb74a4cdf4654c5cd2b0a 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java @@ -147,7 +147,7 @@ public class ChiseledBookShelfBlockEntity extends BlockEntity implements Contain diff --git a/patches/server/0945-Optimize-Hoppers.patch b/patches/server/0944-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0945-Optimize-Hoppers.patch rename to patches/server/0944-Optimize-Hoppers.patch diff --git a/patches/server/0946-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0945-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0946-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0945-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0947-Fix-api-checking-banned-ips.patch b/patches/server/0946-Fix-api-checking-banned-ips.patch similarity index 100% rename from patches/server/0947-Fix-api-checking-banned-ips.patch rename to patches/server/0946-Fix-api-checking-banned-ips.patch diff --git a/patches/server/0948-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0947-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0948-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0947-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0949-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0948-Treat-sequence-violations-like-they-should-be.patch similarity index 91% rename from patches/server/0949-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0948-Treat-sequence-violations-like-they-should-be.patch index 06d229aac7..e6f29131f5 100644 --- a/patches/server/0949-Treat-sequence-violations-like-they-should-be.patch +++ b/patches/server/0948-Treat-sequence-violations-like-they-should-be.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ad7b15eb0a4907d3ef02e4bd57ff4d482a278099..d00d003b29d357fbd80304acc50ca13c9f5393f5 100644 +index a6eeb1dd1a7623a9ff9e1124b539cdd2c89f517c..b7d8d12bf3cafe106c976e3c2a14e1addde9795c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2127,6 +2127,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0950-remove-duplicate-animate-packet-for-records.patch b/patches/server/0949-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0950-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0949-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0951-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 97% rename from patches/server/0951-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch index 85153d77d0..5f55b8a9f1 100644 --- a/patches/server/0951-Prevent-causing-expired-keys-from-impacting-new-join.patch +++ b/patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch @@ -24,7 +24,7 @@ index 23e0e6937e28f09271a4ec7c35e0076a576cf3d3..4aa8b483841028fbcc43f9ed47730881 UPDATE_GAME_MODE((serialized, buf) -> { serialized.gameMode = GameType.byId(buf.readVarInt()); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d00d003b29d357fbd80304acc50ca13c9f5393f5..d9c2d06ae24dcf80a497e75f4c7f63d401b77f9b 100644 +index b7d8d12bf3cafe106c976e3c2a14e1addde9795c..3ac28fb22efaec7621f8e42f998fd84bbff9ec91 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -296,6 +296,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0952-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0951-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0952-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0951-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0953-Use-array-for-gamerule-storage.patch b/patches/server/0952-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0953-Use-array-for-gamerule-storage.patch rename to patches/server/0952-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0954-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0953-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0954-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0953-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0955-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0954-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0955-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0954-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0956-Add-Mob-Experience-reward-API.patch b/patches/server/0955-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0956-Add-Mob-Experience-reward-API.patch rename to patches/server/0955-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0957-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0956-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0957-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0956-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0958-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0957-Fix-DamageCause-for-Falling-Blocks.patch similarity index 88% rename from patches/server/0958-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0957-Fix-DamageCause-for-Falling-Blocks.patch index 962ecdd8fa..4aee7f13b4 100644 --- a/patches/server/0958-Fix-DamageCause-for-Falling-Blocks.patch +++ b/patches/server/0957-Fix-DamageCause-for-Falling-Blocks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 5cc8d5403058638ddecbed08059ecd96257f9dcb..0b84496161964bf84bfc08d687592b20ed06a25f 100644 +index 847144ef0943e509827b06fa4668bd729e356e50..950e0cd5266499f506792b2a0efbcf403bdb4943 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1030,6 +1030,11 @@ public class CraftEventFactory { +@@ -1027,6 +1027,11 @@ public class CraftEventFactory { } else if (source.is(DamageTypes.SONIC_BOOM)) { cause = DamageCause.SONIC_BOOM; } diff --git a/patches/server/0959-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0958-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0959-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0958-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0960-More-accurate-isInOpenWater-impl.patch b/patches/server/0959-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0960-More-accurate-isInOpenWater-impl.patch rename to patches/server/0959-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0961-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0960-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0961-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0960-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0962-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0961-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0962-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0961-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0963-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0962-Fix-destroying-beehive-without-any-players-nearby-th.patch similarity index 100% rename from patches/server/0963-Fix-destroying-beehive-without-any-players-nearby-th.patch rename to patches/server/0962-Fix-destroying-beehive-without-any-players-nearby-th.patch diff --git a/patches/server/0964-Expand-PlayerItemMendEvent.patch b/patches/server/0963-Expand-PlayerItemMendEvent.patch similarity index 96% rename from patches/server/0964-Expand-PlayerItemMendEvent.patch rename to patches/server/0963-Expand-PlayerItemMendEvent.patch index 42e104169f..b9a642317c 100644 --- a/patches/server/0964-Expand-PlayerItemMendEvent.patch +++ b/patches/server/0963-Expand-PlayerItemMendEvent.patch @@ -51,10 +51,10 @@ index 3643c7f434d8aa66633311ccb77ba4d035e8d337..59c00045ec903a635966f16cf33e5b41 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 0b84496161964bf84bfc08d687592b20ed06a25f..32fe1e498ee988566213bfcf56bf98c92a3c9871 100644 +index 950e0cd5266499f506792b2a0efbcf403bdb4943..621b6a1cacb17fff578855cf2dab8142a5f321ed 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1266,10 +1266,10 @@ public class CraftEventFactory { +@@ -1263,10 +1263,10 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0965-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0965-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0966-Add-transient-modifier-API.patch b/patches/server/0965-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0966-Add-transient-modifier-API.patch rename to patches/server/0965-Add-transient-modifier-API.patch diff --git a/patches/server/0967-Fix-block-place-logic.patch b/patches/server/0966-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0967-Fix-block-place-logic.patch rename to patches/server/0966-Fix-block-place-logic.patch diff --git a/patches/server/0968-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0967-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0968-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0967-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0969-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0968-Ignore-inline-definitions-of-trim-material-pattern.patch similarity index 100% rename from patches/server/0969-Ignore-inline-definitions-of-trim-material-pattern.patch rename to patches/server/0968-Ignore-inline-definitions-of-trim-material-pattern.patch diff --git a/patches/server/0970-Call-BlockGrowEvent-for-the-pitcher-crop.patch b/patches/server/0969-Call-BlockGrowEvent-for-the-pitcher-crop.patch similarity index 100% rename from patches/server/0970-Call-BlockGrowEvent-for-the-pitcher-crop.patch rename to patches/server/0969-Call-BlockGrowEvent-for-the-pitcher-crop.patch diff --git a/patches/server/0971-Add-API-for-waxed-signs.patch b/patches/server/0970-Add-API-for-waxed-signs.patch similarity index 100% rename from patches/server/0971-Add-API-for-waxed-signs.patch rename to patches/server/0970-Add-API-for-waxed-signs.patch diff --git a/patches/server/0972-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0971-Properly-remove-the-experimental-smithing-inventory-.patch similarity index 100% rename from patches/server/0972-Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/server/0971-Properly-remove-the-experimental-smithing-inventory-.patch diff --git a/patches/server/0973-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0972-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0973-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0972-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0974-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0973-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0974-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0973-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0975-Fix-sniffer-removeExploredLocation.patch b/patches/server/0974-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0975-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0974-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0976-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0975-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0976-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0975-Add-method-to-remove-all-active-potion-effects.patch diff --git a/work/Bukkit b/work/Bukkit index be1f33449e..0c5d870919 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit be1f33449ea205e494a7bcf2e9322319c6166204 +Subproject commit 0c5d870919854258f5f51530a66d839fba20e288 diff --git a/work/CraftBukkit b/work/CraftBukkit index 3b557627cd..b6b514b7ec 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 3b557627cd8274a4a2b16375886c492964db38eb +Subproject commit b6b514b7ec49531dc334c4e7bfee2569cfe33398