diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index edcb5d8355..11e12cc29e 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..16776e693165758e47152eb6726969426f180f14 +index 0000000000000000000000000000000000000000..e1e7c0ff7edcc5865e81d458795755649837d7fc --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,81 @@ @@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..16776e693165758e47152eb672696942 + api("com.google.guava:guava:31.0.1-jre") + api("com.google.code.gson:gson:2.8.9") + api("net.md-5:bungeecord-chat:1.16-R0.4") -+ api("org.yaml:snakeyaml:1.32") ++ api("org.yaml:snakeyaml:1.33") + + compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") @@ -96,7 +96,7 @@ index 0000000000000000000000000000000000000000..16776e693165758e47152eb672696942 + options.isDocFilesSubDirs = true + options.links( + "https://guava.dev/releases/31.0.1-jre/api/docs/", -+ "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/", ++ "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", + "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/", + "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + ) @@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..16776e693165758e47152eb672696942 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index 9909fc466d96023f0b574a9bd2a2330d433d4400..0000000000000000000000000000000000000000 +index becaae6cc840ee2ac49853e41d86087bc0e893a8..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,252 +0,0 @@ @@ -175,7 +175,7 @@ index 9909fc466d96023f0b574a9bd2a2330d433d4400..00000000000000000000000000000000 - - org.yaml - snakeyaml -- 1.32 +- 1.33 - compile - - diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch index a4a8bdd664..fd42c769ba 100644 --- a/patches/api/0002-Build-system-changes.patch +++ b/patches/api/0002-Build-system-changes.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index 16776e693165758e47152eb6726969426f180f14..850afb1ae533bfd80ba4cc062a4394123ad22dba 100644 +index e1e7c0ff7edcc5865e81d458795755649837d7fc..fc6cd4fcab1b7430cb3d5c66e386bf4ea6e8f599 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,15 +14,27 @@ dependencies { api("com.google.code.gson:gson:2.8.9") api("net.md-5:bungeecord-chat:1.16-R0.4") - api("org.yaml:snakeyaml:1.32") + api("org.yaml:snakeyaml:1.33") + // Paper start + api("com.googlecode.json-simple:json-simple:1.1.1") { + isTransitive = false // includes junit @@ -40,7 +40,7 @@ index 16776e693165758e47152eb6726969426f180f14..850afb1ae533bfd80ba4cc062a439412 @@ -64,7 +76,7 @@ tasks.withType { options.links( "https://guava.dev/releases/31.0.1-jre/api/docs/", - "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/", + "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", - "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/", + "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch index 210a9cbf33..cfac50b517 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 66430df2597f8c21c65f18e19d23e19bb8de8dbf..e1cd510edcd3809e18500451067314cd56f543b6 100644 +index f4b289d92892003bcc254a65cefe4d73c368aa55..3320666626cdadefc045331d33c3e9e9741344fc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,17 +8,37 @@ java { @@ -33,7 +33,7 @@ index 66430df2597f8c21c65f18e19d23e19bb8de8dbf..e1cd510edcd3809e18500451067314cd api("com.google.code.gson:gson:2.8.9") - api("net.md-5:bungeecord-chat:1.16-R0.4") + api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper - api("org.yaml:snakeyaml:1.32") + api("org.yaml:snakeyaml:1.33") // Paper start api("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false // includes junit @@ -51,7 +51,7 @@ index 66430df2597f8c21c65f18e19d23e19bb8de8dbf..e1cd510edcd3809e18500451067314cd compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") @@ -78,9 +98,24 @@ tasks.withType { "https://guava.dev/releases/31.0.1-jre/api/docs/", - "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/", + "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations - "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + // Paper start @@ -1805,7 +1805,7 @@ index 9566e4306ada5e82dede0f002aa06da12c44996b..4d5f0837bd0e02a30c943d8969fb6b13 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 259d878ddd4e4e2b289c0de0325ca8fd6203c484..a829779ac56a271cad463806984991b4713a27be 100644 +index 8489a0b009223b727b0393840374550a1cc192ff..bdcf5219ff1e4d4c0dc8a3423bc17b453b779473 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0030-Custom-replacement-for-eaten-items.patch b/patches/api/0030-Custom-replacement-for-eaten-items.patch index 94ff9d88e2..f7a9207fb3 100644 --- a/patches/api/0030-Custom-replacement-for-eaten-items.patch +++ b/patches/api/0030-Custom-replacement-for-eaten-items.patch @@ -5,19 +5,19 @@ Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java -index c2793f3ef01c1246c130971c17e1c2bf8f551435..373f4b5b5185aa81ff728da89c9cc4e0ccf87889 100644 +index 5c054eb531e3caf17c179aff6a712fb8c33d8f77..6110d0417340710333b44312d82c7bd5165a8954 100644 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java -@@ -22,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable { - private static final HandlerList handlers = new HandlerList(); +@@ -24,6 +24,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable { private boolean isCancelled = false; private ItemStack item; + private final EquipmentSlot hand; + @Nullable private ItemStack replacement; // Paper /** * @param player the player consuming -@@ -58,6 +59,29 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable { - } +@@ -82,6 +83,29 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable { + return hand; } + // Paper start diff --git a/patches/api/0135-Add-TNTPrimeEvent.patch b/patches/api/0134-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/api/0135-Add-TNTPrimeEvent.patch rename to patches/api/0134-Add-TNTPrimeEvent.patch diff --git a/patches/api/0134-Add-hand-to-bucket-events.patch b/patches/api/0134-Add-hand-to-bucket-events.patch deleted file mode 100644 index 85c5c370f3..0000000000 --- a/patches/api/0134-Add-hand-to-bucket-events.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Thu, 2 Aug 2018 08:44:20 -0500 -Subject: [PATCH] Add hand to bucket events - - -diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java -index 7f225baa9fd3ff6f4f950ae70f9500141c674f66..25bd8153ef2ab7ab1052cf756bb599f1095732e7 100644 ---- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java -+++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java -@@ -5,6 +5,7 @@ import org.bukkit.block.Block; - import org.bukkit.block.BlockFace; - import org.bukkit.entity.Player; - import org.bukkit.event.HandlerList; -+import org.bukkit.inventory.EquipmentSlot; - import org.bukkit.inventory.ItemStack; - import org.jetbrains.annotations.NotNull; - -@@ -22,6 +23,16 @@ public class PlayerBucketEmptyEvent extends PlayerBucketEvent { - public PlayerBucketEmptyEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand) { - super(who, block, blockClicked, blockFace, bucket, itemInHand); - } -+ // Paper start - add EquipmentSlot -+ @Deprecated -+ public PlayerBucketEmptyEvent(@NotNull final Player who, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) { -+ super(who, blockClicked, blockFace, bucket, itemInHand, hand); -+ } -+ -+ public PlayerBucketEmptyEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) { -+ super(who, block, blockClicked, blockFace, bucket, itemInHand, hand); -+ } -+ // Paper end - - @NotNull - @Override -diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java -index 0e4fa04ea73baaf2f9ad86725d379b569d7d6381..1e0f7ee7d198c08ce421ce105be42c4d01dc924f 100644 ---- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java -+++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java -@@ -5,6 +5,7 @@ import org.bukkit.block.Block; - import org.bukkit.block.BlockFace; - import org.bukkit.entity.Player; - import org.bukkit.event.Cancellable; -+import org.bukkit.inventory.EquipmentSlot; - import org.bukkit.inventory.ItemStack; - import org.jetbrains.annotations.NotNull; - import org.jetbrains.annotations.Nullable; -@@ -19,6 +20,7 @@ public abstract class PlayerBucketEvent extends PlayerEvent implements Cancellab - private final Block blockClicked; - private final BlockFace blockFace; - private final Material bucket; -+ private final EquipmentSlot hand; // Paper - add EquipmentSlot - - @Deprecated - public PlayerBucketEvent(@NotNull final Player who, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand) { -@@ -26,12 +28,24 @@ public abstract class PlayerBucketEvent extends PlayerEvent implements Cancellab - } - - public PlayerBucketEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand) { -+ // Paper start - add EquipmentSlot -+ this(who, block, blockClicked, blockFace, bucket, itemInHand, null); -+ } -+ -+ @Deprecated -+ public PlayerBucketEvent(@NotNull final Player who,@NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @Nullable final EquipmentSlot hand) { -+ this(who, null, blockClicked, blockFace, bucket, itemInHand, hand); -+ } -+ -+ public PlayerBucketEvent(@NotNull final Player who, @NotNull final Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @Nullable final EquipmentSlot hand) { -+ // Paper end - super(who); - this.block = block; - this.blockClicked = blockClicked; - this.blockFace = blockFace; - this.itemStack = itemInHand; - this.bucket = bucket; -+ this.hand = hand == null ? player.getInventory().getItemInMainHand().equals(itemInHand) ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND : hand; // Paper - add EquipmentSlot - } - - /** -@@ -93,6 +107,18 @@ public abstract class PlayerBucketEvent extends PlayerEvent implements Cancellab - return blockFace; - } - -+ // Paper start -+ /** -+ * The hand used to perform this action. -+ * -+ * @return the hand used -+ */ -+ @NotNull -+ public EquipmentSlot getHand() { -+ return hand; -+ } -+ // Paper end -+ - @Override - public boolean isCancelled() { - return cancelled; -diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java -index 77c3a6e5c89ffde564d63b98b2d9e36c356d79fd..56f1cc2d773d2c58207ee291bac596692980a731 100644 ---- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java -+++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java -@@ -5,6 +5,7 @@ import org.bukkit.block.Block; - import org.bukkit.block.BlockFace; - import org.bukkit.entity.Player; - import org.bukkit.event.HandlerList; -+import org.bukkit.inventory.EquipmentSlot; - import org.bukkit.inventory.ItemStack; - import org.jetbrains.annotations.NotNull; - -@@ -23,6 +24,18 @@ public class PlayerBucketFillEvent extends PlayerBucketEvent { - super(who, block, blockClicked, blockFace, bucket, itemInHand); - } - -+ // Paper start - add EquipmentSlot -+ @Deprecated -+ public PlayerBucketFillEvent(@NotNull final Player who, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) { -+ super(who, blockClicked, blockFace, bucket, itemInHand, hand); -+ } -+ -+ // Paper start - add EquipmentSlot -+ public PlayerBucketFillEvent(@NotNull final Player who, @NotNull Block block, @NotNull final Block blockClicked, @NotNull final BlockFace blockFace, @NotNull final Material bucket, @NotNull final ItemStack itemInHand, @org.jetbrains.annotations.Nullable final EquipmentSlot hand) { -+ super(who, block, blockClicked, blockFace, bucket, itemInHand, hand); -+ } -+ // Paper end -+ - @NotNull - @Override - public HandlerList getHandlers() { diff --git a/patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch similarity index 92% rename from patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch rename to patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch index 493bf262e6..401c96f1fa 100644 --- a/patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch +++ b/patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch @@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method to look up by the long key too. diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index 06737962b844275a74ee2407cc09918599cbaea4..1a4b6922c0a881b60ddf305b1e2b3af0dfde46c3 100644 +index 15478355e0a4f7d247f1a051cbbf841c98a7688b..e596e5d372dba6ee1e44486659332b5a747e96d5 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -28,6 +28,32 @@ public interface Chunk extends PersistentDataHolder { @@ -44,7 +44,7 @@ index 06737962b844275a74ee2407cc09918599cbaea4..1a4b6922c0a881b60ddf305b1e2b3af0 * Gets the world containing this chunk * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index f46032ac8d48ba172e6a9157dd6b477ddf2cd4cb..cbfd9f994e545aa36c62f9cf801a595d3db71e9f 100644 +index c58c9c7791eff28ba8f847f5bc60e0db757ababd..8c71be9c39ec6aae07b088a63e71cc2ae44b0412 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -212,6 +212,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 94% rename from patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index 55575b0642..5f7cd8a636 100644 --- a/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index 1a4b6922c0a881b60ddf305b1e2b3af0dfde46c3..049c36807d2a970842442c1b7517c06f3f150041 100644 +index e596e5d372dba6ee1e44486659332b5a747e96d5..e1e1bc868019f715370490719ef887e0eee3ddec 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -1,6 +1,8 @@ diff --git a/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch similarity index 100% rename from patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch rename to patches/api/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch diff --git a/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch similarity index 98% rename from patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch rename to patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch index e23878d106..5a8996d135 100644 --- a/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -50,7 +50,7 @@ index 36ed248f0716f2cc465c08ab851b7d83d4c7c0a7..5c5e05673e0912f4dbd6c728f4c3b7fc * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index cbfd9f994e545aa36c62f9cf801a595d3db71e9f..89e46828639b85da1f70f03bfd2a8e9c8487033f 100644 +index 8c71be9c39ec6aae07b088a63e71cc2ae44b0412..25e38f0f4fe36193dcc968ef7619bc8c0e705fb2 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -95,6 +95,40 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0140-Slime-Pathfinder-Events.patch b/patches/api/0139-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/api/0140-Slime-Pathfinder-Events.patch rename to patches/api/0139-Slime-Pathfinder-Events.patch diff --git a/patches/api/0141-Add-PhantomPreSpawnEvent.patch b/patches/api/0140-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/api/0141-Add-PhantomPreSpawnEvent.patch rename to patches/api/0140-Add-PhantomPreSpawnEvent.patch diff --git a/patches/api/0142-Add-More-Creeper-API.patch b/patches/api/0141-Add-More-Creeper-API.patch similarity index 100% rename from patches/api/0142-Add-More-Creeper-API.patch rename to patches/api/0141-Add-More-Creeper-API.patch diff --git a/patches/api/0143-Inventory-removeItemAnySlot.patch b/patches/api/0142-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/api/0143-Inventory-removeItemAnySlot.patch rename to patches/api/0142-Inventory-removeItemAnySlot.patch diff --git a/patches/api/0144-isChunkGenerated-API.patch b/patches/api/0143-isChunkGenerated-API.patch similarity index 96% rename from patches/api/0144-isChunkGenerated-API.patch rename to patches/api/0143-isChunkGenerated-API.patch index 1899b4e2d2..222f76220e 100644 --- a/patches/api/0144-isChunkGenerated-API.patch +++ b/patches/api/0143-isChunkGenerated-API.patch @@ -34,7 +34,7 @@ index 5c5e05673e0912f4dbd6c728f4c3b7fcdae8f0e8..57cb548683f7b2972c998afd34176952 /** * Sets the position of this Location and returns itself diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 89e46828639b85da1f70f03bfd2a8e9c8487033f..324fca7bf480a463adb30842fa169052534f5252 100644 +index 25e38f0f4fe36193dcc968ef7619bc8c0e705fb2..44b758d70b96a0ba857e1090af91893313945096 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -260,6 +260,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/api/0144-Add-source-block-constructor-and-getChangedBlockData.patch similarity index 100% rename from patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch rename to patches/api/0144-Add-source-block-constructor-and-getChangedBlockData.patch diff --git a/patches/api/0146-Async-Chunks-API.patch b/patches/api/0145-Async-Chunks-API.patch similarity index 99% rename from patches/api/0146-Async-Chunks-API.patch rename to patches/api/0145-Async-Chunks-API.patch index 67dcb55f9c..f42bce4b89 100644 --- a/patches/api/0146-Async-Chunks-API.patch +++ b/patches/api/0145-Async-Chunks-API.patch @@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously. Also adds utility methods to Entity to teleport asynchronously. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 324fca7bf480a463adb30842fa169052534f5252..3e3682be2a1afe92ccdc9a1d97469a69f952a9ed 100644 +index 44b758d70b96a0ba857e1090af91893313945096..d7f0117a8776a5bd0c6ec6c05d2c56c3b8e08de8 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -969,6 +969,482 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient @@ -495,7 +495,7 @@ index 324fca7bf480a463adb30842fa169052534f5252..3e3682be2a1afe92ccdc9a1d97469a69 /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index c6f14159067a14afd44378aaa9ac840aba2e2f9c..8751ba50a0e5d00839885ad5a905eb727445b749 100644 +index 7c867a54e18798d782971a68548eac541e9f50c0..fb3187692878e9686d54c8d022035eba2cea6f25 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -164,6 +164,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0146-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/api/0146-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0147-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch rename to patches/api/0147-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/api/0149-Improve-death-events.patch b/patches/api/0148-Improve-death-events.patch similarity index 100% rename from patches/api/0149-Improve-death-events.patch rename to patches/api/0148-Improve-death-events.patch diff --git a/patches/api/0150-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0149-Add-Git-information-to-version-command-on-startup.patch similarity index 100% rename from patches/api/0150-Add-Git-information-to-version-command-on-startup.patch rename to patches/api/0149-Add-Git-information-to-version-command-on-startup.patch diff --git a/patches/api/0151-Mob-Pathfinding-API.patch b/patches/api/0150-Mob-Pathfinding-API.patch similarity index 98% rename from patches/api/0151-Mob-Pathfinding-API.patch rename to patches/api/0150-Mob-Pathfinding-API.patch index 8c3f3a59d2..ebd31df062 100644 --- a/patches/api/0151-Mob-Pathfinding-API.patch +++ b/patches/api/0150-Mob-Pathfinding-API.patch @@ -230,7 +230,7 @@ index 0000000000000000000000000000000000000000..43f062257472a06e9e64c2feef6c3b10 + } +} diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index 00266bf81b022a0f4b4f71061b82a8713b773320..dcaddf4a1e3d954565f2110224be8e7d5c597a0a 100644 +index 4f63988848443aff55619bc12ef12c925642a3f9..6de4344931b2e3d570346b800186c44a0d5782cc 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -2,6 +2,7 @@ package org.bukkit.entity; diff --git a/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 99% rename from patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch index 56ad8fa03c..0e894e6763 100644 --- a/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch +++ b/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch @@ -226,7 +226,7 @@ index c65f0d6569c130b4920a9e71ad24af6427f1f030..01bcb3a1bdb5accdf844d0178cec3d25 return key; } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index a19635c38705e6221ae25d58e976e483e7ed17e4..71c7780424a986a95852b1ca15116096896500df 100644 +index 64114b1a9e201df369fc794fbee984d496385420..35009498aafd1bd36c493085127135fc8a5c36ec 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -444,4 +444,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste diff --git a/patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch similarity index 100% rename from patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch rename to patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch diff --git a/patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch similarity index 100% rename from patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch rename to patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch diff --git a/patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/api/0156-Material-API-additions.patch b/patches/api/0155-Material-API-additions.patch similarity index 100% rename from patches/api/0156-Material-API-additions.patch rename to patches/api/0155-Material-API-additions.patch diff --git a/patches/api/0157-Add-Material-Tags.patch b/patches/api/0156-Add-Material-Tags.patch similarity index 99% rename from patches/api/0157-Add-Material-Tags.patch rename to patches/api/0156-Add-Material-Tags.patch index 20ac53dcf4..8b13eaa41e 100644 --- a/patches/api/0157-Add-Material-Tags.patch +++ b/patches/api/0156-Add-Material-Tags.patch @@ -1073,7 +1073,7 @@ index 0000000000000000000000000000000000000000..d7eb49a05c3f0cacf285f8995433c5d5 + .ensureSize("WATER_BASED", 11).lock(); +} diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 7e3c8812247f86313c49c1a0d9af557abd30d029..33f022a01e44e6b806e6d38eef003da161b6be53 100644 +index 6f6e359dfdba27f6550719479a2256a2b159d39e..60e98f0eb8028fc9dfb73320b2939a33435174c1 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java @@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/api/0158-PreSpawnerSpawnEvent.patch b/patches/api/0157-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/api/0158-PreSpawnerSpawnEvent.patch rename to patches/api/0157-PreSpawnerSpawnEvent.patch diff --git a/patches/api/0159-Add-LivingEntity-getTargetEntity.patch b/patches/api/0158-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/api/0159-Add-LivingEntity-getTargetEntity.patch rename to patches/api/0158-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/api/0160-Add-sun-related-API.patch b/patches/api/0159-Add-sun-related-API.patch similarity index 88% rename from patches/api/0160-Add-sun-related-API.patch rename to patches/api/0159-Add-sun-related-API.patch index ce6031e8d0..714a4b24ea 100644 --- a/patches/api/0160-Add-sun-related-API.patch +++ b/patches/api/0159-Add-sun-related-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 3e3682be2a1afe92ccdc9a1d97469a69f952a9ed..8f7536e5ef73328cb69f7214956aac582a7d6f24 100644 +index d7f0117a8776a5bd0c6ec6c05d2c56c3b8e08de8..24a14005cb9c2fe7e97ba0fbd948c0c1110c52ce 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1796,6 +1796,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient @@ -26,7 +26,7 @@ index 3e3682be2a1afe92ccdc9a1d97469a69f952a9ed..8f7536e5ef73328cb69f7214956aac58 * Gets the full in-game time on this world since the world generation * diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index dcaddf4a1e3d954565f2110224be8e7d5c597a0a..4a7ffd617c2a660a4d2e9d10f54add2391f832b9 100644 +index 6de4344931b2e3d570346b800186c44a0d5782cc..7eee2e561346ac1d672f9652edb78e76c910fc9d 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -20,6 +20,13 @@ public interface Mob extends LivingEntity, Lootable { diff --git a/patches/api/0161-Turtle-API.patch b/patches/api/0160-Turtle-API.patch similarity index 100% rename from patches/api/0161-Turtle-API.patch rename to patches/api/0160-Turtle-API.patch diff --git a/patches/api/0162-Add-spectator-target-events.patch b/patches/api/0161-Add-spectator-target-events.patch similarity index 100% rename from patches/api/0162-Add-spectator-target-events.patch rename to patches/api/0161-Add-spectator-target-events.patch diff --git a/patches/api/0163-Add-more-Witch-API.patch b/patches/api/0162-Add-more-Witch-API.patch similarity index 100% rename from patches/api/0163-Add-more-Witch-API.patch rename to patches/api/0162-Add-more-Witch-API.patch diff --git a/patches/api/0164-Make-the-default-permission-message-configurable.patch b/patches/api/0163-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/api/0164-Make-the-default-permission-message-configurable.patch rename to patches/api/0163-Make-the-default-permission-message-configurable.patch diff --git a/patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch similarity index 100% rename from patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch rename to patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch diff --git a/patches/api/0166-Add-more-Zombie-API.patch b/patches/api/0165-Add-more-Zombie-API.patch similarity index 100% rename from patches/api/0166-Add-more-Zombie-API.patch rename to patches/api/0165-Add-more-Zombie-API.patch diff --git a/patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch similarity index 100% rename from patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch rename to patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch diff --git a/patches/api/0168-Add-PlayerConnectionCloseEvent.patch b/patches/api/0167-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/api/0168-Add-PlayerConnectionCloseEvent.patch rename to patches/api/0167-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 96% rename from patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 99524ae7c9..ad97b59cd4 100644 --- a/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index 9d774a10b9543e9293cb10ee9d7c9adebbfef34c..23e853bae0e051cd43deb9eb24c54e74a56d8ab0 100644 +index 93f86bb30725dff5dbfcccf15012ffd1cee237bf..a7d1f1e701f23e851f735584a30bedadb0d8b9bd 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -160,7 +160,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio diff --git a/patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch similarity index 100% rename from patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch rename to patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch diff --git a/patches/api/0171-BlockDestroyEvent.patch b/patches/api/0170-BlockDestroyEvent.patch similarity index 100% rename from patches/api/0171-BlockDestroyEvent.patch rename to patches/api/0170-BlockDestroyEvent.patch diff --git a/patches/api/0172-Add-WhitelistToggleEvent.patch b/patches/api/0171-Add-WhitelistToggleEvent.patch similarity index 100% rename from patches/api/0172-Add-WhitelistToggleEvent.patch rename to patches/api/0171-Add-WhitelistToggleEvent.patch diff --git a/patches/api/0173-Add-GS4-Query-event.patch b/patches/api/0172-Add-GS4-Query-event.patch similarity index 100% rename from patches/api/0173-Add-GS4-Query-event.patch rename to patches/api/0172-Add-GS4-Query-event.patch diff --git a/patches/api/0174-Add-PlayerPostRespawnEvent.patch b/patches/api/0173-Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/api/0174-Add-PlayerPostRespawnEvent.patch rename to patches/api/0173-Add-PlayerPostRespawnEvent.patch diff --git a/patches/api/0175-Entity-getEntitySpawnReason.patch b/patches/api/0174-Entity-getEntitySpawnReason.patch similarity index 91% rename from patches/api/0175-Entity-getEntitySpawnReason.patch rename to patches/api/0174-Entity-getEntitySpawnReason.patch index ca09ffacbc..ef8d83b271 100644 --- a/patches/api/0175-Entity-getEntitySpawnReason.patch +++ b/patches/api/0174-Entity-getEntitySpawnReason.patch @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 8751ba50a0e5d00839885ad5a905eb727445b749..f17f30a9969e52313387c0d92edd980f72687a11 100644 +index fb3187692878e9686d54c8d022035eba2cea6f25..383844bf956e70cc8a821913d5b2560226d8e2fc 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -754,5 +754,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0176-Fix-Spigot-annotation-mistakes.patch b/patches/api/0175-Fix-Spigot-annotation-mistakes.patch similarity index 100% rename from patches/api/0176-Fix-Spigot-annotation-mistakes.patch rename to patches/api/0175-Fix-Spigot-annotation-mistakes.patch diff --git a/patches/api/0177-Server-Tick-Events.patch b/patches/api/0176-Server-Tick-Events.patch similarity index 100% rename from patches/api/0177-Server-Tick-Events.patch rename to patches/api/0176-Server-Tick-Events.patch diff --git a/patches/api/0178-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/api/0178-PlayerDeathEvent-getItemsToKeep.patch rename to patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/api/0179-Add-Heightmap-API.patch b/patches/api/0178-Add-Heightmap-API.patch similarity index 99% rename from patches/api/0179-Add-Heightmap-API.patch rename to patches/api/0178-Add-Heightmap-API.patch index d2e3bd0011..c891f6d3f2 100644 --- a/patches/api/0179-Add-Heightmap-API.patch +++ b/patches/api/0178-Add-Heightmap-API.patch @@ -103,7 +103,7 @@ index d4c87bfed81b2d73919705912f59fab05c0ee61b..ef0cb00ca4cb7d2f5e4ec1c950cce036 * Creates explosion at this location with given power * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 7358c9148853d4b5b35998094838156231497747..352a20da402b3b0182b7a0c69d94397f42054053 100644 +index 891b25c84f6cc86ac3ccf61eca1d4398f31ba6b5..79b1015c56aab88ee8bf70cef0a2ab05c910d991 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -167,6 +167,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0180-Mob-Spawner-API-Enhancements.patch b/patches/api/0179-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/api/0180-Mob-Spawner-API-Enhancements.patch rename to patches/api/0179-Mob-Spawner-API-Enhancements.patch diff --git a/patches/api/0181-Add-BlockSoundGroup-interface.patch b/patches/api/0180-Add-BlockSoundGroup-interface.patch similarity index 100% rename from patches/api/0181-Add-BlockSoundGroup-interface.patch rename to patches/api/0180-Add-BlockSoundGroup-interface.patch diff --git a/patches/api/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch similarity index 100% rename from patches/api/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch rename to patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch diff --git a/patches/api/0183-Increase-custom-payload-channel-message-size.patch b/patches/api/0182-Increase-custom-payload-channel-message-size.patch similarity index 100% rename from patches/api/0183-Increase-custom-payload-channel-message-size.patch rename to patches/api/0182-Increase-custom-payload-channel-message-size.patch diff --git a/patches/api/0184-Expose-the-internal-current-tick.patch b/patches/api/0183-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/api/0184-Expose-the-internal-current-tick.patch rename to patches/api/0183-Expose-the-internal-current-tick.patch diff --git a/patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch rename to patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/api/0186-Add-effect-to-block-break-naturally.patch b/patches/api/0185-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/api/0186-Add-effect-to-block-break-naturally.patch rename to patches/api/0185-Add-effect-to-block-break-naturally.patch diff --git a/patches/api/0187-Add-ThrownEggHatchEvent.patch b/patches/api/0186-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/api/0187-Add-ThrownEggHatchEvent.patch rename to patches/api/0186-Add-ThrownEggHatchEvent.patch diff --git a/patches/api/0188-Entity-Jump-API.patch b/patches/api/0187-Entity-Jump-API.patch similarity index 100% rename from patches/api/0188-Entity-Jump-API.patch rename to patches/api/0187-Entity-Jump-API.patch diff --git a/patches/api/0189-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/api/0189-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/api/0190-Add-tick-times-API.patch b/patches/api/0189-Add-tick-times-API.patch similarity index 100% rename from patches/api/0190-Add-tick-times-API.patch rename to patches/api/0189-Add-tick-times-API.patch diff --git a/patches/api/0191-Expose-MinecraftServer-isRunning.patch b/patches/api/0190-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/api/0191-Expose-MinecraftServer-isRunning.patch rename to patches/api/0190-Expose-MinecraftServer-isRunning.patch diff --git a/patches/api/0192-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/api/0192-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/api/0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch similarity index 100% rename from patches/api/0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch rename to patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch diff --git a/patches/api/0194-Make-JavaPluginLoader-thread-safe.patch b/patches/api/0193-Make-JavaPluginLoader-thread-safe.patch similarity index 100% rename from patches/api/0194-Make-JavaPluginLoader-thread-safe.patch rename to patches/api/0193-Make-JavaPluginLoader-thread-safe.patch diff --git a/patches/api/0195-Add-Player-Client-Options-API.patch b/patches/api/0194-Add-Player-Client-Options-API.patch similarity index 100% rename from patches/api/0195-Add-Player-Client-Options-API.patch rename to patches/api/0194-Add-Player-Client-Options-API.patch diff --git a/patches/api/0196-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/api/0196-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/api/0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch similarity index 100% rename from patches/api/0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch rename to patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch diff --git a/patches/api/0198-Add-item-slot-convenience-methods.patch b/patches/api/0197-Add-item-slot-convenience-methods.patch similarity index 100% rename from patches/api/0198-Add-item-slot-convenience-methods.patch rename to patches/api/0197-Add-item-slot-convenience-methods.patch diff --git a/patches/api/0199-Villager-Restocks-API.patch b/patches/api/0198-Villager-Restocks-API.patch similarity index 100% rename from patches/api/0199-Villager-Restocks-API.patch rename to patches/api/0198-Villager-Restocks-API.patch diff --git a/patches/api/0200-Expose-game-version.patch b/patches/api/0199-Expose-game-version.patch similarity index 100% rename from patches/api/0200-Expose-game-version.patch rename to patches/api/0199-Expose-game-version.patch diff --git a/patches/api/0201-Add-Mob-Goal-API.patch b/patches/api/0200-Add-Mob-Goal-API.patch similarity index 100% rename from patches/api/0201-Add-Mob-Goal-API.patch rename to patches/api/0200-Add-Mob-Goal-API.patch diff --git a/patches/api/0202-Add-villager-reputation-API.patch b/patches/api/0201-Add-villager-reputation-API.patch similarity index 100% rename from patches/api/0202-Add-villager-reputation-API.patch rename to patches/api/0201-Add-villager-reputation-API.patch diff --git a/patches/api/0203-Spawn-Reason-API.patch b/patches/api/0202-Spawn-Reason-API.patch similarity index 100% rename from patches/api/0203-Spawn-Reason-API.patch rename to patches/api/0202-Spawn-Reason-API.patch diff --git a/patches/api/0204-Potential-bed-API.patch b/patches/api/0203-Potential-bed-API.patch similarity index 100% rename from patches/api/0204-Potential-bed-API.patch rename to patches/api/0203-Potential-bed-API.patch diff --git a/patches/api/0205-Prioritise-own-classes-where-possible.patch b/patches/api/0204-Prioritise-own-classes-where-possible.patch similarity index 100% rename from patches/api/0205-Prioritise-own-classes-where-possible.patch rename to patches/api/0204-Prioritise-own-classes-where-possible.patch diff --git a/patches/api/0206-Provide-a-useful-PluginClassLoader-toString.patch b/patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch similarity index 100% rename from patches/api/0206-Provide-a-useful-PluginClassLoader-toString.patch rename to patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch diff --git a/patches/api/0207-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/api/0207-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/api/0208-Improve-Arrow-API.patch b/patches/api/0207-Improve-Arrow-API.patch similarity index 100% rename from patches/api/0208-Improve-Arrow-API.patch rename to patches/api/0207-Improve-Arrow-API.patch diff --git a/patches/api/0209-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/api/0209-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/api/0210-Support-components-in-ItemMeta.patch b/patches/api/0209-Support-components-in-ItemMeta.patch similarity index 96% rename from patches/api/0210-Support-components-in-ItemMeta.patch rename to patches/api/0209-Support-components-in-ItemMeta.patch index d9bc5b4ade..a4e6b27bd0 100644 --- a/patches/api/0210-Support-components-in-ItemMeta.patch +++ b/patches/api/0209-Support-components-in-ItemMeta.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 5428aeb018c415f8e9bb46c84a627adf70829259..f1e9a7626c4efb99be78f1056dc04b06bbe13c87 100644 +index 1beedb446a9dd554d05d1d94dba8598e4b69eba6..c6b0fd783675cd019048e445d8e959637d90be7a 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -5,6 +5,7 @@ import java.util.Collection; diff --git a/patches/api/0211-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/api/0211-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/api/0212-Add-entity-liquid-API.patch b/patches/api/0211-Add-entity-liquid-API.patch similarity index 92% rename from patches/api/0212-Add-entity-liquid-API.patch rename to patches/api/0211-Add-entity-liquid-API.patch index 19f023a488..cf83bc59f7 100644 --- a/patches/api/0212-Add-entity-liquid-API.patch +++ b/patches/api/0211-Add-entity-liquid-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index f17f30a9969e52313387c0d92edd980f72687a11..587bf31ed2b2edc7d467d226c91c2bccdd1e4044 100644 +index 383844bf956e70cc8a821913d5b2560226d8e2fc..88e35a4e8d82e2e071ecd47fe8871e0f13a84e2e 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -760,5 +760,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0213-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/api/0213-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/api/0214-Brand-support.patch b/patches/api/0213-Brand-support.patch similarity index 100% rename from patches/api/0214-Brand-support.patch rename to patches/api/0213-Brand-support.patch diff --git a/patches/api/0215-Support-hex-colors-in-getLastColors.patch b/patches/api/0214-Support-hex-colors-in-getLastColors.patch similarity index 100% rename from patches/api/0215-Support-hex-colors-in-getLastColors.patch rename to patches/api/0214-Support-hex-colors-in-getLastColors.patch diff --git a/patches/api/0216-Add-setMaxPlayers-API.patch b/patches/api/0215-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/api/0216-Add-setMaxPlayers-API.patch rename to patches/api/0215-Add-setMaxPlayers-API.patch diff --git a/patches/api/0217-Add-BellRingEvent.patch b/patches/api/0216-Add-BellRingEvent.patch similarity index 100% rename from patches/api/0217-Add-BellRingEvent.patch rename to patches/api/0216-Add-BellRingEvent.patch diff --git a/patches/api/0218-Add-moon-phase-API.patch b/patches/api/0217-Add-moon-phase-API.patch similarity index 100% rename from patches/api/0218-Add-moon-phase-API.patch rename to patches/api/0217-Add-moon-phase-API.patch diff --git a/patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0218-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/api/0218-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/api/0220-Add-more-Evoker-API.patch b/patches/api/0219-Add-more-Evoker-API.patch similarity index 100% rename from patches/api/0220-Add-more-Evoker-API.patch rename to patches/api/0219-Add-more-Evoker-API.patch diff --git a/patches/api/0221-Add-methods-to-get-translation-keys.patch b/patches/api/0220-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/api/0221-Add-methods-to-get-translation-keys.patch rename to patches/api/0220-Add-methods-to-get-translation-keys.patch diff --git a/patches/api/0222-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/api/0222-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/api/0224-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/api/0224-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/api/0225-Entity-isTicking.patch b/patches/api/0224-Entity-isTicking.patch similarity index 88% rename from patches/api/0225-Entity-isTicking.patch rename to patches/api/0224-Entity-isTicking.patch index ec9d55e28c..36e078fb7c 100644 --- a/patches/api/0225-Entity-isTicking.patch +++ b/patches/api/0224-Entity-isTicking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 587bf31ed2b2edc7d467d226c91c2bccdd1e4044..895ccd46d6792210ac9e53093111bd9439e1a41c 100644 +index 88e35a4e8d82e2e071ecd47fe8871e0f13a84e2e..be83ba864e2b9df50275f0fcdb50dc57a955ebec 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -790,5 +790,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch similarity index 91% rename from patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch rename to patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch index 5bc3c30ecd..094bcc1ce8 100644 --- a/patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch +++ b/patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Clarify the Javadocs for Entity.getEntitySpawnReason() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 895ccd46d6792210ac9e53093111bd9439e1a41c..b9701e29d4bf2fbcc08bfacf3ebfb275fc0ae8b0 100644 +index be83ba864e2b9df50275f0fcdb50dc57a955ebec..f9b2251dbb7c9fe7dccc0fd28b4c00881124b6f3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -756,7 +756,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0227-Villager-resetOffers.patch b/patches/api/0226-Villager-resetOffers.patch similarity index 100% rename from patches/api/0227-Villager-resetOffers.patch rename to patches/api/0226-Villager-resetOffers.patch diff --git a/patches/api/0228-Player-elytra-boost-API.patch b/patches/api/0227-Player-elytra-boost-API.patch similarity index 100% rename from patches/api/0228-Player-elytra-boost-API.patch rename to patches/api/0227-Player-elytra-boost-API.patch diff --git a/patches/api/0229-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/api/0229-Add-getOfflinePlayerIfCached-String.patch rename to patches/api/0228-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/api/0230-Add-ignore-discounts-API.patch b/patches/api/0229-Add-ignore-discounts-API.patch similarity index 100% rename from patches/api/0230-Add-ignore-discounts-API.patch rename to patches/api/0229-Add-ignore-discounts-API.patch diff --git a/patches/api/0231-Item-no-age-no-player-pickup.patch b/patches/api/0230-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/api/0231-Item-no-age-no-player-pickup.patch rename to patches/api/0230-Item-no-age-no-player-pickup.patch diff --git a/patches/api/0232-Beacon-API-custom-effect-ranges.patch b/patches/api/0231-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/api/0232-Beacon-API-custom-effect-ranges.patch rename to patches/api/0231-Beacon-API-custom-effect-ranges.patch diff --git a/patches/api/0233-Add-API-for-quit-reason.patch b/patches/api/0232-Add-API-for-quit-reason.patch similarity index 100% rename from patches/api/0233-Add-API-for-quit-reason.patch rename to patches/api/0232-Add-API-for-quit-reason.patch diff --git a/patches/api/0234-Add-Destroy-Speed-API.patch b/patches/api/0233-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/api/0234-Add-Destroy-Speed-API.patch rename to patches/api/0233-Add-Destroy-Speed-API.patch diff --git a/patches/api/0235-Add-LivingEntity-clearActiveItem.patch b/patches/api/0234-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/api/0235-Add-LivingEntity-clearActiveItem.patch rename to patches/api/0234-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/api/0236-Add-PlayerItemCooldownEvent.patch b/patches/api/0235-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/api/0236-Add-PlayerItemCooldownEvent.patch rename to patches/api/0235-Add-PlayerItemCooldownEvent.patch diff --git a/patches/api/0237-More-lightning-API.patch b/patches/api/0236-More-lightning-API.patch similarity index 100% rename from patches/api/0237-More-lightning-API.patch rename to patches/api/0236-More-lightning-API.patch diff --git a/patches/api/0238-Add-PlayerShearBlockEvent.patch b/patches/api/0237-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/api/0238-Add-PlayerShearBlockEvent.patch rename to patches/api/0237-Add-PlayerShearBlockEvent.patch diff --git a/patches/api/0239-Enable-multi-release-plugin-jars.patch b/patches/api/0238-Enable-multi-release-plugin-jars.patch similarity index 100% rename from patches/api/0239-Enable-multi-release-plugin-jars.patch rename to patches/api/0238-Enable-multi-release-plugin-jars.patch diff --git a/patches/api/0240-Player-Chunk-Load-Unload-Events.patch b/patches/api/0239-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/api/0240-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0239-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/api/0241-Expose-LivingEntity-hurt-direction.patch b/patches/api/0240-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/api/0241-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0240-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/api/0242-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/api/0242-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/api/0243-Added-PlayerTradeEvent.patch b/patches/api/0242-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/api/0243-Added-PlayerTradeEvent.patch rename to patches/api/0242-Added-PlayerTradeEvent.patch diff --git a/patches/api/0244-Add-TargetHitEvent-API.patch b/patches/api/0243-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/api/0244-Add-TargetHitEvent-API.patch rename to patches/api/0243-Add-TargetHitEvent-API.patch diff --git a/patches/api/0245-Additional-Block-Material-API-s.patch b/patches/api/0244-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/api/0245-Additional-Block-Material-API-s.patch rename to patches/api/0244-Additional-Block-Material-API-s.patch diff --git a/patches/api/0246-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/api/0246-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/api/0247-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/api/0247-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/api/0248-Zombie-API-breaking-doors.patch b/patches/api/0247-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/api/0248-Zombie-API-breaking-doors.patch rename to patches/api/0247-Zombie-API-breaking-doors.patch diff --git a/patches/api/0249-Add-EntityLoadCrossbowEvent.patch b/patches/api/0248-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/api/0249-Add-EntityLoadCrossbowEvent.patch rename to patches/api/0248-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/api/0250-Added-WorldGameRuleChangeEvent.patch b/patches/api/0249-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/api/0250-Added-WorldGameRuleChangeEvent.patch rename to patches/api/0249-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/api/0251-Added-ServerResourcesReloadedEvent.patch b/patches/api/0250-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/api/0251-Added-ServerResourcesReloadedEvent.patch rename to patches/api/0250-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/api/0252-Add-BlockFailedDispenseEvent.patch b/patches/api/0251-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/api/0252-Add-BlockFailedDispenseEvent.patch rename to patches/api/0251-Add-BlockFailedDispenseEvent.patch diff --git a/patches/api/0253-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0252-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/api/0253-Added-PlayerLecternPageChangeEvent.patch rename to patches/api/0252-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/api/0254-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/api/0254-Added-PlayerLoomPatternSelectEvent.patch rename to patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/api/0255-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/api/0255-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/api/0256-Add-sendOpLevel-API.patch b/patches/api/0255-Add-sendOpLevel-API.patch similarity index 100% rename from patches/api/0256-Add-sendOpLevel-API.patch rename to patches/api/0255-Add-sendOpLevel-API.patch diff --git a/patches/api/0257-Add-PaperRegistry.patch b/patches/api/0256-Add-PaperRegistry.patch similarity index 100% rename from patches/api/0257-Add-PaperRegistry.patch rename to patches/api/0256-Add-PaperRegistry.patch diff --git a/patches/api/0258-Add-StructuresLocateEvent.patch b/patches/api/0257-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/api/0258-Add-StructuresLocateEvent.patch rename to patches/api/0257-Add-StructuresLocateEvent.patch diff --git a/patches/api/0259-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/api/0259-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/api/0260-Add-BlockPreDispenseEvent.patch b/patches/api/0259-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/api/0260-Add-BlockPreDispenseEvent.patch rename to patches/api/0259-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0261-Added-Vanilla-Entity-Tags.patch b/patches/api/0260-Added-Vanilla-Entity-Tags.patch similarity index 95% rename from patches/api/0261-Added-Vanilla-Entity-Tags.patch rename to patches/api/0260-Added-Vanilla-Entity-Tags.patch index 42d3ec2875..d7acec1bd1 100644 --- a/patches/api/0261-Added-Vanilla-Entity-Tags.patch +++ b/patches/api/0260-Added-Vanilla-Entity-Tags.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added Vanilla Entity Tags diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 33f022a01e44e6b806e6d38eef003da161b6be53..9694b862d62afbaa831735a6f6d095315bcdf37c 100644 +index 60e98f0eb8028fc9dfb73320b2939a33435174c1..92bb9bbfb9181e9aa9edfe39ddbbfa54dab14df0 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java @@ -811,6 +811,44 @@ public interface Tag extends Keyed { diff --git a/patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 87% rename from patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch index 9aed50ae84..f85f2a4f26 100644 --- a/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -56,23 +56,23 @@ index a33986a0c437a673435206fc337031a7eebdab3b..e0e068799a1868c8e561869015f41f55 @Override public HandlerList getHandlers() { diff --git a/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java -index cf78950b56d4977f6c4d9d98d183bfc5ba3bacc0..68eab1563caba1ee4f52b308f390e4e172667fc5 100644 +index 075af9c1c179bcc2f0e7cb4db4e0d54d6d58ce5c..d63bd62606763d0902ea800f0c35a1cfd07fc8ec 100644 --- a/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java -@@ -13,8 +13,15 @@ public class PlayerUnleashEntityEvent extends EntityUnleashEvent implements Canc +@@ -17,8 +17,15 @@ public class PlayerUnleashEntityEvent extends EntityUnleashEvent implements Canc private final Player player; - private boolean cancelled = false; + private final EquipmentSlot hand; + // Paper start - drop leash variable + @Deprecated - public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player) { + public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player, @NotNull EquipmentSlot hand) { - super(entity, UnleashReason.PLAYER_UNLEASH); -+ this(entity, player, false); ++ this(entity, player, hand, false); + } + -+ public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player, boolean dropLeash) { ++ public PlayerUnleashEntityEvent(@NotNull Entity entity, @NotNull Player player, @NotNull EquipmentSlot hand, boolean dropLeash) { + super(entity, UnleashReason.PLAYER_UNLEASH, dropLeash); + // Paper end this.player = player; + this.hand = hand; } - diff --git a/patches/api/0265-add-DragonEggFormEvent.patch b/patches/api/0264-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0265-add-DragonEggFormEvent.patch rename to patches/api/0264-add-DragonEggFormEvent.patch diff --git a/patches/api/0266-EntityMoveEvent.patch b/patches/api/0265-EntityMoveEvent.patch similarity index 100% rename from patches/api/0266-EntityMoveEvent.patch rename to patches/api/0265-EntityMoveEvent.patch diff --git a/patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0269-living-entity-allow-attribute-registration.patch b/patches/api/0268-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0269-living-entity-allow-attribute-registration.patch rename to patches/api/0268-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0270-Add-missing-effects.patch b/patches/api/0269-Add-missing-effects.patch similarity index 98% rename from patches/api/0270-Add-missing-effects.patch rename to patches/api/0269-Add-missing-effects.patch index 8f72589e1e..f00165350a 100644 --- a/patches/api/0270-Add-missing-effects.patch +++ b/patches/api/0269-Add-missing-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing effects diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java -index cf6b94a52d7638a52337045c1b4e7677a3fbd824..5072c5ed2635f92a6d8048b6e019c8f36338b93c 100644 +index bf752c5a71bcafe740be281cb6ef5a756c839534..3f2fb26455f6a71e43281098a2291ccf25635348 100644 --- a/src/main/java/org/bukkit/Effect.java +++ b/src/main/java/org/bukkit/Effect.java @@ -307,7 +307,100 @@ public enum Effect { diff --git a/patches/api/0271-Expose-Tracked-Players.patch b/patches/api/0270-Expose-Tracked-Players.patch similarity index 89% rename from patches/api/0271-Expose-Tracked-Players.patch rename to patches/api/0270-Expose-Tracked-Players.patch index 09aaa196fb..956218a778 100644 --- a/patches/api/0271-Expose-Tracked-Players.patch +++ b/patches/api/0270-Expose-Tracked-Players.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose Tracked Players diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index b9701e29d4bf2fbcc08bfacf3ebfb275fc0ae8b0..fd9bc146a06e06d0967d9c45421aec460e49bab6 100644 +index f9b2251dbb7c9fe7dccc0fd28b4c00881124b6f3..2eb98be7095495f0e99d46b92ccc16d19bbc411b 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -795,5 +795,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0272-Cache-the-result-of-Material-isBlock.patch b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch similarity index 100% rename from patches/api/0272-Cache-the-result-of-Material-isBlock.patch rename to patches/api/0271-Cache-the-result-of-Material-isBlock.patch diff --git a/patches/api/0273-Add-worldborder-events.patch b/patches/api/0272-Add-worldborder-events.patch similarity index 100% rename from patches/api/0273-Add-worldborder-events.patch rename to patches/api/0272-Add-worldborder-events.patch diff --git a/patches/api/0274-added-PlayerNameEntityEvent.patch b/patches/api/0273-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0274-added-PlayerNameEntityEvent.patch rename to patches/api/0273-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0275-Add-recipe-to-cook-events.patch b/patches/api/0274-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0275-Add-recipe-to-cook-events.patch rename to patches/api/0274-Add-recipe-to-cook-events.patch diff --git a/patches/api/0276-Add-Block-isValidTool.patch b/patches/api/0275-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0276-Add-Block-isValidTool.patch rename to patches/api/0275-Add-Block-isValidTool.patch diff --git a/patches/api/0277-Expand-world-key-API.patch b/patches/api/0276-Expand-world-key-API.patch similarity index 100% rename from patches/api/0277-Expand-world-key-API.patch rename to patches/api/0276-Expand-world-key-API.patch diff --git a/patches/api/0278-Item-Rarity-API.patch b/patches/api/0277-Item-Rarity-API.patch similarity index 100% rename from patches/api/0278-Item-Rarity-API.patch rename to patches/api/0277-Item-Rarity-API.patch diff --git a/patches/api/0279-Expose-protocol-version.patch b/patches/api/0278-Expose-protocol-version.patch similarity index 100% rename from patches/api/0279-Expose-protocol-version.patch rename to patches/api/0278-Expose-protocol-version.patch diff --git a/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0279-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0279-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0280-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0280-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0281-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0281-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/api/0283-Added-PlayerDeepSleepEvent.patch b/patches/api/0282-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0283-Added-PlayerDeepSleepEvent.patch rename to patches/api/0282-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0284-More-World-API.patch b/patches/api/0283-More-World-API.patch similarity index 97% rename from patches/api/0284-More-World-API.patch rename to patches/api/0283-More-World-API.patch index e7575201c0..11fd4e80e2 100644 --- a/patches/api/0284-More-World-API.patch +++ b/patches/api/0283-More-World-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More World API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 352a20da402b3b0182b7a0c69d94397f42054053..8b88146908288e7290952a6d8a9db1dbb3307f66 100644 +index 79b1015c56aab88ee8bf70cef0a2ab05c910d991..82eb04abe67e05f1bb6fd2a0350d5b2574a01d4b 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -3709,6 +3709,114 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0285-Added-PlayerBedFailEnterEvent.patch b/patches/api/0284-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0285-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0284-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0286-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0285-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0286-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0285-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0287-PlayerMoveEvent-Improvements.patch b/patches/api/0286-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0287-PlayerMoveEvent-Improvements.patch rename to patches/api/0286-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0287-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0287-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0289-Add-more-WanderingTrader-API.patch b/patches/api/0288-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0289-Add-more-WanderingTrader-API.patch rename to patches/api/0288-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0290-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0289-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0290-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0289-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0290-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0290-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0291-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0291-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0293-Inventory-close.patch b/patches/api/0292-Inventory-close.patch similarity index 100% rename from patches/api/0293-Inventory-close.patch rename to patches/api/0292-Inventory-close.patch diff --git a/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0293-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0293-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0295-Add-basic-Datapack-API.patch b/patches/api/0294-Add-basic-Datapack-API.patch similarity index 100% rename from patches/api/0295-Add-basic-Datapack-API.patch rename to patches/api/0294-Add-basic-Datapack-API.patch diff --git a/patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0295-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0295-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0297-ItemStack-repair-check-API.patch b/patches/api/0296-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0297-ItemStack-repair-check-API.patch rename to patches/api/0296-ItemStack-repair-check-API.patch diff --git a/patches/api/0298-More-Enchantment-API.patch b/patches/api/0297-More-Enchantment-API.patch similarity index 100% rename from patches/api/0298-More-Enchantment-API.patch rename to patches/api/0297-More-Enchantment-API.patch diff --git a/patches/api/0299-List-all-missing-hard-depends-not-just-first.patch b/patches/api/0298-List-all-missing-hard-depends-not-just-first.patch similarity index 100% rename from patches/api/0299-List-all-missing-hard-depends-not-just-first.patch rename to patches/api/0298-List-all-missing-hard-depends-not-just-first.patch diff --git a/patches/api/0300-Add-Mob-lookAt-API.patch b/patches/api/0299-Add-Mob-lookAt-API.patch similarity index 96% rename from patches/api/0300-Add-Mob-lookAt-API.patch rename to patches/api/0299-Add-Mob-lookAt-API.patch index 80f5c58df3..0dd5126905 100644 --- a/patches/api/0300-Add-Mob-lookAt-API.patch +++ b/patches/api/0299-Add-Mob-lookAt-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Mob#lookAt API diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index 4a7ffd617c2a660a4d2e9d10f54add2391f832b9..c6d8622fba3397cf3434726f1d7c49e95b887e46 100644 +index 7eee2e561346ac1d672f9652edb78e76c910fc9d..11b6d1aba7d1f6ae1f3c822193486f5a1478e105 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -27,6 +27,88 @@ public interface Mob extends LivingEntity, Lootable { diff --git a/patches/api/0301-ItemStack-editMeta.patch b/patches/api/0300-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0301-ItemStack-editMeta.patch rename to patches/api/0300-ItemStack-editMeta.patch diff --git a/patches/api/0302-Add-EntityInsideBlockEvent.patch b/patches/api/0301-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0302-Add-EntityInsideBlockEvent.patch rename to patches/api/0301-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0303-Attributes-API-for-item-defaults.patch b/patches/api/0302-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0303-Attributes-API-for-item-defaults.patch rename to patches/api/0302-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0303-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0303-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0305-More-Lidded-Block-API.patch b/patches/api/0304-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0305-More-Lidded-Block-API.patch rename to patches/api/0304-More-Lidded-Block-API.patch diff --git a/patches/api/0306-Add-PlayerKickEvent-causes.patch b/patches/api/0305-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/api/0306-Add-PlayerKickEvent-causes.patch rename to patches/api/0305-Add-PlayerKickEvent-causes.patch diff --git a/patches/api/0307-Add-PufferFishStateChangeEvent.patch b/patches/api/0306-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0307-Add-PufferFishStateChangeEvent.patch rename to patches/api/0306-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0308-Add-BellRevealRaiderEvent.patch b/patches/api/0307-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0308-Add-BellRevealRaiderEvent.patch rename to patches/api/0307-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0309-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0308-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0309-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0308-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0310-Add-more-line-of-sight-methods.patch b/patches/api/0309-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0310-Add-more-line-of-sight-methods.patch rename to patches/api/0309-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0311-Add-more-LimitedRegion-API.patch b/patches/api/0310-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0311-Add-more-LimitedRegion-API.patch rename to patches/api/0310-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0312-Missing-Entity-Behavior-API.patch b/patches/api/0311-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/api/0312-Missing-Entity-Behavior-API.patch rename to patches/api/0311-Missing-Entity-Behavior-API.patch diff --git a/patches/api/0313-Adds-PlayerArmSwingEvent.patch b/patches/api/0312-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0313-Adds-PlayerArmSwingEvent.patch rename to patches/api/0312-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0314-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0313-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0314-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0313-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0315-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0314-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0315-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0314-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0316-Stinger-API.patch b/patches/api/0315-Stinger-API.patch similarity index 100% rename from patches/api/0316-Stinger-API.patch rename to patches/api/0315-Stinger-API.patch diff --git a/patches/api/0317-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0316-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/api/0317-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0316-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/api/0318-Add-PlayerSetSpawnEvent.patch b/patches/api/0317-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0318-Add-PlayerSetSpawnEvent.patch rename to patches/api/0317-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0319-Added-EntityDamageItemEvent.patch b/patches/api/0318-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0319-Added-EntityDamageItemEvent.patch rename to patches/api/0318-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0320-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0319-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0320-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0319-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0321-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0320-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0321-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0320-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0322-Add-BlockBreakBlockEvent.patch b/patches/api/0321-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0322-Add-BlockBreakBlockEvent.patch rename to patches/api/0321-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0323-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0322-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0323-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0322-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0324-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0323-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/api/0324-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/api/0323-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/api/0325-More-CommandBlock-API.patch b/patches/api/0324-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0325-More-CommandBlock-API.patch rename to patches/api/0324-More-CommandBlock-API.patch diff --git a/patches/api/0326-Fix-plugin-provides-load-order.patch b/patches/api/0325-Fix-plugin-provides-load-order.patch similarity index 100% rename from patches/api/0326-Fix-plugin-provides-load-order.patch rename to patches/api/0325-Fix-plugin-provides-load-order.patch diff --git a/patches/api/0327-Add-missing-team-sidebar-display-slots.patch b/patches/api/0326-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0327-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0326-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0328-add-back-EntityPortalExitEvent.patch b/patches/api/0327-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0328-add-back-EntityPortalExitEvent.patch rename to patches/api/0327-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0329-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0328-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 95% rename from patches/api/0329-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0328-Add-methods-to-find-targets-for-lightning-strikes.patch index 90130a24da..bce5db5143 100644 --- a/patches/api/0329-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/api/0328-Add-methods-to-find-targets-for-lightning-strikes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 8b88146908288e7290952a6d8a9db1dbb3307f66..e47d0663d42fa38e5c6cd2611f99e23f8187c28f 100644 +index 82eb04abe67e05f1bb6fd2a0350d5b2574a01d4b..43d12399e807abd4c95ffec8c025373b6d344a36 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -749,6 +749,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0330-Get-entity-default-attributes.patch b/patches/api/0329-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0330-Get-entity-default-attributes.patch rename to patches/api/0329-Get-entity-default-attributes.patch diff --git a/patches/api/0331-Left-handed-API.patch b/patches/api/0330-Left-handed-API.patch similarity index 90% rename from patches/api/0331-Left-handed-API.patch rename to patches/api/0330-Left-handed-API.patch index f22529b07f..6b5d42a329 100644 --- a/patches/api/0331-Left-handed-API.patch +++ b/patches/api/0330-Left-handed-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Left handed API diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index c6d8622fba3397cf3434726f1d7c49e95b887e46..12ebceec3eb6f4c3325e6c6a592676795a988136 100644 +index 11b6d1aba7d1f6ae1f3c822193486f5a1478e105..d53de07b40d9cd63a9553d4b0ad442d526530b92 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -162,4 +162,20 @@ public interface Mob extends LivingEntity, Lootable { diff --git a/patches/api/0332-Add-advancement-display-API.patch b/patches/api/0331-Add-advancement-display-API.patch similarity index 100% rename from patches/api/0332-Add-advancement-display-API.patch rename to patches/api/0331-Add-advancement-display-API.patch diff --git a/patches/api/0333-Add-ItemFactory-getMonsterEgg-API.patch b/patches/api/0332-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/api/0333-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/api/0332-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/api/0334-Add-critical-damage-API.patch b/patches/api/0333-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0334-Add-critical-damage-API.patch rename to patches/api/0333-Add-critical-damage-API.patch diff --git a/patches/api/0335-Fix-issues-with-mob-conversion.patch b/patches/api/0334-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0335-Fix-issues-with-mob-conversion.patch rename to patches/api/0334-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0336-Add-isCollidable-methods-to-various-places.patch b/patches/api/0335-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0336-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0335-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0337-Goat-ram-API.patch b/patches/api/0336-Goat-ram-API.patch similarity index 100% rename from patches/api/0337-Goat-ram-API.patch rename to patches/api/0336-Goat-ram-API.patch diff --git a/patches/api/0338-Add-API-for-resetting-a-single-score.patch b/patches/api/0337-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0338-Add-API-for-resetting-a-single-score.patch rename to patches/api/0337-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0338-Add-Raw-Byte-Entity-Serialization.patch similarity index 96% rename from patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0338-Add-Raw-Byte-Entity-Serialization.patch index 3d0663f68d..5e45eccee8 100644 --- a/patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/api/0338-Add-Raw-Byte-Entity-Serialization.patch @@ -24,7 +24,7 @@ index be8d5c172b0a300648f21e2163ccf0a9cd7915ee..4fcafddf3792b66c618f91e04d102f37 * Return the translation key for the Material, so the client can translate it into the active * locale when using a {@link net.kyori.adventure.text.TranslatableComponent}. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index fd9bc146a06e06d0967d9c45421aec460e49bab6..f1cb02f7891e47b7c8328bfd62437deed93226b3 100644 +index 2eb98be7095495f0e99d46b92ccc16d19bbc411b..c15235b93f43746836eb4b7e136615fbc9308369 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -802,5 +802,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0340-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0339-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0340-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0339-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0341-Add-player-health-update-API.patch b/patches/api/0340-Add-player-health-update-API.patch similarity index 100% rename from patches/api/0341-Add-player-health-update-API.patch rename to patches/api/0340-Add-player-health-update-API.patch diff --git a/patches/api/0342-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0342-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0343-Add-more-Campfire-API.patch b/patches/api/0342-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0343-Add-more-Campfire-API.patch rename to patches/api/0342-Add-more-Campfire-API.patch diff --git a/patches/api/0344-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0343-Move-VehicleCollisionEvent-HandlerList-up.patch similarity index 100% rename from patches/api/0344-Move-VehicleCollisionEvent-HandlerList-up.patch rename to patches/api/0343-Move-VehicleCollisionEvent-HandlerList-up.patch diff --git a/patches/api/0345-Improve-scoreboard-entries.patch b/patches/api/0344-Improve-scoreboard-entries.patch similarity index 100% rename from patches/api/0345-Improve-scoreboard-entries.patch rename to patches/api/0344-Improve-scoreboard-entries.patch diff --git a/patches/api/0346-Entity-powdered-snow-API.patch b/patches/api/0345-Entity-powdered-snow-API.patch similarity index 94% rename from patches/api/0346-Entity-powdered-snow-API.patch rename to patches/api/0345-Entity-powdered-snow-API.patch index a223c993a8..acb53c106f 100644 --- a/patches/api/0346-Entity-powdered-snow-API.patch +++ b/patches/api/0345-Entity-powdered-snow-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity powdered snow API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index f1cb02f7891e47b7c8328bfd62437deed93226b3..80140c8636c10553c1be741b7e4e5084007279e5 100644 +index c15235b93f43746836eb4b7e136615fbc9308369..9d6af05deead57a2df9663d76d89ccd8b8aab6d5 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -829,5 +829,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0347-Add-API-for-item-entity-health.patch b/patches/api/0346-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0347-Add-API-for-item-entity-health.patch rename to patches/api/0346-Add-API-for-item-entity-health.patch diff --git a/patches/api/0348-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0347-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0348-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0347-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0349-Bucketable-API.patch b/patches/api/0348-Bucketable-API.patch similarity index 100% rename from patches/api/0349-Bucketable-API.patch rename to patches/api/0348-Bucketable-API.patch diff --git a/patches/api/0350-System-prop-for-default-config-comment-parsing.patch b/patches/api/0349-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0350-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0349-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0351-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0350-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0351-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0350-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0352-Remove-upstream-snakeyaml-fix.patch b/patches/api/0351-Remove-upstream-snakeyaml-fix.patch similarity index 100% rename from patches/api/0352-Remove-upstream-snakeyaml-fix.patch rename to patches/api/0351-Remove-upstream-snakeyaml-fix.patch diff --git a/patches/api/0353-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0352-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/api/0353-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/api/0352-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/api/0354-Multiple-Entries-with-Scoreboards.patch b/patches/api/0353-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0354-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0353-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0355-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0354-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0355-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0354-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0356-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0355-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0356-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0355-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0357-Multi-Block-Change-API.patch b/patches/api/0356-Multi-Block-Change-API.patch similarity index 100% rename from patches/api/0357-Multi-Block-Change-API.patch rename to patches/api/0356-Multi-Block-Change-API.patch diff --git a/patches/api/0358-Fix-NotePlayEvent.patch b/patches/api/0357-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0358-Fix-NotePlayEvent.patch rename to patches/api/0357-Fix-NotePlayEvent.patch diff --git a/patches/api/0359-Freeze-Tick-Lock-API.patch b/patches/api/0358-Freeze-Tick-Lock-API.patch similarity index 92% rename from patches/api/0359-Freeze-Tick-Lock-API.patch rename to patches/api/0358-Freeze-Tick-Lock-API.patch index 5e471565ab..01344fbab1 100644 --- a/patches/api/0359-Freeze-Tick-Lock-API.patch +++ b/patches/api/0358-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 80140c8636c10553c1be741b7e4e5084007279e5..461e29a0abbb021c886bffec71c948e1edc3d222 100644 +index 9d6af05deead57a2df9663d76d89ccd8b8aab6d5..f9ca4b90f92f57288654d7006613531b139dcddc 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -279,6 +279,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0360-Dolphin-API.patch b/patches/api/0359-Dolphin-API.patch similarity index 100% rename from patches/api/0360-Dolphin-API.patch rename to patches/api/0359-Dolphin-API.patch diff --git a/patches/api/0361-More-PotionEffectType-API.patch b/patches/api/0360-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0361-More-PotionEffectType-API.patch rename to patches/api/0360-More-PotionEffectType-API.patch diff --git a/patches/api/0362-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0361-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/api/0362-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0361-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/api/0363-Implement-regenerateChunk.patch b/patches/api/0362-Implement-regenerateChunk.patch similarity index 91% rename from patches/api/0363-Implement-regenerateChunk.patch rename to patches/api/0362-Implement-regenerateChunk.patch index 775ee50076..4cc4dda624 100644 --- a/patches/api/0363-Implement-regenerateChunk.patch +++ b/patches/api/0362-Implement-regenerateChunk.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement regenerateChunk diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index e47d0663d42fa38e5c6cd2611f99e23f8187c28f..e8c0c853eb52d1473c20231660355f77b1f7e016 100644 +index 43d12399e807abd4c95ffec8c025373b6d344a36..9e71e519cda72a1e2a01474f238b97015ec5115e 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -498,8 +498,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0364-Don-t-load-plugins-prefixed-with-a-dot.patch b/patches/api/0363-Don-t-load-plugins-prefixed-with-a-dot.patch similarity index 100% rename from patches/api/0364-Don-t-load-plugins-prefixed-with-a-dot.patch rename to patches/api/0363-Don-t-load-plugins-prefixed-with-a-dot.patch diff --git a/patches/api/0365-Add-GameEvent-tags.patch b/patches/api/0364-Add-GameEvent-tags.patch similarity index 91% rename from patches/api/0365-Add-GameEvent-tags.patch rename to patches/api/0364-Add-GameEvent-tags.patch index ffef095e76..a3687657c0 100644 --- a/patches/api/0365-Add-GameEvent-tags.patch +++ b/patches/api/0364-Add-GameEvent-tags.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add GameEvent tags diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 9694b862d62afbaa831735a6f6d095315bcdf37c..4749d4c01069f0e0cbe948ede1dd043baceaa97b 100644 +index 92bb9bbfb9181e9aa9edfe39ddbbfa54dab14df0..d999dae63e3796ce268b281d61b148dacacb3bad 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java @@ -848,6 +848,18 @@ public interface Tag extends Keyed { diff --git a/patches/api/0366-Furnace-RecipesUsed-API.patch b/patches/api/0365-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0366-Furnace-RecipesUsed-API.patch rename to patches/api/0365-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0367-Configurable-sculk-sensor-listener-range.patch b/patches/api/0366-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0367-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0366-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0368-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0367-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0368-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0367-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0369-Custom-Potion-Mixes.patch b/patches/api/0368-Custom-Potion-Mixes.patch similarity index 100% rename from patches/api/0369-Custom-Potion-Mixes.patch rename to patches/api/0368-Custom-Potion-Mixes.patch diff --git a/patches/api/0370-Expose-furnace-minecart-push-values.patch b/patches/api/0369-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0370-Expose-furnace-minecart-push-values.patch rename to patches/api/0369-Expose-furnace-minecart-push-values.patch diff --git a/patches/api/0371-More-Projectile-API.patch b/patches/api/0370-More-Projectile-API.patch similarity index 100% rename from patches/api/0371-More-Projectile-API.patch rename to patches/api/0370-More-Projectile-API.patch diff --git a/patches/api/0372-Add-getComputedBiome-API.patch b/patches/api/0371-Add-getComputedBiome-API.patch similarity index 100% rename from patches/api/0372-Add-getComputedBiome-API.patch rename to patches/api/0371-Add-getComputedBiome-API.patch diff --git a/patches/api/0373-Add-enchantWithLevels-API.patch b/patches/api/0372-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/api/0373-Add-enchantWithLevels-API.patch rename to patches/api/0372-Add-enchantWithLevels-API.patch diff --git a/patches/api/0374-Add-TameableDeathMessageEvent.patch b/patches/api/0373-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/api/0374-Add-TameableDeathMessageEvent.patch rename to patches/api/0373-Add-TameableDeathMessageEvent.patch diff --git a/patches/api/0375-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0374-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/api/0375-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/api/0374-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/api/0376-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0375-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/api/0376-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/api/0375-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/api/0377-Update-Folder-Uses-Plugin-Name.patch b/patches/api/0376-Update-Folder-Uses-Plugin-Name.patch similarity index 100% rename from patches/api/0377-Update-Folder-Uses-Plugin-Name.patch rename to patches/api/0376-Update-Folder-Uses-Plugin-Name.patch diff --git a/patches/api/0378-WorldCreator-keepSpawnLoaded.patch b/patches/api/0377-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/api/0378-WorldCreator-keepSpawnLoaded.patch rename to patches/api/0377-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/api/0379-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0378-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/api/0379-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/api/0378-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/api/0380-Add-PlayerStopUsingItemEvent.patch b/patches/api/0379-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/api/0380-Add-PlayerStopUsingItemEvent.patch rename to patches/api/0379-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/api/0381-FallingBlock-auto-expire-setting.patch b/patches/api/0380-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/api/0381-FallingBlock-auto-expire-setting.patch rename to patches/api/0380-FallingBlock-auto-expire-setting.patch diff --git a/patches/api/0382-Keyed-Cat-Type.patch b/patches/api/0381-Keyed-Cat-Type.patch similarity index 100% rename from patches/api/0382-Keyed-Cat-Type.patch rename to patches/api/0381-Keyed-Cat-Type.patch diff --git a/patches/api/0383-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0382-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 100% rename from patches/api/0383-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/api/0382-Add-method-isTickingWorlds-to-Bukkit.patch diff --git a/patches/api/0384-Add-WardenAngerChangeEvent.patch b/patches/api/0383-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/api/0384-Add-WardenAngerChangeEvent.patch rename to patches/api/0383-Add-WardenAngerChangeEvent.patch diff --git a/patches/api/0385-Nameable-Banner-API.patch b/patches/api/0384-Nameable-Banner-API.patch similarity index 100% rename from patches/api/0385-Nameable-Banner-API.patch rename to patches/api/0384-Nameable-Banner-API.patch diff --git a/patches/api/0386-Add-Player-getFishHook.patch b/patches/api/0385-Add-Player-getFishHook.patch similarity index 100% rename from patches/api/0386-Add-Player-getFishHook.patch rename to patches/api/0385-Add-Player-getFishHook.patch diff --git a/patches/api/0387-More-Teleport-API.patch b/patches/api/0386-More-Teleport-API.patch similarity index 99% rename from patches/api/0387-More-Teleport-API.patch rename to patches/api/0386-More-Teleport-API.patch index 98b380b070..24f17beb8d 100644 --- a/patches/api/0387-More-Teleport-API.patch +++ b/patches/api/0386-More-Teleport-API.patch @@ -76,7 +76,7 @@ index 0000000000000000000000000000000000000000..0426ee8bd71142b6f933a479c0f2e5ef + +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 461e29a0abbb021c886bffec71c948e1edc3d222..321f3ec6c7020ada38143832aea1c545850b9b21 100644 +index f9ca4b90f92f57288654d7006613531b139dcddc..8dd6c7bae8b5ce13e3b4d5847bb204dac5072da6 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -122,10 +122,77 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0388-Add-EntityPortalReadyEvent.patch b/patches/api/0387-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/api/0388-Add-EntityPortalReadyEvent.patch rename to patches/api/0387-Add-EntityPortalReadyEvent.patch diff --git a/patches/api/0389-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0388-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/api/0389-Custom-Chat-Completion-Suggestions-API.patch rename to patches/api/0388-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/api/0390-Collision-API.patch b/patches/api/0389-Collision-API.patch similarity index 96% rename from patches/api/0390-Collision-API.patch rename to patches/api/0389-Collision-API.patch index 84c0fd74ca..834d79b866 100644 --- a/patches/api/0390-Collision-API.patch +++ b/patches/api/0389-Collision-API.patch @@ -25,7 +25,7 @@ index 3f7e860de4e28745fcdf8d2f41f4a8c210f48909..39fa4c65e0f61450901662ff5c08d54a // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 321f3ec6c7020ada38143832aea1c545850b9b21..6dd81f07ef4d6993187987d3352a01771ffb715e 100644 +index 8dd6c7bae8b5ce13e3b4d5847bb204dac5072da6..d00ce1de6f683777d6ccc10c4db1c28c571dbe75 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -924,4 +924,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0391-Block-Ticking-API.patch b/patches/api/0390-Block-Ticking-API.patch similarity index 100% rename from patches/api/0391-Block-Ticking-API.patch rename to patches/api/0390-Block-Ticking-API.patch diff --git a/patches/api/0392-Add-NamespacedKey-biome-methods.patch b/patches/api/0391-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/api/0392-Add-NamespacedKey-biome-methods.patch rename to patches/api/0391-Add-NamespacedKey-biome-methods.patch diff --git a/patches/api/0393-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/api/0392-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 100% rename from patches/api/0393-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/api/0392-Add-custom-destroyerIdentity-to-sendBlockDamage.patch diff --git a/patches/api/0394-Also-load-resources-from-LibraryLoader.patch b/patches/api/0393-Also-load-resources-from-LibraryLoader.patch similarity index 100% rename from patches/api/0394-Also-load-resources-from-LibraryLoader.patch rename to patches/api/0393-Also-load-resources-from-LibraryLoader.patch diff --git a/patches/api/0395-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0394-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/api/0395-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/api/0394-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/api/0396-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0395-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/api/0396-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/api/0395-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/api/0397-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 82% rename from patches/api/0397-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch index cbaa0fa6b5..7fe0223346 100644 --- a/patches/api/0397-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch +++ b/patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch @@ -5,19 +5,6 @@ Subject: [PATCH] Expose codepoint limit in YamlConfigOptions, and increase default -diff --git a/build.gradle.kts b/build.gradle.kts -index ea41ad342b0b4b4504deffc216541580879197bf..428e7777906aa5177c5c6489838e6400349bb62f 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -26,7 +26,7 @@ dependencies { - api("com.google.guava:guava:31.0.1-jre") - api("com.google.code.gson:gson:2.8.9") - api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper -- api("org.yaml:snakeyaml:1.32") -+ api("org.yaml:snakeyaml:1.33") // Paper - // Paper start - api("com.googlecode.json-simple:json-simple:1.1.1") { - isTransitive = false // includes junit diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java index 0a03cefda788b1dc57ddd61914492a15788aa3d5..df98d2c12ef4867118aba3452c3aba1175faab4e 100644 --- a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java diff --git a/patches/api/0398-Add-system-property-to-print-stacktrace-on-bad-plugi.patch b/patches/api/0397-Add-system-property-to-print-stacktrace-on-bad-plugi.patch similarity index 100% rename from patches/api/0398-Add-system-property-to-print-stacktrace-on-bad-plugi.patch rename to patches/api/0397-Add-system-property-to-print-stacktrace-on-bad-plugi.patch diff --git a/patches/api/0399-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/api/0398-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch similarity index 100% rename from patches/api/0399-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch rename to patches/api/0398-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch diff --git a/patches/server/0009-Adventure.patch b/patches/server/0009-Adventure.patch index 35a7393050..a0d43a7b04 100644 --- a/patches/server/0009-Adventure.patch +++ b/patches/server/0009-Adventure.patch @@ -3625,10 +3625,10 @@ index 75143ba3e1e8a001801455c9bf1235186833dbae..10a9a108448509ceb7d40a4bddb06738 private final Player.Spigot spigot = new Player.Spigot() { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d0699be22411796174b58733cfb79b80c89f9769..97a614e2367439dbface4a258f966c0440ef965d 100644 +index 984dd8d3ce4da655f3f239aa5982eccba48c6de5..2766f670f7bbe03c23552eb2ccf71d6397cfb150 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -816,9 +816,9 @@ public class CraftEventFactory { +@@ -820,9 +820,9 @@ public class CraftEventFactory { return event; } @@ -3640,7 +3640,7 @@ index d0699be22411796174b58733cfb79b80c89f9769..97a614e2367439dbface4a258f966c04 event.setKeepInventory(keepInventory); event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel org.bukkit.World world = entity.getWorld(); -@@ -843,7 +843,7 @@ public class CraftEventFactory { +@@ -847,7 +847,7 @@ public class CraftEventFactory { * Server methods */ public static ServerListPingEvent callServerListPingEvent(Server craftServer, InetAddress address, String motd, boolean shouldSendChatPreviews, int numPlayers, int maxPlayers) { diff --git a/patches/server/0012-Timings-v2.patch b/patches/server/0012-Timings-v2.patch index 7d8b8c763c..4a91e5d9a4 100644 --- a/patches/server/0012-Timings-v2.patch +++ b/patches/server/0012-Timings-v2.patch @@ -1425,7 +1425,7 @@ index cdf8020194f2ec1fe7b65b22c8e1f5b1c23eaefa..2db27f5e3e3c1bb0502c055f78c4a81e } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae8b29345f 100644 +index e283e8383a52c74cebd16fa7642a5e3993b2ed1a..8c2d76c27c784536c3b573bf4ae4f47c2c3c4b6b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -140,7 +140,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -1437,7 +1437,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae public abstract class LivingEntity extends Entity { -@@ -2817,7 +2817,6 @@ public abstract class LivingEntity extends Entity { +@@ -2820,7 +2820,6 @@ public abstract class LivingEntity extends Entity { @Override public void tick() { @@ -1445,7 +1445,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae super.tick(); this.updatingUsingItem(); this.updateSwimAmount(); -@@ -2859,9 +2858,7 @@ public abstract class LivingEntity extends Entity { +@@ -2862,9 +2861,7 @@ public abstract class LivingEntity extends Entity { } if (!this.isRemoved()) { @@ -1455,7 +1455,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae } double d0 = this.getX() - this.xo; -@@ -2943,8 +2940,6 @@ public abstract class LivingEntity extends Entity { +@@ -2946,8 +2943,6 @@ public abstract class LivingEntity extends Entity { if (this.isSleeping()) { this.setXRot(0.0F); } @@ -1464,7 +1464,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae } public void detectEquipmentUpdates() { -@@ -3126,7 +3121,6 @@ public abstract class LivingEntity extends Entity { +@@ -3129,7 +3124,6 @@ public abstract class LivingEntity extends Entity { this.setDeltaMovement(d4, d5, d6); this.level.getProfiler().push("ai"); @@ -1472,7 +1472,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae if (this.isImmobile()) { this.jumping = false; this.xxa = 0.0F; -@@ -3136,7 +3130,6 @@ public abstract class LivingEntity extends Entity { +@@ -3139,7 +3133,6 @@ public abstract class LivingEntity extends Entity { this.serverAiStep(); this.level.getProfiler().pop(); } @@ -1480,7 +1480,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae this.level.getProfiler().pop(); this.level.getProfiler().push("jump"); -@@ -3171,9 +3164,9 @@ public abstract class LivingEntity extends Entity { +@@ -3174,9 +3167,9 @@ public abstract class LivingEntity extends Entity { this.updateFallFlying(); AABB axisalignedbb = this.getBoundingBox(); @@ -1492,7 +1492,7 @@ index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae this.level.getProfiler().pop(); this.level.getProfiler().push("freezing"); boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES); -@@ -3202,9 +3195,7 @@ public abstract class LivingEntity extends Entity { +@@ -3205,9 +3198,7 @@ public abstract class LivingEntity extends Entity { this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox()); } diff --git a/patches/server/0059-Add-exception-reporting-event.patch b/patches/server/0059-Add-exception-reporting-event.patch index 528721a007..9751038977 100644 --- a/patches/server/0059-Add-exception-reporting-event.patch +++ b/patches/server/0059-Add-exception-reporting-event.patch @@ -111,10 +111,10 @@ index 1473664f94f228abd81b8c654d105b8a76cc49e9..65fd3a3c1f0a55d034e6f91c4f222e64 // Paper end } diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index b37e04a0c466dacf52e74a4d4fb0885511c2abc1..878fc7f57178bff0e42fd01434f0aaa2732f5a5b 100644 +index 992b1eb2e4151863ba7900c3f7eaa8e56c0de7fa..c6ba7427b53398ddc8f0c942a810fad6e24561b4 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -@@ -289,6 +289,7 @@ public final class NaturalSpawner { +@@ -290,6 +290,7 @@ public final class NaturalSpawner { } } catch (Exception exception) { NaturalSpawner.LOGGER.warn("Failed to create mob", exception); @@ -122,7 +122,7 @@ index b37e04a0c466dacf52e74a4d4fb0885511c2abc1..878fc7f57178bff0e42fd01434f0aaa2 return null; } } -@@ -401,6 +402,7 @@ public final class NaturalSpawner { +@@ -402,6 +403,7 @@ public final class NaturalSpawner { entity = biomesettingsmobs_c.type.create(world.getLevel()); } catch (Exception exception) { NaturalSpawner.LOGGER.warn("Failed to create mob", exception); diff --git a/patches/server/0071-Custom-replacement-for-eaten-items.patch b/patches/server/0071-Custom-replacement-for-eaten-items.patch index f241818165..62f3354374 100644 --- a/patches/server/0071-Custom-replacement-for-eaten-items.patch +++ b/patches/server/0071-Custom-replacement-for-eaten-items.patch @@ -5,22 +5,23 @@ Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4e192c98b7beb23ac75b7442883eba7bb98dc475..5678461976a07f9afecccb1d34ea3eec24fba80e 100644 +index f513e9abb929fbabe12e40bb56af708745ea1ad9..d038c65e8a3d4a0000465e9d3ac7c4915b1b1015 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3611,9 +3611,10 @@ public abstract class LivingEntity extends Entity { +@@ -3614,10 +3614,11 @@ public abstract class LivingEntity extends Entity { this.triggerItemUseEffects(this.useItem, 16); // CraftBukkit start - fire PlayerItemConsumeEvent ItemStack itemstack; -+ PlayerItemConsumeEvent event = null; // Paper ++ PlayerItemConsumeEvent event = null; // Paper if (this instanceof ServerPlayer) { org.bukkit.inventory.ItemStack craftItem = CraftItemStack.asBukkitCopy(this.useItem); -- PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); -+ event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); // Paper + org.bukkit.inventory.EquipmentSlot hand = org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(enumhand); +- PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand); ++ event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand); // Paper level.getCraftServer().getPluginManager().callEvent(event); if (event.isCancelled()) { -@@ -3627,6 +3628,13 @@ public abstract class LivingEntity extends Entity { +@@ -3631,6 +3632,13 @@ public abstract class LivingEntity extends Entity { } else { itemstack = this.useItem.finishUsingItem(this.level, this); } @@ -34,7 +35,7 @@ index 4e192c98b7beb23ac75b7442883eba7bb98dc475..5678461976a07f9afecccb1d34ea3eec // CraftBukkit end if (itemstack != this.useItem) { -@@ -3634,6 +3642,11 @@ public abstract class LivingEntity extends Entity { +@@ -3638,6 +3646,11 @@ public abstract class LivingEntity extends Entity { } this.stopUsingItem(); diff --git a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 0313a6da1c..a32c66067a 100644 --- a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -5,7 +5,7 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5678461976a07f9afecccb1d34ea3eec24fba80e..8dc6fbbdfaecf0eb38a876d87d77f111541f766d 100644 +index d038c65e8a3d4a0000465e9d3ac7c4915b1b1015..2cf58d6e086c1d6cc86ed689eb0d1cdc89b69477 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -784,7 +784,13 @@ public abstract class LivingEntity extends Entity { @@ -34,7 +34,7 @@ index 5678461976a07f9afecccb1d34ea3eec24fba80e..8dc6fbbdfaecf0eb38a876d87d77f111 // CraftBukkit start - Handle scaled health if (this instanceof ServerPlayer) { org.bukkit.craftbukkit.entity.CraftPlayer player = ((ServerPlayer) this).getBukkitEntity(); -@@ -3444,7 +3454,7 @@ public abstract class LivingEntity extends Entity { +@@ -3447,7 +3457,7 @@ public abstract class LivingEntity extends Entity { } public void setAbsorptionAmount(float amount) { @@ -44,7 +44,7 @@ index 5678461976a07f9afecccb1d34ea3eec24fba80e..8dc6fbbdfaecf0eb38a876d87d77f111 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 307c76b2d06b748304d28d6634e86bb91f3ded67..4b7e5996b8b49d96f14cbd0d2167a0a09b47f4ec 100644 +index 15257f9236d0c32c1c74a15ce4e7decf4d9f2f91..1e1deab4d8be5523a55daf072d7e12b08d36b560 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2011,6 +2011,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/server/0109-Add-EntityZapEvent.patch index 545c1bc427..c713a5e65f 100644 --- a/patches/server/0109-Add-EntityZapEvent.patch +++ b/patches/server/0109-Add-EntityZapEvent.patch @@ -28,10 +28,10 @@ index 2a7c82be934a965ba26dc7bf1f60689360bda487..33d1a6b31afec4dbeb00dcabf50c5840 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 97a614e2367439dbface4a258f966c0440ef965d..a2e289ac5e3d0d04b65ec3bf03bebbaad585cc24 100644 +index 2766f670f7bbe03c23552eb2ccf71d6397cfb150..5ccaa797f0f794c71c9402c3b440c681defd0952 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1153,6 +1153,14 @@ public class CraftEventFactory { +@@ -1157,6 +1157,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 e290b2ac51..09c8255560 100644 --- a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch +++ b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java -index dba0bc7dc8fd1993f45716a398b1ccf52d3d868b..b3433ce9c722bdab81848a6c2d121ca510c48509 100644 +index 7942338e300cf5c70cb52e6ddce32f8cf9163c27..63b57d47d7dbb7a8a655b1447241e20c67a3f9c2 100644 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java @@ -247,7 +247,7 @@ public class ExperienceOrb extends Entity { @@ -18,10 +18,10 @@ index dba0bc7dc8fd1993f45716a398b1ccf52d3d868b..b3433ce9c722bdab81848a6c2d121ca5 --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 a2e289ac5e3d0d04b65ec3bf03bebbaad585cc24..09a5c7a95f87e35c43d07974f5884e28833f9777 100644 +index 5ccaa797f0f794c71c9402c3b440c681defd0952..e74335de3685e90abc97fbefe91a0c5837ed0551 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1112,6 +1112,17 @@ public class CraftEventFactory { +@@ -1116,6 +1116,17 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/server/0114-Add-ProjectileCollideEvent.patch index 150e864a9e..8c5308cbe4 100644 --- a/patches/server/0114-Add-ProjectileCollideEvent.patch +++ b/patches/server/0114-Add-ProjectileCollideEvent.patch @@ -87,10 +87,10 @@ index 88181c59e604ba3b132b9e695cef5eaf5b836029..94d09b05737679b133ec462815b010b1 this.checkInsideBlocks(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 09a5c7a95f87e35c43d07974f5884e28833f9777..e00f87e4a9384c60e5fe4c33a9f27541366ae81b 100644 +index e74335de3685e90abc97fbefe91a0c5837ed0551..b267e220e0b8fcd69f1b672db27273e76a46731a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1256,6 +1256,16 @@ public class CraftEventFactory { +@@ -1260,6 +1260,16 @@ public class CraftEventFactory { return CraftItemStack.asNMSCopy(bitem); } diff --git a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch index 6b19100733..59fc5fcbf3 100644 --- a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index bd0f3295932220e88dfd72b1719651b132a325f9..def35ca400cb315a9eea035026412b69ec51b1a8 100644 +index 3869aae0bcf3d4fb53009b314f8b869198e26ce5..58882569595a21b0499921dfddcbc9d01248cf1c 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -91,6 +91,7 @@ public class ArmorStand extends LivingEntity { @@ -16,7 +16,7 @@ index bd0f3295932220e88dfd72b1719651b132a325f9..def35ca400cb315a9eea035026412b69 public ArmorStand(EntityType type, Level world) { super(type, world); -@@ -925,4 +926,13 @@ public class ArmorStand extends LivingEntity { +@@ -926,4 +927,13 @@ public class ArmorStand extends LivingEntity { public boolean canBeSeenByAnyone() { return !this.isInvisible() && !this.isMarker(); } diff --git a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 40dfa4dd65..9efb14a80f 100644 --- a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -21,7 +21,7 @@ index cd3b4c97374d44f5a0e710e03f4ac38938757e25..b18bb06caf5f034dffbb72120c8f21da return true; diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java -index b3433ce9c722bdab81848a6c2d121ca510c48509..16a1a005f2dda30cf804bf51638383ef3bfeb43e 100644 +index 63b57d47d7dbb7a8a655b1447241e20c67a3f9c2..0c19aa68dc444373bf1a9bd3b349d12df7d8dd9d 100644 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java @@ -37,13 +37,65 @@ public class ExperienceOrb extends Entity { @@ -131,10 +131,10 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..16a1a005f2dda30cf804bf51638383ef @Override diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 707a7fc783973d4806e10f59eb6202e408991223..45b76070d6a178ffb5cd378cbeb12342eab4f360 100644 +index 37076ea1f07108db37dd67f5f7d4466534994a9f..3e2dd4a1fb1e2a99da88d392457d92eb9087c430 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1723,7 +1723,8 @@ public abstract class LivingEntity extends Entity { +@@ -1726,7 +1726,8 @@ public abstract class LivingEntity extends Entity { protected void dropExperience() { // CraftBukkit start - Update getExpReward() above if the removed if() changes! if (true && !(this instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon)) { // CraftBukkit - SPIGOT-2420: Special case ender dragon will drop the xp over time diff --git a/patches/server/0129-Cap-Entity-Collisions.patch b/patches/server/0129-Cap-Entity-Collisions.patch index 6aa10f4072..53b175e41e 100644 --- a/patches/server/0129-Cap-Entity-Collisions.patch +++ b/patches/server/0129-Cap-Entity-Collisions.patch @@ -24,10 +24,10 @@ index b4d96dfc68788a4eae2197a0f2615de213d5ca8b..6e1b53317c4107f907e551a9baeaf649 private org.bukkit.util.Vector origin; @javax.annotation.Nullable diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 45b76070d6a178ffb5cd378cbeb12342eab4f360..e711c02279ff48e76038a6281bbe8060e34d900b 100644 +index 3e2dd4a1fb1e2a99da88d392457d92eb9087c430..2e006451768f08998dfae3999f28429ef0b491af 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3286,8 +3286,11 @@ public abstract class LivingEntity extends Entity { +@@ -3289,8 +3289,11 @@ public abstract class LivingEntity extends Entity { } } diff --git a/patches/server/0131-Do-not-let-armorstands-drown.patch b/patches/server/0131-Do-not-let-armorstands-drown.patch index 948bf3a496..a248b55fa2 100644 --- a/patches/server/0131-Do-not-let-armorstands-drown.patch +++ b/patches/server/0131-Do-not-let-armorstands-drown.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Do not let armorstands drown diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index def35ca400cb315a9eea035026412b69ec51b1a8..ed698f3e3f9ed6003fe621c5f6f7e3a151a1a559 100644 +index 58882569595a21b0499921dfddcbc9d01248cf1c..4398a33df4e0f0e9d28c51af3d48e41d957d7c9e 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -@@ -934,5 +934,12 @@ public class ArmorStand extends LivingEntity { +@@ -935,5 +935,12 @@ public class ArmorStand extends LivingEntity { super.move(type, movement); } } diff --git a/patches/server/0163-Add-PlayerArmorChangeEvent.patch b/patches/server/0163-Add-PlayerArmorChangeEvent.patch index fe028a5f3e..cb61894887 100644 --- a/patches/server/0163-Add-PlayerArmorChangeEvent.patch +++ b/patches/server/0163-Add-PlayerArmorChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e711c02279ff48e76038a6281bbe8060e34d900b..2eb002d6231dcb2a4bf4b1eb96ca4ecdb6d4bca2 100644 +index 2e006451768f08998dfae3999f28429ef0b491af..b1ad2db0b3e0f5b287621e8096fb5fc7dd5ce32d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1,5 +1,6 @@ @@ -15,7 +15,7 @@ index e711c02279ff48e76038a6281bbe8060e34d900b..2eb002d6231dcb2a4bf4b1eb96ca4ecd import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -@@ -2999,6 +3000,13 @@ public abstract class LivingEntity extends Entity { +@@ -3002,6 +3003,13 @@ public abstract class LivingEntity extends Entity { ItemStack itemstack1 = this.getItemBySlot(enumitemslot); if (!ItemStack.matches(itemstack1, itemstack)) { diff --git a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch index 4adad63f75..01a9b6f752 100644 --- a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch @@ -10,7 +10,7 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index dd86f2055af67f35a5d265b78e99b12e7b7926ad..9f959cbb6e8685dacccec1d8df68d4a8a94ab81e 100644 +index 6dd5deecd404a3b9858e63da6837caf2d5d382f0..a08c03bb984d27ded2979353f207693fb79d4256 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1444,7 +1444,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -32,7 +32,7 @@ index dd86f2055af67f35a5d265b78e99b12e7b7926ad..9f959cbb6e8685dacccec1d8df68d4a8 + orb.setPosRaw(handle.getX(), handle.getY(), handle.getZ()); + + int i = Math.min(orb.xpToDurability(amount), itemstack.getDamageValue()); -+ org.bukkit.event.player.PlayerItemMendEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemMendEvent(handle, orb, itemstack, i); ++ org.bukkit.event.player.PlayerItemMendEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemMendEvent(handle, orb, itemstack, stackEntry.getKey(), i); + i = event.getRepairAmount(); + orb.discard(); + if (!event.isCancelled()) { diff --git a/patches/server/0173-PreCreatureSpawnEvent.patch b/patches/server/0173-PreCreatureSpawnEvent.patch index 82fc009561..69bfbb5b34 100644 --- a/patches/server/0173-PreCreatureSpawnEvent.patch +++ b/patches/server/0173-PreCreatureSpawnEvent.patch @@ -129,7 +129,7 @@ index ac767d107ea0d856f3f8caccfe6f79b14e933005..ffb7a0b7c1ae53e1340f2cdb7840ee2c Entity entity = EntityType.loadEntityRecursive(nbttagcompound, world, (entity1) -> { entity1.moveTo(d0, d1, d2, entity1.getYRot(), entity1.getXRot()); diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 878fc7f57178bff0e42fd01434f0aaa2732f5a5b..ec6fcfc94b34d2b523c011b197e6484d13517c36 100644 +index c6ba7427b53398ddc8f0c942a810fad6e24561b4..08340299538f1adacddc6d5022482a5307c06f78 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -212,7 +212,13 @@ public final class NaturalSpawner { @@ -147,7 +147,7 @@ index 878fc7f57178bff0e42fd01434f0aaa2732f5a5b..ec6fcfc94b34d2b523c011b197e6484d Mob entityinsentient = NaturalSpawner.getMobForSpawn(world, biomesettingsmobs_c.type); if (entityinsentient == null) { -@@ -259,9 +265,25 @@ public final class NaturalSpawner { +@@ -260,9 +266,25 @@ public final class NaturalSpawner { return squaredDistance <= 576.0D ? false : (world.getSharedSpawnPos().closerToCenterThan(new Vec3((double) pos.getX() + 0.5D, (double) pos.getY(), (double) pos.getZ() + 0.5D), 24.0D) ? false : Objects.equals(new ChunkPos(pos), chunk.getPos()) || world.isNaturalSpawningAllowed((BlockPos) pos)); } diff --git a/patches/server/0208-Make-shield-blocking-delay-configurable.patch b/patches/server/0208-Make-shield-blocking-delay-configurable.patch index a1c2cf0105..7908d769f8 100644 --- a/patches/server/0208-Make-shield-blocking-delay-configurable.patch +++ b/patches/server/0208-Make-shield-blocking-delay-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2eb002d6231dcb2a4bf4b1eb96ca4ecdb6d4bca2..3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc 100644 +index b1ad2db0b3e0f5b287621e8096fb5fc7dd5ce32d..dee8ae99220c84b969be18dd7e1ef05ce088b937 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3722,12 +3722,24 @@ public abstract class LivingEntity extends Entity { +@@ -3726,12 +3726,24 @@ public abstract class LivingEntity extends Entity { if (this.isUsingItem() && !this.useItem.isEmpty()) { Item item = this.useItem.getItem(); diff --git a/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch index e1f1a50195..8fffb8f4b8 100644 --- a/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch +++ b/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent This event is called when an entity receives knockback by another entity. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc..84b6c2f73e0f6f3ad3969e7d51f6617e172764ec 100644 +index dee8ae99220c84b969be18dd7e1ef05ce088b937..30983979f3501c693c7d1f96c47d9cfa1eaa243a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1456,7 +1456,7 @@ public abstract class LivingEntity extends Entity { @@ -27,7 +27,7 @@ index 3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc..84b6c2f73e0f6f3ad3969e7d51f6617e } private boolean checkTotemDeathProtection(DamageSource source) { -@@ -1757,6 +1757,11 @@ public abstract class LivingEntity extends Entity { +@@ -1760,6 +1760,11 @@ public abstract class LivingEntity extends Entity { } public void knockback(double strength, double x, double z) { @@ -39,7 +39,7 @@ index 3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc..84b6c2f73e0f6f3ad3969e7d51f6617e strength *= 1.0D - this.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE); if (strength > 0.0D) { this.hasImpulse = true; -@@ -1764,6 +1769,15 @@ public abstract class LivingEntity extends Entity { +@@ -1767,6 +1772,15 @@ public abstract class LivingEntity extends Entity { Vec3 vec3d1 = (new Vec3(x, 0.0D, z)).normalize().scale(strength); this.setDeltaMovement(vec3d.x / 2.0D - vec3d1.x, this.onGround ? Math.min(0.4D, vec3d.y / 2.0D + strength) : vec3d.y, vec3d.z / 2.0D - vec3d1.z); @@ -56,7 +56,7 @@ index 3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc..84b6c2f73e0f6f3ad3969e7d51f6617e } diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 6d0d194aaababd91a26dffc07f547d60eadd098e..ea836c55bad8b897e0fe0cad6d297b9b52209d69 100644 +index f0123009b27a763cee6761c46ecae354d3e54d65..8fdba296673def1e8f69d48c35b07e355a74c9a3 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1579,7 +1579,7 @@ public abstract class Mob extends LivingEntity { diff --git a/patches/server/0217-InventoryCloseEvent-Reason-API.patch b/patches/server/0217-InventoryCloseEvent-Reason-API.patch index e4bf599387..b85784bc57 100644 --- a/patches/server/0217-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0217-InventoryCloseEvent-Reason-API.patch @@ -173,7 +173,7 @@ index 7ea4a2d4e691e0a0a4d9ef3189a29a4a4ca4374b..883b6245f44f3fb82d7678e1092177ca @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index cf967ce377aab7fd00bd096d68ef0b66697817bf..eb6ead27924cdad9362d350e6257c5995e17b005 100644 +index 98741b2595ef9946e190dd8af4a4c07103e383b7..58a1e433b0bd7c093c964a9dfcbb7287b5988af4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1158,7 +1158,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -186,10 +186,10 @@ index cf967ce377aab7fd00bd096d68ef0b66697817bf..eb6ead27924cdad9362d350e6257c599 // 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 e00f87e4a9384c60e5fe4c33a9f27541366ae81b..479835a1fb087e18a1098438f6a3d71cd5589001 100644 +index b267e220e0b8fcd69f1b672db27273e76a46731a..14e67b85e570e942c19f8fcafcb74c32f5f4fc37 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1225,7 +1225,7 @@ public class CraftEventFactory { +@@ -1229,7 +1229,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 e00f87e4a9384c60e5fe4c33a9f27541366ae81b..479835a1fb087e18a1098438f6a3d71c } CraftServer server = player.level.getCraftServer(); -@@ -1391,8 +1391,18 @@ public class CraftEventFactory { +@@ -1395,8 +1395,18 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0228-Vanished-players-don-t-have-rights.patch b/patches/server/0228-Vanished-players-don-t-have-rights.patch index 51ce5f79dc..cd8b1d5888 100644 --- a/patches/server/0228-Vanished-players-don-t-have-rights.patch +++ b/patches/server/0228-Vanished-players-don-t-have-rights.patch @@ -99,10 +99,10 @@ index f6ea7b5929f2affec914730c92d1bde48f218acf..f4249ee3259a95b9f079a75c78ccf96a 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 479835a1fb087e18a1098438f6a3d71cd5589001..1bc3edad4fa79b2efb34e92b4af492769a8fcf83 100644 +index 14e67b85e570e942c19f8fcafcb74c32f5f4fc37..f16ab4b673f79a8f2b50caa2eefd7e55474ef28b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1261,6 +1261,14 @@ public class CraftEventFactory { +@@ -1265,6 +1265,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/0229-Allow-disabling-armour-stand-ticking.patch b/patches/server/0229-Allow-disabling-armour-stand-ticking.patch index 8c8a8d1532..7d29dc99e7 100644 --- a/patches/server/0229-Allow-disabling-armour-stand-ticking.patch +++ b/patches/server/0229-Allow-disabling-armour-stand-ticking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling armour stand ticking diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index 9897dbb03c343e1e1842f7ca6bc9b99b95d0b8be..f94a74728bd7c02a7f8245c92e7916f0b669ee0d 100644 +index 3488c882c654a2cb7a470ed84066bcc0bbbbf9c4..f70f75867a8f03d42f240a0d007d2221269f2fdb 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -92,9 +92,16 @@ public class ArmorStand extends LivingEntity { @@ -54,7 +54,7 @@ index 9897dbb03c343e1e1842f7ca6bc9b99b95d0b8be..f94a74728bd7c02a7f8245c92e7916f0 CompoundTag nbttagcompound1 = nbt.getCompound("Pose"); this.readPose(nbttagcompound1); -@@ -651,7 +666,29 @@ public class ArmorStand extends LivingEntity { +@@ -652,7 +667,29 @@ public class ArmorStand extends LivingEntity { @Override public void tick() { @@ -84,7 +84,7 @@ index 9897dbb03c343e1e1842f7ca6bc9b99b95d0b8be..f94a74728bd7c02a7f8245c92e7916f0 Rotations vector3f = (Rotations) this.entityData.get(ArmorStand.DATA_HEAD_POSE); if (!this.headPose.equals(vector3f)) { -@@ -775,31 +812,37 @@ public class ArmorStand extends LivingEntity { +@@ -776,31 +813,37 @@ public class ArmorStand extends LivingEntity { public void setHeadPose(Rotations angle) { this.headPose = angle; this.entityData.set(ArmorStand.DATA_HEAD_POSE, angle); diff --git a/patches/server/0235-Add-TNTPrimeEvent.patch b/patches/server/0234-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0235-Add-TNTPrimeEvent.patch rename to patches/server/0234-Add-TNTPrimeEvent.patch diff --git a/patches/server/0234-Add-hand-to-bucket-events.patch b/patches/server/0234-Add-hand-to-bucket-events.patch deleted file mode 100644 index b514aa8def..0000000000 --- a/patches/server/0234-Add-hand-to-bucket-events.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Thu, 2 Aug 2018 08:44:35 -0500 -Subject: [PATCH] Add hand to bucket events - - -diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java -index 0f601ad4629bda75ec90612ad27fdec9ce62f83d..425c6da0de40983b0870c9fd1b53f16b6a11c34c 100644 ---- a/src/main/java/net/minecraft/world/entity/animal/Cow.java -+++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java -@@ -87,7 +87,7 @@ public class Cow extends Animal { - - if (itemstack.is(Items.BUCKET) && !this.isBaby()) { - // CraftBukkit start - Got milk? -- org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) player.level, player, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET); -+ org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) player.level, player, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET, hand); // Paper - add enumHand - - if (event.isCancelled()) { - return InteractionResult.PASS; -diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java -index bfd81531cb5f3e7335e4b75cba31371450a9e731..1935db7bd6d0976fd0bb9e482cd8044b79b0a452 100644 ---- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java -+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java -@@ -199,7 +199,7 @@ public class Goat extends Animal { - - if (itemstack.is(Items.BUCKET) && !this.isBaby()) { - // CraftBukkit start - Got milk? -- org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) player.level, player, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET); -+ org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) player.level, player, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET, hand); // Paper - add enumHand - - if (event.isCancelled()) { - return InteractionResult.PASS; -diff --git a/src/main/java/net/minecraft/world/item/BucketItem.java b/src/main/java/net/minecraft/world/item/BucketItem.java -index 90c8ef9995e834c245cc33f5e59ffdabd5a0b8cd..7c6c928da4e0f3ac54fa9b9ddce7b0e0bf3cce4b 100644 ---- a/src/main/java/net/minecraft/world/item/BucketItem.java -+++ b/src/main/java/net/minecraft/world/item/BucketItem.java -@@ -71,7 +71,7 @@ public class BucketItem extends Item implements DispensibleContainerItem { - // CraftBukkit start - ItemStack dummyFluid = ifluidsource.pickupBlock(DummyGeneratorAccess.INSTANCE, blockposition, iblockdata); - if (dummyFluid.isEmpty()) return InteractionResultHolder.fail(itemstack); // Don't fire event if the bucket won't be filled. -- PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) world, user, blockposition, blockposition, movingobjectpositionblock.getDirection(), itemstack, dummyFluid.getItem()); -+ PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) world, user, blockposition, blockposition, movingobjectpositionblock.getDirection(), itemstack, dummyFluid.getItem(), hand); // Paper - add enumhand - - if (event.isCancelled()) { - ((ServerPlayer) user).connection.send(new ClientboundBlockUpdatePacket(world, blockposition)); // SPIGOT-5163 (see PlayerInteractManager) -@@ -102,7 +102,7 @@ public class BucketItem extends Item implements DispensibleContainerItem { - iblockdata = world.getBlockState(blockposition); - BlockPos blockposition2 = iblockdata.getBlock() instanceof LiquidBlockContainer && this.content == Fluids.WATER ? blockposition : blockposition1; - -- if (this.emptyContents(user, world, blockposition2, movingobjectpositionblock, movingobjectpositionblock.getDirection(), blockposition, itemstack)) { // CraftBukkit -+ if (this.emptyContents(user, world, blockposition2, movingobjectpositionblock, movingobjectpositionblock.getDirection(), blockposition, itemstack, hand)) { // CraftBukkit // Paper - add enumhand - this.checkExtraContent(user, world, itemstack, blockposition2); - if (user instanceof ServerPlayer) { - CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer) user, blockposition2, itemstack); -@@ -129,10 +129,12 @@ public class BucketItem extends Item implements DispensibleContainerItem { - - @Override - public boolean emptyContents(@Nullable Player player, Level world, BlockPos pos, @Nullable BlockHitResult hitResult) { -- return this.emptyContents(player, world, pos, hitResult, null, null, null); -+ // Paper start - add enumHand -+ return emptyContents(player, world, pos, hitResult, null, null, null, null); - } - -- public boolean emptyContents(Player entityhuman, Level world, BlockPos blockposition, @Nullable BlockHitResult movingobjectpositionblock, Direction enumdirection, BlockPos clicked, ItemStack itemstack) { -+ public boolean emptyContents(Player entityhuman, Level world, BlockPos blockposition, @Nullable BlockHitResult movingobjectpositionblock, Direction enumdirection, BlockPos clicked, ItemStack itemstack, InteractionHand enumhand) { -+ // Paper end - // CraftBukkit end - if (!(this.content instanceof FlowingFluid)) { - return false; -@@ -145,7 +147,7 @@ public class BucketItem extends Item implements DispensibleContainerItem { - - // CraftBukkit start - if (flag1 && entityhuman != null) { -- PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent((ServerLevel) world, entityhuman, blockposition, clicked, enumdirection, itemstack); -+ PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent((ServerLevel) world, entityhuman, blockposition, clicked, enumdirection, itemstack, enumhand); // Paper - add enumhand - if (event.isCancelled()) { - ((ServerPlayer) entityhuman).connection.send(new ClientboundBlockUpdatePacket(world, blockposition)); // SPIGOT-4238: needed when looking through entity - ((ServerPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541 -@@ -154,7 +156,7 @@ public class BucketItem extends Item implements DispensibleContainerItem { - } - // CraftBukkit end - if (!flag1) { -- return movingobjectpositionblock != null && this.emptyContents(entityhuman, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (BlockHitResult) null, enumdirection, clicked, itemstack); // CraftBukkit -+ return movingobjectpositionblock != null && this.emptyContents(entityhuman, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (BlockHitResult) null, enumdirection, clicked, itemstack, enumhand); // CraftBukkit // Paper - } else if (world.dimensionType().ultraWarm() && this.content.is(FluidTags.WATER)) { - int i = blockposition.getX(); - int j = blockposition.getY(); -diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 1bc3edad4fa79b2efb34e92b4af492769a8fcf83..518e44f783f5062ce53e9907501bd3a54c8014bb 100644 ---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -422,6 +422,20 @@ public class CraftEventFactory { - } - - private static PlayerEvent getPlayerBucketEvent(boolean isFilling, ServerLevel world, net.minecraft.world.entity.player.Player who, BlockPos changed, BlockPos clicked, Direction clickedFace, ItemStack itemstack, net.minecraft.world.item.Item item) { -+ // Paper start - add enumHand -+ return getPlayerBucketEvent(isFilling, world, who, changed, clicked, clickedFace, itemstack, item, null); -+ } -+ -+ public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(ServerLevel world, net.minecraft.world.entity.player.Player who, BlockPos changed, BlockPos clicked, Direction clickedFace, ItemStack itemstack, InteractionHand enumHand) { -+ return (PlayerBucketEmptyEvent) getPlayerBucketEvent(false, world, who, changed, clicked, clickedFace, itemstack, Items.BUCKET, enumHand); -+ } -+ -+ public static PlayerBucketFillEvent callPlayerBucketFillEvent(ServerLevel world, net.minecraft.world.entity.player.Player who, BlockPos changed, BlockPos clicked, Direction clickedFace, ItemStack itemInHand, net.minecraft.world.item.Item bucket, InteractionHand enumHand) { -+ return (PlayerBucketFillEvent) getPlayerBucketEvent(true, world, who, clicked, changed, clickedFace, itemInHand, bucket, enumHand); -+ } -+ -+ private static PlayerEvent getPlayerBucketEvent(boolean isFilling, ServerLevel world, net.minecraft.world.entity.player.Player who, BlockPos changed, BlockPos clicked, Direction clickedFace, ItemStack itemstack, net.minecraft.world.item.Item item, InteractionHand enumHand) { -+ // Paper end - Player player = (Player) who.getBukkitEntity(); - CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item); - Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem()); -@@ -434,10 +448,10 @@ public class CraftEventFactory { - - PlayerEvent event; - if (isFilling) { -- event = new PlayerBucketFillEvent(player, block, blockClicked, blockFace, bucket, itemInHand); -+ event = new PlayerBucketFillEvent(player, block, blockClicked, blockFace, bucket, itemInHand, enumHand == null ? null : enumHand == InteractionHand.OFF_HAND ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND); // Paper - add enumHand - ((PlayerBucketFillEvent) event).setCancelled(!CraftEventFactory.canBuild(world, player, changed.getX(), changed.getZ())); - } else { -- event = new PlayerBucketEmptyEvent(player, block, blockClicked, blockFace, bucket, itemInHand); -+ event = new PlayerBucketEmptyEvent(player, block, blockClicked, blockFace, bucket, itemInHand, enumHand == null ? null : enumHand == InteractionHand.OFF_HAND ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND); // Paper - add enumHand - ((PlayerBucketEmptyEvent) event).setCancelled(!CraftEventFactory.canBuild(world, player, changed.getX(), changed.getZ())); - } - diff --git a/patches/server/0236-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/server/0236-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/server/0237-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch similarity index 93% rename from patches/server/0237-MC-135506-Experience-should-save-as-Integers.patch rename to patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch index 8248a48e4a..009e8580ee 100644 --- a/patches/server/0237-MC-135506-Experience-should-save-as-Integers.patch +++ b/patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] MC-135506: Experience should save as Integers diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java -index 80f4dfdbc410aa3346897e2ca63272a081712b6e..d6527396939d9a1dd2f1cfb6cb66dc64fa0e5332 100644 +index 2fead19c1c4b04f94999887b196ceaee025edd99..2d1228670696224452cb432e0279456d8c5fe710 100644 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java @@ -286,7 +286,7 @@ public class ExperienceOrb extends Entity { diff --git a/patches/server/0238-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/0238-Remove-unnecessary-itemmeta-handling.patch rename to patches/server/0237-Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/0239-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 98% rename from patches/server/0239-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 5183fa7c7a..44af4248a6 100644 --- a/patches/server/0239-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -29,7 +29,7 @@ index ea9f536efd4c76b421f6e02f93f16fae115840d8..d1af0aca0237ee86acd86fea3255ddea protected void tick() { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6ad79090c0c186394f1635d420884a5b34c7c952..f85692e588c022a1f0cc5e3cde001d968eea59c8 100644 +index 65cf330708b4667fd60fdb1094df5a808ae5c2f2..efc2db1b27e9ac4b1094b7e529c198a94d05b164 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -216,6 +216,9 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0240-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 99% rename from patches/server/0240-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch index f58b929289..672248547f 100644 --- a/patches/server/0240-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch @@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash. This will help diagnose what was going on in that time before the crash. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 65b9dfa62a7785b4889d8edac0000487f3fc5367..d79ac1e7a1301e3e5d4e6caecc95bf320e5203e5 100644 +index d65423b8d7b69db79de05587efba13008602f743..afce3acc552df092636b205964e06b399b7db8e2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1044,6 +1044,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= 0 && entityliving != null) { entityliving.awardKillScore(this, this.deathScore, damageSource); } -@@ -1632,20 +1632,53 @@ public abstract class LivingEntity extends Entity { +@@ -1635,20 +1635,53 @@ public abstract class LivingEntity extends Entity { if (!this.level.isClientSide && this.hasCustomName()) { if (org.spigotmc.SpigotConfig.logNamedDeaths) LivingEntity.LOGGER.info("Named entity {} died: {}", this, this.getCombatTracker().getDeathMessage().getString()); // Spigot } @@ -168,7 +168,7 @@ index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef9 } } -@@ -1653,7 +1686,7 @@ public abstract class LivingEntity extends Entity { +@@ -1656,7 +1689,7 @@ public abstract class LivingEntity extends Entity { if (!this.level.isClientSide) { boolean flag = false; @@ -177,7 +177,7 @@ index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef9 if (this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) { BlockPos blockposition = this.blockPosition(); BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState(); -@@ -1682,7 +1715,11 @@ public abstract class LivingEntity extends Entity { +@@ -1685,7 +1718,11 @@ public abstract class LivingEntity extends Entity { } } @@ -190,7 +190,7 @@ index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef9 Entity entity = source.getEntity(); int i; -@@ -1697,18 +1734,27 @@ public abstract class LivingEntity extends Entity { +@@ -1700,18 +1737,27 @@ public abstract class LivingEntity extends Entity { this.dropEquipment(); // CraftBukkit - from below if (this.shouldDropLoot() && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { this.dropFromLootTable(source, flag); @@ -220,7 +220,7 @@ index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef9 // CraftBukkit start public int getExpReward() { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index ea836c55bad8b897e0fe0cad6d297b9b52209d69..37102e8cdaeb558e80889ff553656f14eaaeb650 100644 +index 8fdba296673def1e8f69d48c35b07e355a74c9a3..7b3ce253e76cf411768af4961abd148f242f4bb4 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1018,7 +1018,13 @@ public abstract class Mob extends LivingEntity { @@ -296,10 +296,10 @@ index c47884bab387647d99ed842b46f1c078ef9b6995..a3f3e06679cef10f50346e9cc6672ec9 public void addAdditionalSaveData(CompoundTag nbt) { super.addAdditionalSaveData(nbt); diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index f94a74728bd7c02a7f8245c92e7916f0b669ee0d..cd54fa8f7bbcb6036e90f4ef7cdc01d7af835a13 100644 +index f70f75867a8f03d42f240a0d007d2221269f2fdb..e463ae13ce6f65675c2b6d553ecf91db5a047dbc 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -@@ -752,7 +752,8 @@ public class ArmorStand extends LivingEntity { +@@ -753,7 +753,8 @@ public class ArmorStand extends LivingEntity { @Override public void kill() { @@ -310,7 +310,7 @@ index f94a74728bd7c02a7f8245c92e7916f0b669ee0d..cd54fa8f7bbcb6036e90f4ef7cdc01d7 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 04b329bf2a71f600debfbac193c0d1f49afff692..8676067be5cbb149a6a50a9582a22b69ebcfb61b 100644 +index cea4285095979f0656821e897659c7b91d237e82..0e9538a433e8ef721f29cc7b9f8fac914b876956 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2153,7 +2153,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -330,10 +330,10 @@ index 04b329bf2a71f600debfbac193c0d1f49afff692..8676067be5cbb149a6a50a9582a22b69 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 518e44f783f5062ce53e9907501bd3a54c8014bb..64cd5b2bc4032bfb0c917cc33884062ddba2738f 100644 +index f16ab4b673f79a8f2b50caa2eefd7e55474ef28b..b86ba1b6e49128f50d3940708ec3b59580cbfde8 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -816,9 +816,16 @@ public class CraftEventFactory { +@@ -806,9 +806,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()); @@ -350,7 +350,7 @@ index 518e44f783f5062ce53e9907501bd3a54c8014bb..64cd5b2bc4032bfb0c917cc33884062d victim.expToDrop = event.getDroppedExp(); for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { -@@ -835,8 +842,15 @@ public class CraftEventFactory { +@@ -825,8 +832,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 @@ -366,7 +366,7 @@ index 518e44f783f5062ce53e9907501bd3a54c8014bb..64cd5b2bc4032bfb0c917cc33884062d victim.keepLevel = event.getKeepLevel(); victim.newLevel = event.getNewLevel(); -@@ -853,6 +867,31 @@ public class CraftEventFactory { +@@ -843,6 +857,31 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0258-Mob-Pathfinding-API.patch b/patches/server/0257-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0258-Mob-Pathfinding-API.patch rename to patches/server/0257-Mob-Pathfinding-API.patch diff --git a/patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 95% rename from patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch index 7c943a7345..7ae2338341 100644 --- a/patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch +++ b/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks also prevents if out of world border bounds diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index ec6fcfc94b34d2b523c011b197e6484d13517c36..31b330e140d71d9b017e68eab531a59d4f2ed9a2 100644 +index 08340299538f1adacddc6d5022482a5307c06f78..ac5fa1d9e4e8f9057e3c3780fda3660bb7795295 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -169,9 +169,9 @@ public final class NaturalSpawner { diff --git a/patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/patches/server/0265-Honor-EntityAgeable.ageLock.patch b/patches/server/0264-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0265-Honor-EntityAgeable.ageLock.patch rename to patches/server/0264-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0266-Configurable-connection-throttle-kick-message.patch b/patches/server/0265-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0266-Configurable-connection-throttle-kick-message.patch rename to patches/server/0265-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0267-Hook-into-CB-plugin-rewrites.patch b/patches/server/0266-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/0267-Hook-into-CB-plugin-rewrites.patch rename to patches/server/0266-Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/0268-PreSpawnerSpawnEvent.patch b/patches/server/0267-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0268-PreSpawnerSpawnEvent.patch rename to patches/server/0267-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0269-Add-LivingEntity-getTargetEntity.patch b/patches/server/0268-Add-LivingEntity-getTargetEntity.patch similarity index 97% rename from patches/server/0269-Add-LivingEntity-getTargetEntity.patch rename to patches/server/0268-Add-LivingEntity-getTargetEntity.patch index 938905a7ca..2842a11a1c 100644 --- a/patches/server/0269-Add-LivingEntity-getTargetEntity.patch +++ b/patches/server/0268-Add-LivingEntity-getTargetEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 15af85ec11e40337338696c51083aef91591681b..369b2d92dbae896824b2e54cf30f8a607c43d451 100644 +index 1189ddcab5011d34a66356cde561fe7e2cecbfdd..8155421080761734c519042e1c24dd2e765d6e75 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -116,6 +116,7 @@ import net.minecraft.world.level.storage.loot.LootTable; @@ -16,7 +16,7 @@ index 15af85ec11e40337338696c51083aef91591681b..369b2d92dbae896824b2e54cf30f8a60 import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import net.minecraft.world.scores.PlayerTeam; -@@ -3806,6 +3807,38 @@ public abstract class LivingEntity extends Entity { +@@ -3810,6 +3811,38 @@ public abstract class LivingEntity extends Entity { return level.clip(raytrace); } diff --git a/patches/server/0270-Add-sun-related-API.patch b/patches/server/0269-Add-sun-related-API.patch similarity index 100% rename from patches/server/0270-Add-sun-related-API.patch rename to patches/server/0269-Add-sun-related-API.patch diff --git a/patches/server/0271-Turtle-API.patch b/patches/server/0270-Turtle-API.patch similarity index 100% rename from patches/server/0271-Turtle-API.patch rename to patches/server/0270-Turtle-API.patch diff --git a/patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0274-Add-more-Witch-API.patch b/patches/server/0273-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0274-Add-more-Witch-API.patch rename to patches/server/0273-Add-more-Witch-API.patch diff --git a/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0277-Reset-players-airTicks-on-respawn.patch b/patches/server/0276-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0277-Reset-players-airTicks-on-respawn.patch rename to patches/server/0276-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 98% rename from patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch index 40ed8205d2..fdb06e3b52 100644 --- a/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch +++ b/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch @@ -58,7 +58,7 @@ index 336a26733b5bf73455f8ec10347c1e08b8e866f7..4fce18c52c8144460ebf0c1e336dce71 return executorService; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d79ac1e7a1301e3e5d4e6caecc95bf320e5203e5..2860bdf9d155b694fe605886a9f99cd956559f3c 100644 +index afce3acc552df092636b205964e06b399b7db8e2..5e1a0ab40d9d03844c6e0b962bb15d3b4b40d229 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -306,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND; } @@ -22,7 +22,7 @@ index df35685a016376fa056a8ecbfda2c01b38350b3c..7e7128973153f4c3a737c1e956e41bab private void updatingUsingItem() { if (this.isUsingItem()) { if (ItemStack.isSameIgnoreDurability(this.getItemInHand(this.getUsedItemHand()), this.useItem)) { -@@ -3581,8 +3586,12 @@ public abstract class LivingEntity extends Entity { +@@ -3584,8 +3589,12 @@ public abstract class LivingEntity extends Entity { if (this.shouldTriggerItemUseEffects()) { this.triggerItemUseEffects(stack, 5); } @@ -37,7 +37,7 @@ index df35685a016376fa056a8ecbfda2c01b38350b3c..7e7128973153f4c3a737c1e956e41bab this.completeUsingItem(); } -@@ -3630,7 +3639,10 @@ public abstract class LivingEntity extends Entity { +@@ -3633,7 +3642,10 @@ public abstract class LivingEntity extends Entity { if (!itemstack.isEmpty() && !this.isUsingItem() || forceUpdate) { // Paper use override flag this.useItem = itemstack; @@ -49,7 +49,7 @@ index df35685a016376fa056a8ecbfda2c01b38350b3c..7e7128973153f4c3a737c1e956e41bab if (!this.level.isClientSide) { this.setLivingEntityFlag(1, true); this.setLivingEntityFlag(2, hand == InteractionHand.OFF_HAND); -@@ -3655,7 +3667,10 @@ public abstract class LivingEntity extends Entity { +@@ -3658,7 +3670,10 @@ public abstract class LivingEntity extends Entity { } } else if (!this.isUsingItem() && !this.useItem.isEmpty()) { this.useItem = ItemStack.EMPTY; @@ -61,7 +61,7 @@ index df35685a016376fa056a8ecbfda2c01b38350b3c..7e7128973153f4c3a737c1e956e41bab } } -@@ -3788,7 +3803,10 @@ public abstract class LivingEntity extends Entity { +@@ -3792,7 +3807,10 @@ public abstract class LivingEntity extends Entity { } this.useItem = ItemStack.EMPTY; diff --git a/patches/server/0343-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0342-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0343-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0342-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0344-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0343-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0344-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0343-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0345-Add-effect-to-block-break-naturally.patch b/patches/server/0344-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/server/0345-Add-effect-to-block-break-naturally.patch rename to patches/server/0344-Add-effect-to-block-break-naturally.patch diff --git a/patches/server/0346-Entity-Activation-Range-2.0.patch b/patches/server/0345-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0346-Entity-Activation-Range-2.0.patch rename to patches/server/0345-Entity-Activation-Range-2.0.patch index c223b23f30..a17d561fe8 100644 --- a/patches/server/0346-Entity-Activation-Range-2.0.patch +++ b/patches/server/0345-Entity-Activation-Range-2.0.patch @@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms Adds villagers as separate config diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index cdb04f32d61590a2a23903de26bab0a4b334569d..28922059f1a58ae98282ab59b0a9e9014127b12a 100644 +index faee1edda215fa72f5b7e1bdbbeb01004d019b0d..4a06da72c8b769c683e9eb03817bd9381a0cf099 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2,7 +2,6 @@ package net.minecraft.server.level; @@ -144,7 +144,7 @@ index fa128e7f8089339f932e19edf95a8d5c0cc14046..c5b1d2e4b577a3f4ad352dc6a8436c04 movement = this.maybeBackOffFromEdge(movement, movementType); Vec3 vec3d1 = this.collide(movement); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 37102e8cdaeb558e80889ff553656f14eaaeb650..d7b137a84deea68c75ee0b3c99b089b8dff25947 100644 +index 7b3ce253e76cf411768af4961abd148f242f4bb4..2ae973d77d0b088cf7dc7a2338b8b7461e585dca 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -210,6 +210,19 @@ public abstract class Mob extends LivingEntity { diff --git a/patches/server/0347-Increase-Light-Queue-Size.patch b/patches/server/0346-Increase-Light-Queue-Size.patch similarity index 93% rename from patches/server/0347-Increase-Light-Queue-Size.patch rename to patches/server/0346-Increase-Light-Queue-Size.patch index d6d29e6daa..280ab17dc9 100644 --- a/patches/server/0347-Increase-Light-Queue-Size.patch +++ b/patches/server/0346-Increase-Light-Queue-Size.patch @@ -14,7 +14,7 @@ light engine on shutdown... The queue size only puts a cap on max loss, doesn't solve that problem. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b81a1e63205011c3f968b29daeb0180ded02b629..836d01ec14f37cc83807a30eda9a1dd7d209dbf6 100644 +index aa52b644b7af9261fdec06b29b7daa7ad8f89b3a..668d7479bb9a56f710ead272166abd615b9463cc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -780,7 +780,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop d8)) { this.jumpInLiquid(FluidTags.LAVA); } else if ((this.onGround || flag && d7 <= d8) && this.noJumpDelay == 0) { diff --git a/patches/server/0359-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0358-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0359-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0358-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0360-Make-the-GUI-graph-fancier.patch b/patches/server/0359-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0360-Make-the-GUI-graph-fancier.patch rename to patches/server/0359-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0361-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0360-add-hand-to-BlockMultiPlaceEvent.patch similarity index 89% rename from patches/server/0361-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0360-add-hand-to-BlockMultiPlaceEvent.patch index 486014f2be..7f64696d43 100644 --- a/patches/server/0361-add-hand-to-BlockMultiPlaceEvent.patch +++ b/patches/server/0360-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 64cd5b2bc4032bfb0c917cc33884062ddba2738f..3aa82c7d26ef9fed3d4b670ac330204b55609396 100644 +index b86ba1b6e49128f50d3940708ec3b59580cbfde8..118d7068700bbd4aeaf766ee8d3984b474c6bf9a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -345,13 +345,18 @@ public class CraftEventFactory { +@@ -348,13 +348,18 @@ public class CraftEventFactory { } org.bukkit.inventory.ItemStack item; diff --git a/patches/server/0362-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0361-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0362-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0361-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0363-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0362-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0363-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0362-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0364-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0363-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0364-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0363-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0365-Optimise-Chunk-getFluid.patch b/patches/server/0364-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0365-Optimise-Chunk-getFluid.patch rename to patches/server/0364-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0366-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0365-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0366-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0365-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0367-Add-tick-times-API-and-mspt-command.patch b/patches/server/0366-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0367-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0366-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0368-Expose-MinecraftServer-isRunning.patch b/patches/server/0367-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0368-Expose-MinecraftServer-isRunning.patch rename to patches/server/0367-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0369-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0368-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0369-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0368-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0370-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0369-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/0370-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0369-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/0371-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0370-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0371-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0370-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0372-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0371-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0372-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0371-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0373-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0372-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0373-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0372-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0374-Don-t-tick-dead-players.patch b/patches/server/0373-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0374-Don-t-tick-dead-players.patch rename to patches/server/0373-Don-t-tick-dead-players.patch diff --git a/patches/server/0375-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0374-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0375-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0374-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0376-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0375-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0376-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0375-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0377-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0376-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0377-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0376-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0378-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0377-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0378-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0377-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0379-Improved-Watchdog-Support.patch b/patches/server/0378-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0379-Improved-Watchdog-Support.patch rename to patches/server/0378-Improved-Watchdog-Support.patch diff --git a/patches/server/0380-Optimize-Pathfinding.patch b/patches/server/0379-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0380-Optimize-Pathfinding.patch rename to patches/server/0379-Optimize-Pathfinding.patch diff --git a/patches/server/0381-Reduce-Either-Optional-allocation.patch b/patches/server/0380-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0381-Reduce-Either-Optional-allocation.patch rename to patches/server/0380-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0382-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0381-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0382-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0381-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0383-Prevent-opening-inventories-when-frozen.patch b/patches/server/0382-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0383-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0382-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0384-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0383-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 90% rename from patches/server/0384-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0383-Don-t-run-entity-collision-code-if-not-needed.patch index 11403f5b9a..7ecdb13e6d 100644 --- a/patches/server/0384-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/patches/server/0383-Don-t-run-entity-collision-code-if-not-needed.patch @@ -7,10 +7,10 @@ Will not run if max entity craming is disabled and the max collisions per entity is less than or equal to 0 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a5b532a6051f9313bb5042bf61712015768b5426..9a7d2b0d84ce422afa96b5c07c972e52c6ac00ed 100644 +index 24a16dbfc0852a566dd527639974fcba44bd43fe..8de0a71566d2b095e74c8f8cf15dfac26a5a31c2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3337,10 +3337,16 @@ public abstract class LivingEntity extends Entity { +@@ -3340,10 +3340,16 @@ public abstract class LivingEntity extends Entity { protected void serverAiStep() {} protected void pushEntities() { diff --git a/patches/server/0385-Implement-Player-Client-Options-API.patch b/patches/server/0384-Implement-Player-Client-Options-API.patch similarity index 98% rename from patches/server/0385-Implement-Player-Client-Options-API.patch rename to patches/server/0384-Implement-Player-Client-Options-API.patch index 01c8e8989c..46129fcaca 100644 --- a/patches/server/0385-Implement-Player-Client-Options-API.patch +++ b/patches/server/0384-Implement-Player-Client-Options-API.patch @@ -97,7 +97,7 @@ index baff31a9dd003eef6191b59598523e387bc759a1..867deadfc38e069931211a2b0db4350a if (getMainArm() != packet.mainHand()) { PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index aebe500d3d0947536d19286195a0c7f5798e862e..c75f919617f60fb353583d6541beaa604efe045a 100644 +index cdc4ef88c8369b3bd1c607ff5301fc1b04ec4582..5338f9245c00366c68e208a1e0c780c7ca362548 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -615,6 +615,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0386-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0385-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 93% rename from patches/server/0386-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0385-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch index db4ff86838..1b01295738 100644 --- a/patches/server/0386-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch +++ b/patches/server/0385-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Don't crash if player is attempted to be removed from I suspect it deals with teleporting as it uses players current x/y/z diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java -index 773ec6ee0f48ee626d7ec8e4c67212327adfe023..5e4140c8f6a201d47eafa086f1047953ab5c1b0e 100644 +index ffa1e457decf8502c3283352bf5be94d419ff165..d3c3db919e9b0507e8543313d9028394e5163673 100644 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java @@ -153,8 +153,8 @@ public abstract class DistanceManager { diff --git a/patches/server/0387-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0386-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 98% rename from patches/server/0387-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0386-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index 044449f5f3..c1fdec6ff1 100644 --- a/patches/server/0387-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/patches/server/0386-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick delays anymore. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 35d68b46732471b66f33b568d447b6fac9591dac..f84d7dcfab4a636baada92ac9af03fe5a3dc2e9a 100644 +index de5caa032685787fb04172ec5c05a022d99827c1..46bec088294c7500c9021103587a80e29de4b54b 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1027,6 +1027,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0388-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0387-Load-Chunks-for-Login-Asynchronously.patch similarity index 98% rename from patches/server/0388-Load-Chunks-for-Login-Asynchronously.patch rename to patches/server/0387-Load-Chunks-for-Login-Asynchronously.patch index e2569d8445..38078f50e3 100644 --- a/patches/server/0388-Load-Chunks-for-Login-Asynchronously.patch +++ b/patches/server/0387-Load-Chunks-for-Login-Asynchronously.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Load Chunks for Login Asynchronously diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index d3cf5554eb1d4d3d28b95abab43419a5efec8596..99df84ed9cda3be5f521bc7ed7bf82a297aa8bdf 100644 +index 5a2797104d43d5981fe0d4599c0abbbf8658f153..c0e17bbf04723da76ea6952d9558dd4d34b00f6c 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -170,6 +170,7 @@ import org.bukkit.event.world.GenericGameEvent; @@ -81,7 +81,7 @@ index 3af9f2d86cf2a9566e22865689101245647d05a5..fe722106e20e199eb914a09f8dbc1409 this.server.getProfiler().push("keepAlive"); // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index ef09f5f42a89f767060f015af27269ad496d08c7..984324767cf8afc31fccc0b7add10645aa0925cf 100644 +index 6fd0e5a97d0ed9155b12dac94c075e1225a22e93..c16cb8ebe28987f1630fe659dfa437264bd236e1 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -90,7 +90,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se diff --git a/patches/server/0389-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0388-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0389-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0388-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0390-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0389-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 92% rename from patches/server/0390-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0389-Add-PlayerAttackEntityCooldownResetEvent.patch index 9c571cf10f..90feeaf645 100644 --- a/patches/server/0390-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/server/0389-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 9a7d2b0d84ce422afa96b5c07c972e52c6ac00ed..e3d686ea473c1bd38af9ed181020110ee3d94f64 100644 +index 8de0a71566d2b095e74c8f8cf15dfac26a5a31c2..d6071df933506bf3d55fc827483b33ecc5174834 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2112,7 +2112,16 @@ public abstract class LivingEntity extends Entity { +@@ -2115,7 +2115,16 @@ public abstract class LivingEntity extends Entity { EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption); if (damagesource.getEntity() instanceof net.minecraft.world.entity.player.Player) { diff --git a/patches/server/0391-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0390-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0391-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0390-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0392-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0391-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0392-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0391-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0393-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0392-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 93% rename from patches/server/0393-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0392-Fix-numerous-item-duplication-issues-and-teleport-is.patch index 8bc975b5bc..2ba2d42e65 100644 --- a/patches/server/0393-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/server/0392-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -80,10 +80,10 @@ index 457471f4e5621b312714dcbad733c23d528131d7..ae76b3404e4251e7705269b2e5706815 public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e3d686ea473c1bd38af9ed181020110ee3d94f64..37d51104a7d38c2d16ae38a9adcbe37597c94fe2 100644 +index d6071df933506bf3d55fc827483b33ecc5174834..03194c5acd46f6014f0a1d964d079b114f86c951 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1643,9 +1643,9 @@ public abstract class LivingEntity extends Entity { +@@ -1646,9 +1646,9 @@ public abstract class LivingEntity extends Entity { // Paper start org.bukkit.event.entity.EntityDeathEvent deathEvent = this.dropAllDeathLoot(damageSource); if (deathEvent == null || !deathEvent.isCancelled()) { @@ -96,7 +96,7 @@ index e3d686ea473c1bd38af9ed181020110ee3d94f64..37d51104a7d38c2d16ae38a9adcbe375 // Paper start - clear equipment if event is not cancelled if (this instanceof Mob) { for (EquipmentSlot slot : this.clearedEquipmentSlots) { -@@ -1743,8 +1743,13 @@ public abstract class LivingEntity extends Entity { +@@ -1746,8 +1746,13 @@ public abstract class LivingEntity extends Entity { this.dropCustomDeathLoot(source, i, flag); this.clearEquipmentSlots = prev; // Paper } @@ -113,10 +113,10 @@ index e3d686ea473c1bd38af9ed181020110ee3d94f64..37d51104a7d38c2d16ae38a9adcbe375 this.drops = new ArrayList<>(); // CraftBukkit end diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index cd54fa8f7bbcb6036e90f4ef7cdc01d7af835a13..808e564789d826c1778c053ab91038e3d4d81b7f 100644 +index e463ae13ce6f65675c2b6d553ecf91db5a047dbc..7ff1e7e4d493770bfdbc0ad5e8f10387cefc42d2 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -@@ -608,7 +608,7 @@ public class ArmorStand extends LivingEntity { +@@ -609,7 +609,7 @@ public class ArmorStand extends LivingEntity { for (i = 0; i < this.handItems.size(); ++i) { itemstack = (ItemStack) this.handItems.get(i); if (!itemstack.isEmpty()) { @@ -125,7 +125,7 @@ index cd54fa8f7bbcb6036e90f4ef7cdc01d7af835a13..808e564789d826c1778c053ab91038e3 this.handItems.set(i, ItemStack.EMPTY); } } -@@ -616,7 +616,7 @@ public class ArmorStand extends LivingEntity { +@@ -617,7 +617,7 @@ public class ArmorStand extends LivingEntity { for (i = 0; i < this.armorItems.size(); ++i) { itemstack = (ItemStack) this.armorItems.get(i); if (!itemstack.isEmpty()) { @@ -135,10 +135,10 @@ index cd54fa8f7bbcb6036e90f4ef7cdc01d7af835a13..808e564789d826c1778c053ab91038e3 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 3aa82c7d26ef9fed3d4b670ac330204b55609396..22da112f45ddb20d113550eae67ac08eb2fcb727 100644 +index 118d7068700bbd4aeaf766ee8d3984b474c6bf9a..751f376e175881d9e9f750c90143a7c39431ce6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -819,6 +819,11 @@ public class CraftEventFactory { +@@ -809,6 +809,11 @@ public class CraftEventFactory { } public static EntityDeathEvent callEntityDeathEvent(net.minecraft.world.entity.LivingEntity victim, List drops) { @@ -150,7 +150,7 @@ index 3aa82c7d26ef9fed3d4b670ac330204b55609396..22da112f45ddb20d113550eae67ac08e CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity(); EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward()); populateFields(victim, event); // Paper - make cancellable -@@ -832,11 +837,13 @@ public class CraftEventFactory { +@@ -822,11 +827,13 @@ public class CraftEventFactory { playDeathSound(victim, event); // Paper end victim.expToDrop = event.getDroppedExp(); diff --git a/patches/server/0394-Villager-Restocks-API.patch b/patches/server/0393-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0394-Villager-Restocks-API.patch rename to patches/server/0393-Villager-Restocks-API.patch diff --git a/patches/server/0395-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0394-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0395-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0394-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0396-Expose-game-version.patch b/patches/server/0395-Expose-game-version.patch similarity index 100% rename from patches/server/0396-Expose-game-version.patch rename to patches/server/0395-Expose-game-version.patch diff --git a/patches/server/0397-Optimize-Voxel-Shape-Merging.patch b/patches/server/0396-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0397-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0396-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0398-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0397-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0398-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0397-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0399-misc-debugging-dumps.patch b/patches/server/0398-misc-debugging-dumps.patch similarity index 96% rename from patches/server/0399-misc-debugging-dumps.patch rename to patches/server/0398-misc-debugging-dumps.patch index f440f324b4..85246cbec8 100644 --- a/patches/server/0399-misc-debugging-dumps.patch +++ b/patches/server/0398-misc-debugging-dumps.patch @@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b9083f00c7da96c977bd6efa7971cd896bd0cdd5..2fa1a4e453ac908848053ef80f6401764b0bb7f9 100644 +index 1205d5f7d2bee68f6b3cd8e2ccbcd3d056963d8e..b3231076683e5a63602ff1293765c5d76c36bfef 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -881,6 +881,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0) { diff --git a/patches/server/0405-ExperienceOrbMergeEvent.patch b/patches/server/0404-ExperienceOrbMergeEvent.patch similarity index 91% rename from patches/server/0405-ExperienceOrbMergeEvent.patch rename to patches/server/0404-ExperienceOrbMergeEvent.patch index 1ff06b6779..bfca9b565e 100644 --- a/patches/server/0405-ExperienceOrbMergeEvent.patch +++ b/patches/server/0404-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 f80bdb38cf377684382bb817fedbeb8d5aae4704..9b94df9940040f51fdcc1af5c7da96117af9017e 100644 +index 2dde21dea012f4531e737586752ae1b1f5023d99..359964cd8820b8ef8b8dba5501119164cebcf743 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -650,7 +650,7 @@ public class CraftEventFactory { +@@ -640,7 +640,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/0406-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0405-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0406-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0405-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0407-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0406-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0407-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0406-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0408-Potential-bed-API.patch b/patches/server/0407-Potential-bed-API.patch similarity index 100% rename from patches/server/0408-Potential-bed-API.patch rename to patches/server/0407-Potential-bed-API.patch diff --git a/patches/server/0409-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0408-Wait-for-Async-Tasks-during-shutdown.patch similarity index 96% rename from patches/server/0409-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0408-Wait-for-Async-Tasks-during-shutdown.patch index ba50c6bb9e..918e5417b2 100644 --- a/patches/server/0409-Wait-for-Async-Tasks-during-shutdown.patch +++ b/patches/server/0408-Wait-for-Async-Tasks-during-shutdown.patch @@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns if any are still running after that delay just as reload does. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2fa1a4e453ac908848053ef80f6401764b0bb7f9..3c7154e85c4543a01a4e95b9f574f5d803a59e6c 100644 +index b3231076683e5a63602ff1293765c5d76c36bfef..057c335b15123061ed239f9559aad137e2c97982 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -921,6 +921,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 6.0F) { double d0 = (entity.getX() - this.getX()) / (double) f; diff --git a/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java b/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java -index 7eb315aac7737cf443c693147c2cfd871f201724..03de59302041b0bc13922ec129501417804df915 100644 +index bbfd099634c6cceb0afcc7bbe2f26b872a1506c3..c076a2e42579b94c1667654913f722f5cc57a27f 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java +++ b/src/main/java/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.java @@ -122,11 +122,14 @@ public class LeashFenceKnotEntity extends HangingEntity { entityinsentient = (Mob) iterator.next(); if (entityinsentient.isLeashed() && entityinsentient.getLeashHolder() == this) { // CraftBukkit start -- if (CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, player).isCancelled()) { +- if (CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, player, hand).isCancelled()) { + // Paper start - drop leash variable -+ org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, player, !player.getAbilities().instabuild); ++ org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, player, hand, !player.getAbilities().instabuild); + if (event.isCancelled()) { + // Paper end die = false; @@ -122,18 +122,18 @@ index 7eb315aac7737cf443c693147c2cfd871f201724..03de59302041b0bc13922ec129501417 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2c45c71274e026936c0e1c91e1b0555f21a7a611..9ccfe52a61b72addfa675af797ea4bafbff30bdb 100644 +index 81490d62c49c0fc4aba6ec50aa4eafaf103c8ee6..bf0e01bdcce6e5b682518f35f0239b97e57713ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1527,8 +1527,10 @@ public class CraftEventFactory { +@@ -1517,8 +1517,10 @@ public class CraftEventFactory { return itemInHand; } -- public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player) { -- PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity()); +- public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player, InteractionHand enumhand) { +- PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity(), CraftEquipmentSlot.getHand(enumhand)); + // Paper start - drop leash variable -+ public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player, boolean dropLeash) { -+ PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity(), dropLeash); ++ public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(Mob entity, net.minecraft.world.entity.player.Player player, InteractionHand enumhand, boolean dropLeash) { ++ PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity(), CraftEquipmentSlot.getHand(enumhand), dropLeash); + // Paper end entity.level.getCraftServer().getPluginManager().callEvent(event); return event; diff --git a/patches/server/0568-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0567-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0568-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0567-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0569-add-DragonEggFormEvent.patch b/patches/server/0568-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0569-add-DragonEggFormEvent.patch rename to patches/server/0568-add-DragonEggFormEvent.patch diff --git a/patches/server/0570-EntityMoveEvent.patch b/patches/server/0569-EntityMoveEvent.patch similarity index 95% rename from patches/server/0570-EntityMoveEvent.patch rename to patches/server/0569-EntityMoveEvent.patch index 1961bd23da..cdb6134eca 100644 --- a/patches/server/0570-EntityMoveEvent.patch +++ b/patches/server/0569-EntityMoveEvent.patch @@ -29,10 +29,10 @@ index 944719180fff8ac34682330ecf456fa90a4e95f2..8ccc21373bb52a80d76c62cf875963da return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d6ad8cfb509920c448fc51ec02e867b1552730df..f774d25eaaa1b7966b16251619da80a2d5c9228c 100644 +index 0896cbe04be6a5471088c321296506415fccbed6..cc930b8a22b3e3540b9fb24c6eaa329895c075cb 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3303,6 +3303,20 @@ public abstract class LivingEntity extends Entity { +@@ -3306,6 +3306,20 @@ public abstract class LivingEntity extends Entity { this.pushEntities(); this.level.getProfiler().pop(); diff --git a/patches/server/0571-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0570-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 91% rename from patches/server/0571-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0570-added-option-to-disable-pathfinding-updates-on-block.patch index 5fc269d9a0..ec7b45a19d 100644 --- a/patches/server/0571-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0570-added-option-to-disable-pathfinding-updates-on-block.patch @@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ef4b5ff8f5163effd9526c67e3d9750e8a3f561b..60e86357327f7bd7141d421b2d6d52d433118f1f 100644 +index 8ccc21373bb52a80d76c62cf875963da8d25b247..961d24e1e0d5ee8429ab558893a356d175b31d39 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1529,6 +1529,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0572-Inline-shift-direction-fields.patch b/patches/server/0571-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0572-Inline-shift-direction-fields.patch rename to patches/server/0571-Inline-shift-direction-fields.patch diff --git a/patches/server/0573-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0572-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 92% rename from patches/server/0573-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0572-Allow-adding-items-to-BlockDropItemEvent.patch index e71e9cff71..9dc2ff3234 100644 --- a/patches/server/0573-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/patches/server/0572-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 9ccfe52a61b72addfa675af797ea4bafbff30bdb..82d8a8c2199673315c7b52e694f798cc59c5f96c 100644 +index bf0e01bdcce6e5b682518f35f0239b97e57713ae..2faefc58ac600fb6b374ef87c6f8f378d3883594 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -396,13 +396,30 @@ public class CraftEventFactory { +@@ -399,13 +399,30 @@ public class CraftEventFactory { } public static void handleBlockDropItemEvent(Block block, BlockState state, ServerPlayer player, List items) { diff --git a/patches/server/0574-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0573-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0574-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0573-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0575-living-entity-allow-attribute-registration.patch b/patches/server/0574-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0575-living-entity-allow-attribute-registration.patch rename to patches/server/0574-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0576-fix-dead-slime-setSize-invincibility.patch b/patches/server/0575-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0576-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0575-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0577-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0576-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0577-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0576-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0578-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0577-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0578-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0577-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0579-Expose-Tracked-Players.patch b/patches/server/0578-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0579-Expose-Tracked-Players.patch rename to patches/server/0578-Expose-Tracked-Players.patch diff --git a/patches/server/0580-Remove-streams-from-SensorNearest.patch b/patches/server/0579-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0580-Remove-streams-from-SensorNearest.patch rename to patches/server/0579-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0581-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0580-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0581-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0580-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0582-Improve-ServerGUI.patch b/patches/server/0581-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0582-Improve-ServerGUI.patch rename to patches/server/0581-Improve-ServerGUI.patch diff --git a/patches/server/0583-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0582-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0583-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0582-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0584-fix-converting-txt-to-json-file.patch b/patches/server/0583-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0584-fix-converting-txt-to-json-file.patch rename to patches/server/0583-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0585-Add-worldborder-events.patch b/patches/server/0584-Add-worldborder-events.patch similarity index 100% rename from patches/server/0585-Add-worldborder-events.patch rename to patches/server/0584-Add-worldborder-events.patch diff --git a/patches/server/0586-added-PlayerNameEntityEvent.patch b/patches/server/0585-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0586-added-PlayerNameEntityEvent.patch rename to patches/server/0585-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0587-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0586-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0587-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0586-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0588-Add-recipe-to-cook-events.patch b/patches/server/0587-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0588-Add-recipe-to-cook-events.patch rename to patches/server/0587-Add-recipe-to-cook-events.patch diff --git a/patches/server/0589-Add-Block-isValidTool.patch b/patches/server/0588-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0589-Add-Block-isValidTool.patch rename to patches/server/0588-Add-Block-isValidTool.patch diff --git a/patches/server/0590-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0589-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0590-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0589-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0591-Expand-world-key-API.patch b/patches/server/0590-Expand-world-key-API.patch similarity index 100% rename from patches/server/0591-Expand-world-key-API.patch rename to patches/server/0590-Expand-world-key-API.patch diff --git a/patches/server/0592-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0591-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0592-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0591-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0593-Item-Rarity-API.patch b/patches/server/0592-Item-Rarity-API.patch similarity index 100% rename from patches/server/0593-Item-Rarity-API.patch rename to patches/server/0592-Item-Rarity-API.patch diff --git a/patches/server/0594-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0593-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0594-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0593-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0595-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0594-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0595-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0594-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0596-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0595-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0596-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0595-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0597-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0596-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0597-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0596-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0598-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0597-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0598-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0597-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0599-Entity-load-save-limit-per-chunk.patch b/patches/server/0598-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0599-Entity-load-save-limit-per-chunk.patch rename to patches/server/0598-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0600-Expose-protocol-version.patch b/patches/server/0599-Expose-protocol-version.patch similarity index 100% rename from patches/server/0600-Expose-protocol-version.patch rename to patches/server/0599-Expose-protocol-version.patch diff --git a/patches/server/0601-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0600-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0601-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0600-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0602-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0601-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 88% rename from patches/server/0602-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0601-Fix-PlayerItemConsumeEvent-cancelling-properly.patch index 419a5f5e50..d9d623aa35 100644 --- a/patches/server/0602-Fix-PlayerItemConsumeEvent-cancelling-properly.patch +++ b/patches/server/0601-Fix-PlayerItemConsumeEvent-cancelling-properly.patch @@ -9,10 +9,10 @@ till their item is switched. This patch clears the active item when the event is cancelled diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f774d25eaaa1b7966b16251619da80a2d5c9228c..d427cd90177b14062ea56dcf6fa5fedddcdbb624 100644 +index cc930b8a22b3e3540b9fb24c6eaa329895c075cb..93ba2f0bc5fec094933f0fa25e084df2998e0949 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3777,6 +3777,7 @@ public abstract class LivingEntity extends Entity { +@@ -3781,6 +3781,7 @@ public abstract class LivingEntity extends Entity { level.getCraftServer().getPluginManager().callEvent(event); if (event.isCancelled()) { diff --git a/patches/server/0603-Add-bypass-host-check.patch b/patches/server/0602-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0603-Add-bypass-host-check.patch rename to patches/server/0602-Add-bypass-host-check.patch diff --git a/patches/server/0604-Set-area-affect-cloud-rotation.patch b/patches/server/0603-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0604-Set-area-affect-cloud-rotation.patch rename to patches/server/0603-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0605-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0604-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0605-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0604-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0606-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0605-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0606-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0605-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0607-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0606-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0607-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0606-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0608-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0607-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0608-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0607-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0609-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0608-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0609-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0608-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0610-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0609-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0610-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0609-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0611-Added-PlayerDeepSleepEvent.patch b/patches/server/0610-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0611-Added-PlayerDeepSleepEvent.patch rename to patches/server/0610-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0612-More-World-API.patch b/patches/server/0611-More-World-API.patch similarity index 100% rename from patches/server/0612-More-World-API.patch rename to patches/server/0611-More-World-API.patch diff --git a/patches/server/0613-Added-PlayerBedFailEnterEvent.patch b/patches/server/0612-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0613-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0612-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0614-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0613-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0614-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0613-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0615-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0614-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0615-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0614-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0616-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0615-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0616-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0615-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0617-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0616-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0617-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0616-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0618-Add-Channel-initialization-listeners.patch b/patches/server/0617-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0618-Add-Channel-initialization-listeners.patch rename to patches/server/0617-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0619-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0618-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0619-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0618-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0620-Add-more-WanderingTrader-API.patch b/patches/server/0619-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0620-Add-more-WanderingTrader-API.patch rename to patches/server/0619-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0621-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0620-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0621-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0620-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0622-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0621-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0622-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0621-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0623-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0622-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 95% rename from patches/server/0623-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0622-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch index e0d7dfa858..091df9dbd5 100644 --- a/patches/server/0623-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch +++ b/patches/server/0622-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 1f311f84f8f291228a3b52471835d33c220db849..76d6572429548d90b5efa3029f33923a81f54c3f 100644 +index 8a2fdfb701ec663310c8f3f86607b6df1f2e01a4..fdd64b7bf24314a0d01444f0b074019b2031efdc 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -371,12 +371,13 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se diff --git a/patches/server/0624-Inventory-close.patch b/patches/server/0623-Inventory-close.patch similarity index 100% rename from patches/server/0624-Inventory-close.patch rename to patches/server/0623-Inventory-close.patch diff --git a/patches/server/0625-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0624-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0625-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0624-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0626-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0625-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0626-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0625-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0627-Fix-CraftPotionBrewer-cache.patch b/patches/server/0626-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0627-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0626-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0628-Add-basic-Datapack-API.patch b/patches/server/0627-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0628-Add-basic-Datapack-API.patch rename to patches/server/0627-Add-basic-Datapack-API.patch diff --git a/patches/server/0629-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0628-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0629-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0628-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0630-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0629-additions-to-PlayerGameModeChangeEvent.patch similarity index 98% rename from patches/server/0630-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0629-additions-to-PlayerGameModeChangeEvent.patch index f5024d9728..ee9b3d0f02 100644 --- a/patches/server/0630-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0629-additions-to-PlayerGameModeChangeEvent.patch @@ -139,7 +139,7 @@ index 161b5d6f0d420ac7b6ed112d1b03d42c3aaec421..de4c3849cc60151de8f3a873adad2bc3 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0f523f688a607cc4ff91f2b18be896f64b8d36bd..64c6a35ab369a19924dba94018c361dc2d24be82 100644 +index 41167d0da3d88466d4251c0adc56b4fd215c3bce..3be62930b3f69fda6ab8b21eae43e2544b2706cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1465,7 +1465,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0631-ItemStack-repair-check-API.patch b/patches/server/0630-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0631-ItemStack-repair-check-API.patch rename to patches/server/0630-ItemStack-repair-check-API.patch diff --git a/patches/server/0632-More-Enchantment-API.patch b/patches/server/0631-More-Enchantment-API.patch similarity index 100% rename from patches/server/0632-More-Enchantment-API.patch rename to patches/server/0631-More-Enchantment-API.patch diff --git a/patches/server/0633-Move-range-check-for-block-placing-up.patch b/patches/server/0632-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0633-Move-range-check-for-block-placing-up.patch rename to patches/server/0632-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0634-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0633-Fix-and-optimise-world-force-upgrading.patch similarity index 99% rename from patches/server/0634-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0633-Fix-and-optimise-world-force-upgrading.patch index 7466f77f39..98096691c6 100644 --- a/patches/server/0634-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0633-Fix-and-optimise-world-force-upgrading.patch @@ -272,7 +272,7 @@ index 2f82002c52af7304ff6b2d6fe8f094314daf0bba..5962f7a2b185d7d54a0f9e341a4fdf6e Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6758b78d1d780de3fecd6818f0ef83855fb82eef..a61a0a61ee5c96de68521ae3d01fd9f75526502c 100644 +index ac5119577debc7262fc5d1bdb746a2e31a0d901b..b108b4ce54570a841086adffac542d8f7f2f2c6d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -545,11 +545,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop noAllocateOptional = Optional.of(this); // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java -index c886d461304ad19483eb92a25f5827a95b8cba98..1a0095b9dee1f708c4c3d32fd95b88120245f1e9 100644 +index 27f766fc72d779cff1b5a88a79961aa7ef91b11f..2d208f1b85193497027c4d04ab9e8cb16fed9b47 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java @@ -71,11 +71,11 @@ public class SectionStorage extends RegionFileStorage implements AutoCloseabl diff --git a/patches/server/0713-Optimise-chunk-tick-iteration.patch b/patches/server/0712-Optimise-chunk-tick-iteration.patch similarity index 99% rename from patches/server/0713-Optimise-chunk-tick-iteration.patch rename to patches/server/0712-Optimise-chunk-tick-iteration.patch index 4d574dc627..2d346cd0dc 100644 --- a/patches/server/0713-Optimise-chunk-tick-iteration.patch +++ b/patches/server/0712-Optimise-chunk-tick-iteration.patch @@ -72,7 +72,7 @@ index 2add24517d38708a84e7f8ec25fbe9c62309375e..1fb298ff60b59a7074fb9d7a79709f05 int i = 0; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 37129601dfb8f2af897fb095786616b07e9acdd2..c5a76a6d589133f0f23a2b3b421399acaa7ceb8c 100644 +index 2a25d552612bf94c5f54249ae3cba549ea242488..3540ac6f99d724d91ff4e897f7e84ef03037f1bf 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -110,6 +110,8 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator; diff --git a/patches/server/0714-Execute-chunk-tasks-mid-tick.patch b/patches/server/0713-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0714-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0713-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0715-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0714-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0715-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0714-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0716-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0715-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0716-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0715-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0717-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0716-Detail-more-information-in-watchdog-dumps.patch similarity index 99% rename from patches/server/0717-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0716-Detail-more-information-in-watchdog-dumps.patch index 9adf6bbea8..431931de96 100644 --- a/patches/server/0717-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/0716-Detail-more-information-in-watchdog-dumps.patch @@ -78,7 +78,7 @@ index acfa1907bfc9c29d261cfccc00d65bad9ad1a002..d6f3869f5725c7f081efb7f486f74dbb }); throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ade1478a6e85bad5a168e3ab8ea3b2744cf18dea..204d101c318cf60fd2e31b0d1b84f78f87d2f68d 100644 +index b4b7aa2f7d602fe996ebc320ab9641866b672abe..f7841aea38707cebaaab2637454a0db8f93065b4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1039,7 +1039,26 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0718-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0717-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0718-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0717-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0719-Distance-manager-tick-timings.patch b/patches/server/0718-Distance-manager-tick-timings.patch similarity index 95% rename from patches/server/0719-Distance-manager-tick-timings.patch rename to patches/server/0718-Distance-manager-tick-timings.patch index 0fd96880f3..9889106ec3 100644 --- a/patches/server/0719-Distance-manager-tick-timings.patch +++ b/patches/server/0718-Distance-manager-tick-timings.patch @@ -19,7 +19,7 @@ index 5ec241d49ff5e3a161a39006f05823a5de847c5e..435b3b6d05e00803386d123c66f961c9 public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks"); diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java -index e28e083373261ab9fa3b015e294ee9f81b4d2f6e..192b52cb3205ea6bbf45bde9bc50324ad9815463 100644 +index d220507e1a432883d3092720e3634e8d1d961dbe..8dc1d2d15d571d1603a41dee13681a87841f5e23 100644 --- a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java +++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java @@ -901,7 +901,9 @@ public final class ChunkHolderManager { diff --git a/patches/server/0720-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0719-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0720-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0719-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0721-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0720-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0721-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0720-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0722-Add-packet-limiter-config.patch b/patches/server/0721-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0722-Add-packet-limiter-config.patch rename to patches/server/0721-Add-packet-limiter-config.patch diff --git a/patches/server/0723-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0722-Use-correct-LevelStem-registry-when-loading-default-.patch similarity index 96% rename from patches/server/0723-Use-correct-LevelStem-registry-when-loading-default-.patch rename to patches/server/0722-Use-correct-LevelStem-registry-when-loading-default-.patch index 7b971869b8..7d89a66288 100644 --- a/patches/server/0723-Use-correct-LevelStem-registry-when-loading-default-.patch +++ b/patches/server/0722-Use-correct-LevelStem-registry-when-loading-default-.patch @@ -24,7 +24,7 @@ index 8da1226a6c293abb038d10c7921a77ed71ad06cc..f958f0ae738a6fb26400e17e54c8d69e } else { Holder holder = registry.getOrCreateHolderOrThrow(entryKey); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8e4b1d9d84c41b6f3b599c85e551f9f98025c917..9011dbbe6302deb7318d31b9db3d2419a1871c07 100644 +index 207c1fb92493757de90f1a583a66ae4ad18b0e3f..ce99c2f4f172baa96831b194b4289da02a244519 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -553,7 +553,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop getTypeKey(); diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 4150e8cd7197eac53042d56f0a53a4951f8824ce..e31a2eea9a62ab2c0bed1a97dab6bae231b8cd8b 100644 +index e0b6f7da138776be2892821b32a099c2d0e45038..df83b6f0e217eec4c9e9707be0030c129fdeb545 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -259,7 +259,7 @@ public final class NaturalSpawner { @@ -312,7 +312,7 @@ index 4150e8cd7197eac53042d56f0a53a4951f8824ce..e31a2eea9a62ab2c0bed1a97dab6bae2 if (entityhuman != null) { double d2 = entityhuman.distanceToSqr(d0, (double) i, d1); -@@ -332,7 +332,7 @@ public final class NaturalSpawner { +@@ -333,7 +333,7 @@ public final class NaturalSpawner { } private static boolean isRightDistanceToPlayerAndSpawnPoint(ServerLevel world, ChunkAccess chunk, BlockPos.MutableBlockPos pos, double squaredDistance) { diff --git a/patches/server/0735-Remove-streams-for-villager-AI.patch b/patches/server/0734-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0735-Remove-streams-for-villager-AI.patch rename to patches/server/0734-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0736-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0735-Use-Velocity-compression-and-cipher-natives.patch similarity index 99% rename from patches/server/0736-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0735-Use-Velocity-compression-and-cipher-natives.patch index aabdb22ecd..78390bbbd3 100644 --- a/patches/server/0736-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/0735-Use-Velocity-compression-and-cipher-natives.patch @@ -341,7 +341,7 @@ index b80aedd2002959b4026c27ce76b3ed17f0acfb5b..2985271132c9ae822dcb0d7a7e6f0c26 protected void initChannel(Channel channel) { try { diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 76d6572429548d90b5efa3029f33923a81f54c3f..26781be1a01b0683f4d0f3cf565c3a623c987606 100644 +index fdd64b7bf24314a0d01444f0b074019b2031efdc..2bbf4096ec6c992a0369964efdd1375ae11b62d4 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -305,12 +305,14 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se diff --git a/patches/server/0737-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0736-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0737-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0736-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0738-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0737-Async-catch-modifications-to-critical-entity-state.patch similarity index 100% rename from patches/server/0738-Async-catch-modifications-to-critical-entity-state.patch rename to patches/server/0737-Async-catch-modifications-to-critical-entity-state.patch diff --git a/patches/server/0739-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0738-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0739-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0738-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0740-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0739-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0740-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0739-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0741-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0740-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0741-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0740-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0742-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0741-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0742-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0741-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0743-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0742-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0743-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0742-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0744-Ensure-valid-vehicle-status.patch b/patches/server/0743-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0744-Ensure-valid-vehicle-status.patch rename to patches/server/0743-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0745-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0744-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0745-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0744-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0746-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0745-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0746-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0745-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0747-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0746-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0747-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0746-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0748-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0747-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0748-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0747-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0749-Preserve-overstacked-loot.patch b/patches/server/0748-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0749-Preserve-overstacked-loot.patch rename to patches/server/0748-Preserve-overstacked-loot.patch diff --git a/patches/server/0750-Update-head-rotation-in-missing-places.patch b/patches/server/0749-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0750-Update-head-rotation-in-missing-places.patch rename to patches/server/0749-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0751-prevent-unintended-light-block-manipulation.patch b/patches/server/0750-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0751-prevent-unintended-light-block-manipulation.patch rename to patches/server/0750-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0752-Fix-CraftCriteria-defaults-map.patch b/patches/server/0751-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0752-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0751-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0753-Fix-upstreams-block-state-factories.patch b/patches/server/0752-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0753-Fix-upstreams-block-state-factories.patch rename to patches/server/0752-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0754-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0753-Add-config-option-for-logging-player-ip-addresses.patch similarity index 98% rename from patches/server/0754-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0753-Add-config-option-for-logging-player-ip-addresses.patch index 695d8483fe..c9fde34347 100644 --- a/patches/server/0754-Add-config-option-for-logging-player-ip-addresses.patch +++ b/patches/server/0753-Add-config-option-for-logging-player-ip-addresses.patch @@ -49,7 +49,7 @@ index 2985271132c9ae822dcb0d7a7e6f0c268d1736cc..cfdbcd024de6ad0f9d4e83b2f912b36e networkmanager.send(new ClientboundDisconnectPacket(ichatmutablecomponent), PacketSendListener.thenRun(() -> { diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 26781be1a01b0683f4d0f3cf565c3a623c987606..c8e373bccb8c8edd8b7a3a812e04fcf6c836df2d 100644 +index 2bbf4096ec6c992a0369964efdd1375ae11b62d4..b87bd1c2d3a371e2fca1d0bff6d0985188b22584 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -226,7 +226,10 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se diff --git a/patches/server/0755-Configurable-feature-seeds.patch b/patches/server/0754-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0755-Configurable-feature-seeds.patch rename to patches/server/0754-Configurable-feature-seeds.patch diff --git a/patches/server/0756-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0755-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0756-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0755-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0757-Add-root-admin-user-detection.patch b/patches/server/0756-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0757-Add-root-admin-user-detection.patch rename to patches/server/0756-Add-root-admin-user-detection.patch diff --git a/patches/server/0758-Always-allow-item-changing-in-Fireball.patch b/patches/server/0757-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0758-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0757-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0759-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0758-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0759-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0758-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0760-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0759-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 90% rename from patches/server/0760-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0759-Prevent-excessive-velocity-through-repeated-crits.patch index 51d947382e..d912af4b12 100644 --- a/patches/server/0760-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/server/0759-Prevent-excessive-velocity-through-repeated-crits.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 76ef3f561e3f8e0c0f9732feb64aacca93b57431..8ac7d25e6e1a22829d6c45522409763bbb1328a0 100644 +index 327dc44770656932879ffe58d9bbacb6ca3d0713..49718f6fbdd4ffe38afe4b5001d9de69097976f4 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2648,14 +2648,27 @@ public abstract class LivingEntity extends Entity { +@@ -2651,14 +2651,27 @@ public abstract class LivingEntity extends Entity { return this.hasEffect(MobEffects.JUMP) ? (double) (0.1F * (float) (this.getEffect(MobEffects.JUMP).getAmplifier() + 1)) : 0.0D; } diff --git a/patches/server/0761-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0760-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0761-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0760-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0762-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0761-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0762-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0761-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0763-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0762-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0763-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0762-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0764-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0763-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 95% rename from patches/server/0764-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0763-Prevent-sending-oversized-item-data-in-equipment-and.patch index 63ed303a2b..4bd83e942f 100644 --- a/patches/server/0764-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/server/0763-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -34,10 +34,10 @@ index cc418554b655ea4111631e4a1abf69776e150e7c..319dfa82dff1fe188a52bed5aa2d3957 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8ac7d25e6e1a22829d6c45522409763bbb1328a0..e7560eb298b563231407de832a81bb2c97e3c4cf 100644 +index 49718f6fbdd4ffe38afe4b5001d9de69097976f4..8a393cc4165c2aec51dcb26f7447dcc796528241 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3134,7 +3134,10 @@ public abstract class LivingEntity extends Entity { +@@ -3137,7 +3137,10 @@ public abstract class LivingEntity extends Entity { equipmentChanges.forEach((enumitemslot, itemstack) -> { ItemStack itemstack1 = itemstack.copy(); @@ -49,7 +49,7 @@ index 8ac7d25e6e1a22829d6c45522409763bbb1328a0..e7560eb298b563231407de832a81bb2c switch (enumitemslot.getType()) { case HAND: this.setLastHandItem(enumitemslot, itemstack1); -@@ -3147,6 +3150,34 @@ public abstract class LivingEntity extends Entity { +@@ -3150,6 +3153,34 @@ public abstract class LivingEntity extends Entity { ((ServerLevel) this.level).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list)); } diff --git a/patches/server/0765-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0764-Hide-unnecessary-itemmeta-from-clients.patch similarity index 96% rename from patches/server/0765-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0764-Hide-unnecessary-itemmeta-from-clients.patch index 9442632b57..46b7980c35 100644 --- a/patches/server/0765-Hide-unnecessary-itemmeta-from-clients.patch +++ b/patches/server/0764-Hide-unnecessary-itemmeta-from-clients.patch @@ -33,10 +33,10 @@ index 678c0b1c37b16e405205933a16f0d2d29359fd12..1d024bfbada440c93b1174568feaa675 } } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e7560eb298b563231407de832a81bb2c97e3c4cf..d6ecdeab398d7bfde3d760ada0374245f03014b3 100644 +index 8a393cc4165c2aec51dcb26f7447dcc796528241..1ef11297bc9017fd3c5ac661167c58617d06200b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3136,7 +3136,7 @@ public abstract class LivingEntity extends Entity { +@@ -3139,7 +3139,7 @@ public abstract class LivingEntity extends Entity { // Paper start - prevent oversized data ItemStack toSend = sanitizeItemStack(itemstack1, true); @@ -45,7 +45,7 @@ index e7560eb298b563231407de832a81bb2c97e3c4cf..d6ecdeab398d7bfde3d760ada0374245 // Paper end switch (enumitemslot.getType()) { case HAND: -@@ -3150,6 +3150,59 @@ public abstract class LivingEntity extends Entity { +@@ -3153,6 +3153,59 @@ public abstract class LivingEntity extends Entity { ((ServerLevel) this.level).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list)); } diff --git a/patches/server/0766-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0765-Fix-kelp-modifier-changing-growth-for-other-crops.patch similarity index 100% rename from patches/server/0766-Fix-kelp-modifier-changing-growth-for-other-crops.patch rename to patches/server/0765-Fix-kelp-modifier-changing-growth-for-other-crops.patch diff --git a/patches/server/0767-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0766-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0767-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0766-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0768-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0767-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0768-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0767-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0769-Add-player-health-update-API.patch b/patches/server/0768-Add-player-health-update-API.patch similarity index 95% rename from patches/server/0769-Add-player-health-update-API.patch rename to patches/server/0768-Add-player-health-update-API.patch index 717cd2e501..e3736feaac 100644 --- a/patches/server/0769-Add-player-health-update-API.patch +++ b/patches/server/0768-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 3ff0c79134c1c474bc1e55b879394939a345562e..e02720435b6ed5f07a13d08a209caf6df49799ad 100644 +index 8ac816295ce5bc9f2696fe790f4319e5ba16116f..9b9fe738a20bfd2c9f954539362d35d7c83e8eb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2221,9 +2221,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0770-Optimize-HashMapPalette.patch b/patches/server/0769-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0770-Optimize-HashMapPalette.patch rename to patches/server/0769-Optimize-HashMapPalette.patch diff --git a/patches/server/0771-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0770-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0771-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0770-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0772-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0771-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/0772-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0771-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/0773-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0772-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0773-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0772-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0774-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0773-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0774-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0773-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0775-Update-Log4j.patch b/patches/server/0774-Update-Log4j.patch similarity index 93% rename from patches/server/0775-Update-Log4j.patch rename to patches/server/0774-Update-Log4j.patch index 41cc02c122..48d47942a8 100644 --- a/patches/server/0775-Update-Log4j.patch +++ b/patches/server/0774-Update-Log4j.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Update Log4j diff --git a/build.gradle.kts b/build.gradle.kts -index fb6bfd4967b4ec113463cfaa77e621183f93e441..effc19371309a1af44e1b660b547b58530a8df3c 100644 +index 30a600ef1dfedc1a050268af593074659382bc36..039891cc7ffd355f2d4c1cd202a042bf061ddfa8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,10 +20,11 @@ dependencies { diff --git a/patches/server/0776-Add-more-Campfire-API.patch b/patches/server/0775-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0776-Add-more-Campfire-API.patch rename to patches/server/0775-Add-more-Campfire-API.patch diff --git a/patches/server/0777-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0776-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0777-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0776-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0778-Fix-tripwire-state-inconsistency.patch b/patches/server/0777-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0778-Fix-tripwire-state-inconsistency.patch rename to patches/server/0777-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0779-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0778-Fix-fluid-logging-on-Block-breakNaturally.patch similarity index 100% rename from patches/server/0779-Fix-fluid-logging-on-Block-breakNaturally.patch rename to patches/server/0778-Fix-fluid-logging-on-Block-breakNaturally.patch diff --git a/patches/server/0780-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0779-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0780-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0779-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0781-Improve-scoreboard-entries.patch b/patches/server/0780-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0781-Improve-scoreboard-entries.patch rename to patches/server/0780-Improve-scoreboard-entries.patch diff --git a/patches/server/0782-Entity-powdered-snow-API.patch b/patches/server/0781-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0782-Entity-powdered-snow-API.patch rename to patches/server/0781-Entity-powdered-snow-API.patch diff --git a/patches/server/0783-Add-API-for-item-entity-health.patch b/patches/server/0782-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0783-Add-API-for-item-entity-health.patch rename to patches/server/0782-Add-API-for-item-entity-health.patch diff --git a/patches/server/0784-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0783-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 98% rename from patches/server/0784-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0783-Fix-entity-type-tags-suggestions-in-selectors.patch index ca29c1bbf2..0a907df304 100644 --- a/patches/server/0784-Fix-entity-type-tags-suggestions-in-selectors.patch +++ b/patches/server/0783-Fix-entity-type-tags-suggestions-in-selectors.patch @@ -10,7 +10,7 @@ when if this was fixed on the client, that wouldn't be needed. Mojira Issue: https://bugs.mojang.com/browse/MC-235045 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java -index 6fdbe747645eb83f31b56bca77a9d7962237aed8..dd0143f319d4adef8834c513af34b1cce7a94a84 100644 +index 90d5d1de2f00be97e3ea0ff50caa7e7ba9438408..0d140dd7d55407b57fc3394ceb2eba5136e4fcaf 100644 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java @@ -412,4 +412,20 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy diff --git a/patches/server/0785-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0784-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0785-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0784-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0786-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0785-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0786-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0785-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0787-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0786-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0787-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0786-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0788-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0787-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0788-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0787-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0789-Fix-bees-aging-inside-hives.patch b/patches/server/0788-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0789-Fix-bees-aging-inside-hives.patch rename to patches/server/0788-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0790-Bucketable-API.patch b/patches/server/0789-Bucketable-API.patch similarity index 100% rename from patches/server/0790-Bucketable-API.patch rename to patches/server/0789-Bucketable-API.patch diff --git a/patches/server/0791-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0790-Check-player-world-in-endPortalSoundRadius.patch similarity index 100% rename from patches/server/0791-Check-player-world-in-endPortalSoundRadius.patch rename to patches/server/0790-Check-player-world-in-endPortalSoundRadius.patch diff --git a/patches/server/0792-Validate-usernames.patch b/patches/server/0791-Validate-usernames.patch similarity index 97% rename from patches/server/0792-Validate-usernames.patch rename to patches/server/0791-Validate-usernames.patch index 299e6235a5..af37250ab9 100644 --- a/patches/server/0792-Validate-usernames.patch +++ b/patches/server/0791-Validate-usernames.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index c8e373bccb8c8edd8b7a3a812e04fcf6c836df2d..ef6a55a9f0055e23e8887eb3efd17cc21a7dc004 100644 +index b87bd1c2d3a371e2fca1d0bff6d0985188b22584..64e2004e023f79d28c400f7182b0ffa93789620d 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -66,6 +66,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se diff --git a/patches/server/0793-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0792-Fix-saving-configs-with-more-long-comments.patch similarity index 100% rename from patches/server/0793-Fix-saving-configs-with-more-long-comments.patch rename to patches/server/0792-Fix-saving-configs-with-more-long-comments.patch diff --git a/patches/server/0794-Make-water-animal-spawn-height-configurable.patch b/patches/server/0793-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0794-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0793-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0795-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0794-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 98% rename from patches/server/0795-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0794-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index 4e8650b1ea..a9805b24fc 100644 --- a/patches/server/0795-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0794-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9011dbbe6302deb7318d31b9db3d2419a1871c07..2310b0314cc8a0f298eb82839dbf601901415dea 100644 +index ce99c2f4f172baa96831b194b4289da02a244519..efe7a3afaf5ef548bded4dc2957375fdbc605d63 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -562,7 +562,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 33c22f908440664dc9d67f1678a3c4bd8b862457..1c8661afcfaaf56953cef3a5c26fbc4fa3ac5b1c 100644 +index 780cff9638fe717e98a97f1241cf65337b55382c..0318c9483a4d96eb39ff4df9054a9e6398186bc3 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3008,37 +3008,15 @@ public abstract class LivingEntity extends Entity { +@@ -3011,37 +3011,15 @@ public abstract class LivingEntity extends Entity { this.level.getProfiler().pop(); this.level.getProfiler().push("rangeChecks"); diff --git a/patches/server/0906-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0905-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 94% rename from patches/server/0906-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/server/0905-Add-custom-destroyerIdentity-to-sendBlockDamage.patch index 6a427b822d..f5809b775f 100644 --- a/patches/server/0906-Add-custom-destroyerIdentity-to-sendBlockDamage.patch +++ b/patches/server/0905-Add-custom-destroyerIdentity-to-sendBlockDamage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f2e5164b0651963cb26e4d776ec5c6e30647790f..a508619e6855ee0b96a9bf61526b1b88abf0e732 100644 +index 781c0e10b523c55989f368b4507137343dcffdab..968aa80b57a31d89852c6f4bc0ec5ed4a98c6530 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1008,13 +1008,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0907-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0906-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch similarity index 100% rename from patches/server/0907-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch rename to patches/server/0906-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch diff --git a/patches/server/0908-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0907-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0908-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0907-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0909-Missing-eating-regain-reason.patch b/patches/server/0908-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0909-Missing-eating-regain-reason.patch rename to patches/server/0908-Missing-eating-regain-reason.patch diff --git a/patches/server/0910-Missing-effect-cause.patch b/patches/server/0909-Missing-effect-cause.patch similarity index 100% rename from patches/server/0910-Missing-effect-cause.patch rename to patches/server/0909-Missing-effect-cause.patch diff --git a/patches/server/0911-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0910-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0911-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0910-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0912-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0911-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0912-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0911-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0913-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0912-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0913-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0912-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0914-Configurable-chat-thread-limit.patch b/patches/server/0913-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0914-Configurable-chat-thread-limit.patch rename to patches/server/0913-Configurable-chat-thread-limit.patch diff --git a/patches/server/0915-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0914-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0915-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0914-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0916-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0915-Set-position-before-player-sending-on-dimension-chan.patch similarity index 100% rename from patches/server/0916-Set-position-before-player-sending-on-dimension-chan.patch rename to patches/server/0915-Set-position-before-player-sending-on-dimension-chan.patch diff --git a/patches/server/0917-fix-Jigsaw-block-kicking-user.patch b/patches/server/0916-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0917-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0916-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0918-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0917-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0918-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0917-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0919-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0918-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch similarity index 100% rename from patches/server/0919-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch rename to patches/server/0918-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch diff --git a/patches/server/0920-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0919-Fix-a-bunch-of-vanilla-bugs.patch similarity index 98% rename from patches/server/0920-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0919-Fix-a-bunch-of-vanilla-bugs.patch index 58087b1dd3..ff0ed12381 100644 --- a/patches/server/0920-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0919-Fix-a-bunch-of-vanilla-bugs.patch @@ -45,7 +45,7 @@ index 43e77cef0fce75f59aeb05e161668bebb8fca229..ef50fbf8cb3f008827850b5ed3342200 } diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java -index 31be36e6b7b6bd0c0d7fda4e1b03ecd38947f3a5..962a6dfed8496959b3f7eac12c7f55fb1b9c57d1 100644 +index c17d9a7cb69d3b6ea6e17b689921fa239db3552b..a4690391df0aa26abea1ad92e6143eb19c5d1143 100644 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java @@ -211,9 +211,10 @@ public class Goat extends Animal { diff --git a/work/Bukkit b/work/Bukkit index c7c1118861..0994345029 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit c7c11188610b4b0a59d090b06cabdc239337dcb8 +Subproject commit 0994345029c4d127696616de3bab3e8044b03749 diff --git a/work/CraftBukkit b/work/CraftBukkit index c2c39089eb..aaf484f6fd 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit c2c39089eb639479327acb2c9f58bdfb69bc6b81 +Subproject commit aaf484f6fdb052306f7612bc0e721fa440d1b841