diff --git a/build-data/spigot-server-patches/re-add-asm-dependency.patch b/build-data/spigot-server-patches/re-add-asm-dependency.patch index fcf343fa1d..6e33148caa 100644 --- a/build-data/spigot-server-patches/re-add-asm-dependency.patch +++ b/build-data/spigot-server-patches/re-add-asm-dependency.patch @@ -24,6 +24,6 @@ + + org.ow2.asm + asm-commons -+-- ++-- +2.43.0 + diff --git a/patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch similarity index 58% rename from patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch index 93f6f96fdf..b73f9ab1ff 100644 --- a/patches/api/0090-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch @@ -1,12 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:43:30 -0400 -Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent +Subject: [PATCH] Add more fields to AsyncPreLoginEvent -This will allow you to change the players name or skin on login. diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index 6aaeba3feb66462ce352dacabd845f8d8283f54b..e4afc428e9a8625bf6f5967cb659987c14f65ba6 100644 +index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..f8b69b52ec8efa103e4e78e1b5c6a015e73d2a75 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -2,6 +2,9 @@ package org.bukkit.event.player; @@ -19,27 +18,69 @@ index 6aaeba3feb66462ce352dacabd845f8d8283f54b..e4afc428e9a8625bf6f5967cb659987c import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; -@@ -22,9 +25,9 @@ public class AsyncPlayerPreLoginEvent extends Event { +@@ -22,9 +25,10 @@ public class AsyncPlayerPreLoginEvent extends Event { private static final HandlerList handlers = new HandlerList(); private Result result; private net.kyori.adventure.text.Component message; // Paper - private final String name; -+ //private String name; // Paper - Not used anymore private final InetAddress ipAddress; - private final UUID uniqueId; -+ //private UUID uniqueId; // Paper - Not used anymore ++ private PlayerProfile profile; // Paper ++ private final InetAddress rawAddress; // Paper ++ private final String hostname; // Paper @Deprecated public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) { -@@ -32,12 +35,37 @@ public class AsyncPlayerPreLoginEvent extends Event { +@@ -32,12 +36,29 @@ public class AsyncPlayerPreLoginEvent extends Event { } public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) { + // Paper start + this(name, ipAddress, uniqueId, Bukkit.createProfile(uniqueId, name)); + } -+ private PlayerProfile profile; + ++ @Deprecated(forRemoval = true) ++ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) { ++ this(name, ipAddress, ipAddress, uniqueId, profile); ++ } ++ ++ @Deprecated(forRemoval = true) ++ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) { ++ this(name, ipAddress, rawAddress, uniqueId, profile, ""); ++ } ++ ++ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile, @NotNull String hostname) { + super(true); + this.result = Result.ALLOWED; + this.message = net.kyori.adventure.text.Component.empty(); // Paper +- this.name = name; ++ this.profile = profile; + this.ipAddress = ipAddress; +- this.uniqueId = uniqueId; ++ this.rawAddress = rawAddress; ++ this.hostname = hostname; ++ // Paper end + } + + /** +@@ -200,7 +221,7 @@ public class AsyncPlayerPreLoginEvent extends Event { + */ + @NotNull + public String getName() { +- return name; ++ return profile.getName(); // Paper + } + + /** +@@ -220,9 +241,48 @@ public class AsyncPlayerPreLoginEvent extends Event { + */ + @NotNull + public UUID getUniqueId() { +- return uniqueId; ++ return profile.getId(); // Paper + } + ++ // Paper start + /** + * Gets the PlayerProfile of the player logging in + * @return The Profile @@ -57,35 +98,27 @@ index 6aaeba3feb66462ce352dacabd845f8d8283f54b..e4afc428e9a8625bf6f5967cb659987c + this.profile = profile; + } + -+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) { - super(true); -+ this.profile = profile; -+ // Paper end - this.result = Result.ALLOWED; - this.message = net.kyori.adventure.text.Component.empty(); // Paper -- this.name = name; -+ //this.name = name; // Paper - Not used anymore - this.ipAddress = ipAddress; -- this.uniqueId = uniqueId; -+ //this.uniqueId = uniqueId; // Paper - Not used anymore - } - - /** -@@ -200,7 +228,7 @@ public class AsyncPlayerPreLoginEvent extends Event { - */ - @NotNull - public String getName() { -- return name; -+ return profile.getName(); // Paper - } - - /** -@@ -220,7 +248,7 @@ public class AsyncPlayerPreLoginEvent extends Event { - */ - @NotNull - public UUID getUniqueId() { -- return uniqueId; -+ return profile.getId(); // Paper - } - ++ /** ++ * Gets the raw address of the player logging in ++ * @return The address ++ */ ++ @NotNull ++ public InetAddress getRawAddress() { ++ return rawAddress; ++ } ++ ++ /** ++ * Gets the hostname that the player used to connect to the server, or ++ * blank if unknown ++ * ++ * @return The hostname ++ */ ++ @NotNull ++ public String getHostname() { ++ return hostname; ++ } ++ // Paper end ++ @NotNull + @Override + public HandlerList getHandlers() { diff --git a/patches/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch deleted file mode 100644 index e2cdbb7e10..0000000000 --- a/patches/api/0280-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Connor Linfoot -Date: Wed, 12 May 2021 08:09:19 +0100 -Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent - - -diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index e4afc428e9a8625bf6f5967cb659987c14f65ba6..35176b16d208c9756bd00ac74b2a1dcc3fc9febb 100644 ---- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -@@ -27,6 +27,7 @@ public class AsyncPlayerPreLoginEvent extends Event { - private net.kyori.adventure.text.Component message; // Paper - //private String name; // Paper - Not used anymore - private final InetAddress ipAddress; -+ private final InetAddress rawAddress; // Paper - //private UUID uniqueId; // Paper - Not used anymore - - @Deprecated -@@ -57,7 +58,23 @@ public class AsyncPlayerPreLoginEvent extends Event { - this.profile = profile; - } - -+ // Paper Start -+ /** -+ * Gets the raw address of the player logging in -+ * @return The address -+ */ -+ @NotNull -+ public InetAddress getRawAddress() { -+ return rawAddress; -+ } -+ // Paper end -+ -+ @Deprecated - public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) { -+ this(name, ipAddress, ipAddress, uniqueId, profile); -+ } -+ -+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) { - super(true); - this.profile = profile; - // Paper end -@@ -65,6 +82,7 @@ public class AsyncPlayerPreLoginEvent extends Event { - this.message = net.kyori.adventure.text.Component.empty(); // Paper - //this.name = name; // Paper - Not used anymore - this.ipAddress = ipAddress; -+ this.rawAddress = rawAddress; // Paper - //this.uniqueId = uniqueId; // Paper - Not used anymore - } - diff --git a/patches/api/0281-Inventory-close.patch b/patches/api/0280-Inventory-close.patch similarity index 100% rename from patches/api/0281-Inventory-close.patch rename to patches/api/0280-Inventory-close.patch diff --git a/patches/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0281-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0282-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0281-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0283-Add-basic-Datapack-API.patch b/patches/api/0282-Add-basic-Datapack-API.patch similarity index 100% rename from patches/api/0283-Add-basic-Datapack-API.patch rename to patches/api/0282-Add-basic-Datapack-API.patch diff --git a/patches/api/0284-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0283-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0284-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0283-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0285-ItemStack-repair-check-API.patch b/patches/api/0284-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0285-ItemStack-repair-check-API.patch rename to patches/api/0284-ItemStack-repair-check-API.patch diff --git a/patches/api/0286-More-Enchantment-API.patch b/patches/api/0285-More-Enchantment-API.patch similarity index 100% rename from patches/api/0286-More-Enchantment-API.patch rename to patches/api/0285-More-Enchantment-API.patch diff --git a/patches/api/0287-Add-Mob-lookAt-API.patch b/patches/api/0286-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0287-Add-Mob-lookAt-API.patch rename to patches/api/0286-Add-Mob-lookAt-API.patch diff --git a/patches/api/0288-ItemStack-editMeta.patch b/patches/api/0287-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0288-ItemStack-editMeta.patch rename to patches/api/0287-ItemStack-editMeta.patch diff --git a/patches/api/0289-Add-EntityInsideBlockEvent.patch b/patches/api/0288-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0289-Add-EntityInsideBlockEvent.patch rename to patches/api/0288-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0290-Attributes-API-for-item-defaults.patch b/patches/api/0289-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0290-Attributes-API-for-item-defaults.patch rename to patches/api/0289-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0290-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0291-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0290-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0292-More-Lidded-Block-API.patch b/patches/api/0291-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0292-More-Lidded-Block-API.patch rename to patches/api/0291-More-Lidded-Block-API.patch diff --git a/patches/api/0293-Add-PlayerKickEvent-causes.patch b/patches/api/0292-Add-PlayerKickEvent-causes.patch similarity index 97% rename from patches/api/0293-Add-PlayerKickEvent-causes.patch rename to patches/api/0292-Add-PlayerKickEvent-causes.patch index 5b213c4350..d03d83031a 100644 --- a/patches/api/0293-Add-PlayerKickEvent-causes.patch +++ b/patches/api/0292-Add-PlayerKickEvent-causes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b848ef1c207797b352c2ca97c574c4cd3fe6e43a..2a6879aa1b0497c485d127542ca4e526a23ecf85 100644 +index 6e44845340f23a5b6ad8be46a1fa3dbb9dec5d67..a5e4b4447b5c68339d6b09749520048642a4eb83 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -275,6 +275,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0294-Add-PufferFishStateChangeEvent.patch b/patches/api/0293-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0294-Add-PufferFishStateChangeEvent.patch rename to patches/api/0293-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0295-Add-BellRevealRaiderEvent.patch b/patches/api/0294-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0295-Add-BellRevealRaiderEvent.patch rename to patches/api/0294-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0296-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0295-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0296-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0295-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0297-Add-more-line-of-sight-methods.patch b/patches/api/0296-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0297-Add-more-line-of-sight-methods.patch rename to patches/api/0296-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0298-Add-WaterBottleSplashEvent.patch b/patches/api/0297-Add-WaterBottleSplashEvent.patch similarity index 100% rename from patches/api/0298-Add-WaterBottleSplashEvent.patch rename to patches/api/0297-Add-WaterBottleSplashEvent.patch diff --git a/patches/api/0299-Add-more-LimitedRegion-API.patch b/patches/api/0298-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0299-Add-more-LimitedRegion-API.patch rename to patches/api/0298-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0300-Missing-Entity-API.patch b/patches/api/0299-Missing-Entity-API.patch similarity index 100% rename from patches/api/0300-Missing-Entity-API.patch rename to patches/api/0299-Missing-Entity-API.patch diff --git a/patches/api/0301-Adds-PlayerArmSwingEvent.patch b/patches/api/0300-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0301-Adds-PlayerArmSwingEvent.patch rename to patches/api/0300-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0302-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0301-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0302-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0301-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0303-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0302-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0303-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0302-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0304-Stinger-API.patch b/patches/api/0303-Stinger-API.patch similarity index 100% rename from patches/api/0304-Stinger-API.patch rename to patches/api/0303-Stinger-API.patch diff --git a/patches/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/api/0305-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/api/0306-Add-PlayerSetSpawnEvent.patch b/patches/api/0305-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0306-Add-PlayerSetSpawnEvent.patch rename to patches/api/0305-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0307-Added-EntityDamageItemEvent.patch b/patches/api/0306-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0307-Added-EntityDamageItemEvent.patch rename to patches/api/0306-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0308-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0307-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0308-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0307-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0309-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0308-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0309-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0308-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0310-Add-BlockBreakBlockEvent.patch b/patches/api/0309-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0310-Add-BlockBreakBlockEvent.patch rename to patches/api/0309-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0311-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0310-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0311-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0310-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0311-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/api/0312-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/api/0311-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/api/0313-More-CommandBlock-API.patch b/patches/api/0312-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0313-More-CommandBlock-API.patch rename to patches/api/0312-More-CommandBlock-API.patch diff --git a/patches/api/0314-Add-missing-team-sidebar-display-slots.patch b/patches/api/0313-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0314-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0313-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0315-add-back-EntityPortalExitEvent.patch b/patches/api/0314-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0315-add-back-EntityPortalExitEvent.patch rename to patches/api/0314-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0315-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 95% rename from patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0315-Add-methods-to-find-targets-for-lightning-strikes.patch index 1f32990f0d..209cde5c42 100644 --- a/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/api/0315-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 8735a0a359450a6cbea44c1b01c85a4135ba1f86..48b3df2c12b3f6640e6c54c89763929487f0506d 100644 +index 39fd31cb24d16b8279f54e666bb5e7bccf32468c..21835fcc70c4dcffb2474caa7be3cd07bb54e2cd 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -735,6 +735,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0317-Get-entity-default-attributes.patch b/patches/api/0316-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0317-Get-entity-default-attributes.patch rename to patches/api/0316-Get-entity-default-attributes.patch diff --git a/patches/api/0318-Left-handed-API.patch b/patches/api/0317-Left-handed-API.patch similarity index 100% rename from patches/api/0318-Left-handed-API.patch rename to patches/api/0317-Left-handed-API.patch diff --git a/patches/api/0319-Add-critical-damage-API.patch b/patches/api/0318-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0319-Add-critical-damage-API.patch rename to patches/api/0318-Add-critical-damage-API.patch diff --git a/patches/api/0320-Add-more-advancement-API.patch b/patches/api/0319-Add-more-advancement-API.patch similarity index 100% rename from patches/api/0320-Add-more-advancement-API.patch rename to patches/api/0319-Add-more-advancement-API.patch diff --git a/patches/api/0321-Fix-issues-with-mob-conversion.patch b/patches/api/0320-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0321-Fix-issues-with-mob-conversion.patch rename to patches/api/0320-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0322-Add-isCollidable-methods-to-various-places.patch b/patches/api/0321-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0322-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0321-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0323-Goat-ram-API.patch b/patches/api/0322-Goat-ram-API.patch similarity index 100% rename from patches/api/0323-Goat-ram-API.patch rename to patches/api/0322-Goat-ram-API.patch diff --git a/patches/api/0324-Add-API-for-resetting-a-single-score.patch b/patches/api/0323-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0324-Add-API-for-resetting-a-single-score.patch rename to patches/api/0323-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0325-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0324-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/api/0325-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0324-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/api/0326-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0325-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0326-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0325-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0326-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0327-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0326-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0328-Add-more-Campfire-API.patch b/patches/api/0327-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0328-Add-more-Campfire-API.patch rename to patches/api/0327-Add-more-Campfire-API.patch diff --git a/patches/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0328-Move-VehicleCollisionEvent-HandlerList-up.patch similarity index 100% rename from patches/api/0329-Move-VehicleCollisionEvent-HandlerList-up.patch rename to patches/api/0328-Move-VehicleCollisionEvent-HandlerList-up.patch diff --git a/patches/api/0330-Improve-scoreboard-entries.patch b/patches/api/0329-Improve-scoreboard-entries.patch similarity index 100% rename from patches/api/0330-Improve-scoreboard-entries.patch rename to patches/api/0329-Improve-scoreboard-entries.patch diff --git a/patches/api/0331-Entity-powdered-snow-API.patch b/patches/api/0330-Entity-powdered-snow-API.patch similarity index 100% rename from patches/api/0331-Entity-powdered-snow-API.patch rename to patches/api/0330-Entity-powdered-snow-API.patch diff --git a/patches/api/0332-Add-API-for-item-entity-health.patch b/patches/api/0331-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0332-Add-API-for-item-entity-health.patch rename to patches/api/0331-Add-API-for-item-entity-health.patch diff --git a/patches/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0332-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0333-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0332-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0334-Bucketable-API.patch b/patches/api/0333-Bucketable-API.patch similarity index 100% rename from patches/api/0334-Bucketable-API.patch rename to patches/api/0333-Bucketable-API.patch diff --git a/patches/api/0335-System-prop-for-default-config-comment-parsing.patch b/patches/api/0334-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0335-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0334-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0335-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0336-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0335-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0337-Multiple-Entries-with-Scoreboards.patch b/patches/api/0336-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0337-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0336-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0339-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0337-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0339-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0337-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0338-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0338-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch deleted file mode 100644 index 44b186434d..0000000000 --- a/patches/api/0338-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MCMDEV -Date: Fri, 24 Sep 2021 17:59:23 +0200 -Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent - - -diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index 35176b16d208c9756bd00ac74b2a1dcc3fc9febb..da07fc4ab0c299c1bb06ede36e7230626bbc28c9 100644 ---- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -@@ -29,6 +29,7 @@ public class AsyncPlayerPreLoginEvent extends Event { - private final InetAddress ipAddress; - private final InetAddress rawAddress; // Paper - //private UUID uniqueId; // Paper - Not used anymore -+ private final String hostname; // Paper - - @Deprecated - public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) { -@@ -74,7 +75,14 @@ public class AsyncPlayerPreLoginEvent extends Event { - this(name, ipAddress, ipAddress, uniqueId, profile); - } - -+ @Deprecated // Paper - Add hostname - public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) { -+ // Paper start - Add hostname -+ this(name, ipAddress, rawAddress, uniqueId, profile, ""); -+ } -+ -+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile, @NotNull String hostname) { -+ // Paper end - Add hostname - super(true); - this.profile = profile; - // Paper end -@@ -84,6 +92,7 @@ public class AsyncPlayerPreLoginEvent extends Event { - this.ipAddress = ipAddress; - this.rawAddress = rawAddress; // Paper - //this.uniqueId = uniqueId; // Paper - Not used anymore -+ this.hostname = hostname; // Paper - Add hostname - } - - /** -@@ -269,6 +278,19 @@ public class AsyncPlayerPreLoginEvent extends Event { - return profile.getId(); // Paper - } - -+ // Paper start -+ /** -+ * Gets the hostname that the player used to connect to the server, or -+ * blank if unknown -+ * -+ * @return The hostname -+ */ -+ @NotNull -+ public String getHostname() { -+ return hostname; -+ } -+ // Paper end -+ - @NotNull - @Override - public HandlerList getHandlers() { diff --git a/patches/api/0340-Multi-Block-Change-API.patch b/patches/api/0338-Multi-Block-Change-API.patch similarity index 95% rename from patches/api/0340-Multi-Block-Change-API.patch rename to patches/api/0338-Multi-Block-Change-API.patch index 6f93a168a6..cdd9b018b0 100644 --- a/patches/api/0340-Multi-Block-Change-API.patch +++ b/patches/api/0338-Multi-Block-Change-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Multi Block Change API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 7ce512072f242632f17db55224488f18c1cddcc4..a6053648464d903d1f9501bbeae688240fbfd754 100644 +index a5e4b4447b5c68339d6b09749520048642a4eb83..e2333a5f8e357ada69ff8857d3b1c666f51ac909 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -852,6 +852,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0341-Fix-NotePlayEvent.patch b/patches/api/0339-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0341-Fix-NotePlayEvent.patch rename to patches/api/0339-Fix-NotePlayEvent.patch diff --git a/patches/api/0342-Freeze-Tick-Lock-API.patch b/patches/api/0340-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/api/0342-Freeze-Tick-Lock-API.patch rename to patches/api/0340-Freeze-Tick-Lock-API.patch diff --git a/patches/api/0343-Dolphin-API.patch b/patches/api/0341-Dolphin-API.patch similarity index 100% rename from patches/api/0343-Dolphin-API.patch rename to patches/api/0341-Dolphin-API.patch diff --git a/patches/api/0344-More-PotionEffectType-API.patch b/patches/api/0342-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0344-More-PotionEffectType-API.patch rename to patches/api/0342-More-PotionEffectType-API.patch diff --git a/patches/api/0345-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0343-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/api/0345-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0343-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/api/0346-Implement-regenerateChunk.patch b/patches/api/0344-Implement-regenerateChunk.patch similarity index 91% rename from patches/api/0346-Implement-regenerateChunk.patch rename to patches/api/0344-Implement-regenerateChunk.patch index f431abe466..4625c51a5a 100644 --- a/patches/api/0346-Implement-regenerateChunk.patch +++ b/patches/api/0344-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 48b3df2c12b3f6640e6c54c89763929487f0506d..b191d304832fe3475b76fdce131db51e5042ac01 100644 +index 21835fcc70c4dcffb2474caa7be3cd07bb54e2cd..86c7b4ba676f826344056b24b204b748cfce1580 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -484,8 +484,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0347-Add-GameEvent-tags.patch b/patches/api/0345-Add-GameEvent-tags.patch similarity index 100% rename from patches/api/0347-Add-GameEvent-tags.patch rename to patches/api/0345-Add-GameEvent-tags.patch diff --git a/patches/api/0348-Furnace-RecipesUsed-API.patch b/patches/api/0346-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0348-Furnace-RecipesUsed-API.patch rename to patches/api/0346-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0349-Configurable-sculk-sensor-listener-range.patch b/patches/api/0347-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0349-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0347-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0350-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0348-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0350-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0348-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0351-Custom-Potion-Mixes.patch b/patches/api/0349-Custom-Potion-Mixes.patch similarity index 100% rename from patches/api/0351-Custom-Potion-Mixes.patch rename to patches/api/0349-Custom-Potion-Mixes.patch diff --git a/patches/api/0352-Expose-furnace-minecart-push-values.patch b/patches/api/0350-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0352-Expose-furnace-minecart-push-values.patch rename to patches/api/0350-Expose-furnace-minecart-push-values.patch diff --git a/patches/api/0353-More-Projectile-API.patch b/patches/api/0351-More-Projectile-API.patch similarity index 100% rename from patches/api/0353-More-Projectile-API.patch rename to patches/api/0351-More-Projectile-API.patch diff --git a/patches/api/0354-Add-getComputedBiome-API.patch b/patches/api/0352-Add-getComputedBiome-API.patch similarity index 100% rename from patches/api/0354-Add-getComputedBiome-API.patch rename to patches/api/0352-Add-getComputedBiome-API.patch diff --git a/patches/api/0355-Add-enchantWithLevels-API.patch b/patches/api/0353-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/api/0355-Add-enchantWithLevels-API.patch rename to patches/api/0353-Add-enchantWithLevels-API.patch diff --git a/patches/api/0356-Add-TameableDeathMessageEvent.patch b/patches/api/0354-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/api/0356-Add-TameableDeathMessageEvent.patch rename to patches/api/0354-Add-TameableDeathMessageEvent.patch diff --git a/patches/api/0357-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0355-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/api/0357-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/api/0355-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/api/0358-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0356-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch similarity index 100% rename from patches/api/0358-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch rename to patches/api/0356-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch diff --git a/patches/api/0359-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0357-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/api/0359-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/api/0357-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/api/0360-WorldCreator-keepSpawnLoaded.patch b/patches/api/0358-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/api/0360-WorldCreator-keepSpawnLoaded.patch rename to patches/api/0358-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/api/0361-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0359-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/api/0361-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/api/0359-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/api/0362-Add-PlayerStopUsingItemEvent.patch b/patches/api/0360-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/api/0362-Add-PlayerStopUsingItemEvent.patch rename to patches/api/0360-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/api/0363-Expand-FallingBlock-API.patch b/patches/api/0361-Expand-FallingBlock-API.patch similarity index 97% rename from patches/api/0363-Expand-FallingBlock-API.patch rename to patches/api/0361-Expand-FallingBlock-API.patch index d1138539df..b0a7ccd2c7 100644 --- a/patches/api/0363-Expand-FallingBlock-API.patch +++ b/patches/api/0361-Expand-FallingBlock-API.patch @@ -10,7 +10,7 @@ Subject: [PATCH] Expand FallingBlock API Co-authored-by: Lukas Planz diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index b191d304832fe3475b76fdce131db51e5042ac01..298e63e0ca9d4cbac3172fd93a217af79fad91df 100644 +index 86c7b4ba676f826344056b24b204b748cfce1580..0f60823426898974b7d61123fb848006fdc7bfcf 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -2220,8 +2220,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0364-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0362-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 100% rename from patches/api/0364-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/api/0362-Add-method-isTickingWorlds-to-Bukkit.patch diff --git a/patches/api/0365-Add-WardenAngerChangeEvent.patch b/patches/api/0363-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/api/0365-Add-WardenAngerChangeEvent.patch rename to patches/api/0363-Add-WardenAngerChangeEvent.patch diff --git a/patches/api/0366-Nameable-Banner-API.patch b/patches/api/0364-Nameable-Banner-API.patch similarity index 100% rename from patches/api/0366-Nameable-Banner-API.patch rename to patches/api/0364-Nameable-Banner-API.patch diff --git a/patches/api/0367-Add-Player-getFishHook.patch b/patches/api/0365-Add-Player-getFishHook.patch similarity index 100% rename from patches/api/0367-Add-Player-getFishHook.patch rename to patches/api/0365-Add-Player-getFishHook.patch diff --git a/patches/api/0368-More-Teleport-API.patch b/patches/api/0366-More-Teleport-API.patch similarity index 99% rename from patches/api/0368-More-Teleport-API.patch rename to patches/api/0366-More-Teleport-API.patch index c73ad9b950..13d70bb0fd 100644 --- a/patches/api/0368-More-Teleport-API.patch +++ b/patches/api/0366-More-Teleport-API.patch @@ -158,7 +158,7 @@ index 953bb49b7079647450d3453356d1c8a91be94c01..2ea66188468cf32bcaedc5167d4b9b0c * Teleports this entity to the given location. If this entity is riding a * vehicle, it will be dismounted prior to teleportation. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index d0eeb2c6b0f3f56d8c3c9608991091750a3bd607..aeaed639ba3a0b91501d1da837adfc6bf5517ffa 100644 +index e2333a5f8e357ada69ff8857d3b1c666f51ac909..da4d8d36fdf8006e308220cb7665c9e0302e5879 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3287,6 +3287,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0369-Add-EntityPortalReadyEvent.patch b/patches/api/0367-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/api/0369-Add-EntityPortalReadyEvent.patch rename to patches/api/0367-Add-EntityPortalReadyEvent.patch diff --git a/patches/api/0370-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0368-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/api/0370-Custom-Chat-Completion-Suggestions-API.patch rename to patches/api/0368-Custom-Chat-Completion-Suggestions-API.patch index 94a7f8f851..2ee1dccaba 100644 --- a/patches/api/0370-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/api/0368-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index aeaed639ba3a0b91501d1da837adfc6bf5517ffa..450ec166b8faf08de52b30844315a5ed29006784 100644 +index da4d8d36fdf8006e308220cb7665c9e0302e5879..541ac9cf8f4af2386a5c2930cbd8fa81a48d8445 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3171,6 +3171,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0371-Collision-API.patch b/patches/api/0369-Collision-API.patch similarity index 100% rename from patches/api/0371-Collision-API.patch rename to patches/api/0369-Collision-API.patch diff --git a/patches/api/0372-Block-Ticking-API.patch b/patches/api/0370-Block-Ticking-API.patch similarity index 100% rename from patches/api/0372-Block-Ticking-API.patch rename to patches/api/0370-Block-Ticking-API.patch diff --git a/patches/api/0373-Add-NamespacedKey-biome-methods.patch b/patches/api/0371-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/api/0373-Add-NamespacedKey-biome-methods.patch rename to patches/api/0371-Add-NamespacedKey-biome-methods.patch diff --git a/patches/api/0374-Also-load-resources-from-LibraryLoader.patch b/patches/api/0372-Also-load-resources-from-LibraryLoader.patch similarity index 100% rename from patches/api/0374-Also-load-resources-from-LibraryLoader.patch rename to patches/api/0372-Also-load-resources-from-LibraryLoader.patch diff --git a/patches/api/0375-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0373-Added-byte-array-serialization-deserialization-for-P.patch similarity index 95% rename from patches/api/0375-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/api/0373-Added-byte-array-serialization-deserialization-for-P.patch index 24c9f5c0f7..9b71f12681 100644 --- a/patches/api/0375-Added-byte-array-serialization-deserialization-for-P.patch +++ b/patches/api/0373-Added-byte-array-serialization-deserialization-for-P.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Added byte array serialization/deserialization for diff --git a/src/main/java/org/bukkit/persistence/PersistentDataContainer.java b/src/main/java/org/bukkit/persistence/PersistentDataContainer.java -index 6c156faf0148da13a44dabba7a807f68b3d50a36..da59e75267f43581bec6df73dda9f889347617d4 100644 +index 18fc4f1c7151bfdeed32a52cf5050a76ebc391d6..decf3b1949d4653a9fb01684b93ff91048137076 100644 --- a/src/main/java/org/bukkit/persistence/PersistentDataContainer.java +++ b/src/main/java/org/bukkit/persistence/PersistentDataContainer.java @@ -184,4 +184,39 @@ public interface PersistentDataContainer { diff --git a/patches/api/0376-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0374-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/api/0376-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/api/0374-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/api/0377-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0375-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 100% rename from patches/api/0377-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0375-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch diff --git a/patches/api/0378-Add-getDrops-to-BlockState.patch b/patches/api/0376-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/api/0378-Add-getDrops-to-BlockState.patch rename to patches/api/0376-Add-getDrops-to-BlockState.patch diff --git a/patches/api/0379-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0377-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/api/0379-Add-PlayerInventorySlotChangeEvent.patch rename to patches/api/0377-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/api/0380-Elder-Guardian-appearance-API.patch b/patches/api/0378-Elder-Guardian-appearance-API.patch similarity index 92% rename from patches/api/0380-Elder-Guardian-appearance-API.patch rename to patches/api/0378-Elder-Guardian-appearance-API.patch index afa279fc4a..ca75252378 100644 --- a/patches/api/0380-Elder-Guardian-appearance-API.patch +++ b/patches/api/0378-Elder-Guardian-appearance-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 450ec166b8faf08de52b30844315a5ed29006784..e00dabaf992580230e89292a2c2fea88c4de87fd 100644 +index 541ac9cf8f4af2386a5c2930cbd8fa81a48d8445..c79a3583ccbd808df6ca0ef2912bfed4f417c387 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3351,6 +3351,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0381-Allow-changing-bed-s-occupied-property.patch b/patches/api/0379-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/api/0381-Allow-changing-bed-s-occupied-property.patch rename to patches/api/0379-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/api/0382-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0380-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/api/0382-Add-EquipmentSlot-convenience-methods.patch rename to patches/api/0380-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/api/0383-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0381-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/api/0383-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/api/0381-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/api/0384-Add-entity-knockback-API.patch b/patches/api/0382-Add-entity-knockback-API.patch similarity index 100% rename from patches/api/0384-Add-entity-knockback-API.patch rename to patches/api/0382-Add-entity-knockback-API.patch diff --git a/patches/api/0385-Added-EntityToggleSitEvent.patch b/patches/api/0383-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/api/0385-Added-EntityToggleSitEvent.patch rename to patches/api/0383-Added-EntityToggleSitEvent.patch diff --git a/patches/api/0386-Add-Moving-Piston-API.patch b/patches/api/0384-Add-Moving-Piston-API.patch similarity index 100% rename from patches/api/0386-Add-Moving-Piston-API.patch rename to patches/api/0384-Add-Moving-Piston-API.patch diff --git a/patches/api/0387-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0385-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/api/0387-Add-PrePlayerAttackEntityEvent.patch rename to patches/api/0385-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/api/0388-Add-Player-Warden-Warning-API.patch b/patches/api/0386-Add-Player-Warden-Warning-API.patch similarity index 96% rename from patches/api/0388-Add-Player-Warden-Warning-API.patch rename to patches/api/0386-Add-Player-Warden-Warning-API.patch index 73ebc3306f..77e3620a98 100644 --- a/patches/api/0388-Add-Player-Warden-Warning-API.patch +++ b/patches/api/0386-Add-Player-Warden-Warning-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Player Warden Warning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e00dabaf992580230e89292a2c2fea88c4de87fd..0a3a29b5489684a4062663362694025cc3224adf 100644 +index c79a3583ccbd808df6ca0ef2912bfed4f417c387..5b1233ff2a5cdda75263eae86f96052bc28e9f5c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3367,6 +3367,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0389-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0387-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/api/0389-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/api/0387-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/api/0390-Add-paper-dumplisteners-command.patch b/patches/api/0388-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/api/0390-Add-paper-dumplisteners-command.patch rename to patches/api/0388-Add-paper-dumplisteners-command.patch diff --git a/patches/api/0391-ItemStack-damage-API.patch b/patches/api/0389-ItemStack-damage-API.patch similarity index 100% rename from patches/api/0391-ItemStack-damage-API.patch rename to patches/api/0389-ItemStack-damage-API.patch diff --git a/patches/api/0392-Add-Tick-TemporalUnit.patch b/patches/api/0390-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/api/0392-Add-Tick-TemporalUnit.patch rename to patches/api/0390-Add-Tick-TemporalUnit.patch diff --git a/patches/api/0393-Friction-API.patch b/patches/api/0391-Friction-API.patch similarity index 100% rename from patches/api/0393-Friction-API.patch rename to patches/api/0391-Friction-API.patch diff --git a/patches/api/0394-Player-Entity-Tracking-Events.patch b/patches/api/0392-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/api/0394-Player-Entity-Tracking-Events.patch rename to patches/api/0392-Player-Entity-Tracking-Events.patch diff --git a/patches/api/0395-Add-missing-Fluid-type.patch b/patches/api/0393-Add-missing-Fluid-type.patch similarity index 100% rename from patches/api/0395-Add-missing-Fluid-type.patch rename to patches/api/0393-Add-missing-Fluid-type.patch diff --git a/patches/api/0396-fix-Instruments.patch b/patches/api/0394-fix-Instruments.patch similarity index 100% rename from patches/api/0396-fix-Instruments.patch rename to patches/api/0394-fix-Instruments.patch diff --git a/patches/api/0397-Add-BlockLockCheckEvent.patch b/patches/api/0395-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/api/0397-Add-BlockLockCheckEvent.patch rename to patches/api/0395-Add-BlockLockCheckEvent.patch diff --git a/patches/api/0398-Add-Sneaking-API-for-Entities.patch b/patches/api/0396-Add-Sneaking-API-for-Entities.patch similarity index 95% rename from patches/api/0398-Add-Sneaking-API-for-Entities.patch rename to patches/api/0396-Add-Sneaking-API-for-Entities.patch index 0aab3c95d4..274d5fb7d6 100644 --- a/patches/api/0398-Add-Sneaking-API-for-Entities.patch +++ b/patches/api/0396-Add-Sneaking-API-for-Entities.patch @@ -35,7 +35,7 @@ index 351a7d0aeab5d83564dd543935ba503ea0b68d60..c9139bb7abc881fddd2d5610d9506cd4 * Get the category of spawn to which this entity belongs. * diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 53026b36fce2a201e81a844b115a274e9495928d..673036dbc9f4bd7b81747d6094bbfcab666cad09 100644 +index 5b1233ff2a5cdda75263eae86f96052bc28e9f5c..e6191168df1032f5904ce5c580c7e41fb1249b22 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -415,6 +415,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0399-Improve-PortalEvents.patch b/patches/api/0397-Improve-PortalEvents.patch similarity index 100% rename from patches/api/0399-Improve-PortalEvents.patch rename to patches/api/0397-Improve-PortalEvents.patch diff --git a/patches/api/0400-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/api/0398-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/api/0400-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/api/0398-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/api/0401-Flying-Fall-Damage-API.patch b/patches/api/0399-Flying-Fall-Damage-API.patch similarity index 93% rename from patches/api/0401-Flying-Fall-Damage-API.patch rename to patches/api/0399-Flying-Fall-Damage-API.patch index ea7650e655..8dd82b7749 100644 --- a/patches/api/0401-Flying-Fall-Damage-API.patch +++ b/patches/api/0399-Flying-Fall-Damage-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 673036dbc9f4bd7b81747d6094bbfcab666cad09..fae33e170dd8155df94b9e7c3f277389ac366a5e 100644 +index e6191168df1032f5904ce5c580c7e41fb1249b22..a5ab59f2defa45af761a14fc955241af07b84a34 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1766,6 +1766,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0402-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/api/0400-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/api/0402-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/api/0400-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/api/0403-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0401-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch similarity index 100% rename from patches/api/0403-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch rename to patches/api/0401-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch diff --git a/patches/api/0404-Win-Screen-API.patch b/patches/api/0402-Win-Screen-API.patch similarity index 96% rename from patches/api/0404-Win-Screen-API.patch rename to patches/api/0402-Win-Screen-API.patch index 059965c688..0d24c598b0 100644 --- a/patches/api/0404-Win-Screen-API.patch +++ b/patches/api/0402-Win-Screen-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Win Screen API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index fae33e170dd8155df94b9e7c3f277389ac366a5e..12ac53a8ca8d91b8189dbb8775121b89f402de43 100644 +index a5ab59f2defa45af761a14fc955241af07b84a34..41e7e24c65c3ae8cb451608db7598297fd9ffff2 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1136,6 +1136,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0405-Add-Entity-Body-Yaw-API.patch b/patches/api/0403-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/api/0405-Add-Entity-Body-Yaw-API.patch rename to patches/api/0403-Add-Entity-Body-Yaw-API.patch diff --git a/patches/api/0406-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0404-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch similarity index 100% rename from patches/api/0406-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch rename to patches/api/0404-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch diff --git a/patches/api/0407-Add-EntityFertilizeEggEvent.patch b/patches/api/0405-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/api/0407-Add-EntityFertilizeEggEvent.patch rename to patches/api/0405-Add-EntityFertilizeEggEvent.patch diff --git a/patches/api/0408-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0406-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/api/0408-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/api/0406-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/api/0409-Add-Shearable-API.patch b/patches/api/0407-Add-Shearable-API.patch similarity index 100% rename from patches/api/0409-Add-Shearable-API.patch rename to patches/api/0407-Add-Shearable-API.patch diff --git a/patches/api/0410-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0408-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/api/0410-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/api/0408-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/api/0411-Add-Mob-Experience-reward-API.patch b/patches/api/0409-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/api/0411-Add-Mob-Experience-reward-API.patch rename to patches/api/0409-Add-Mob-Experience-reward-API.patch diff --git a/patches/api/0412-Expand-PlayerItemMendEvent.patch b/patches/api/0410-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/api/0412-Expand-PlayerItemMendEvent.patch rename to patches/api/0410-Expand-PlayerItemMendEvent.patch diff --git a/patches/api/0413-Add-transient-modifier-API.patch b/patches/api/0411-Add-transient-modifier-API.patch similarity index 100% rename from patches/api/0413-Add-transient-modifier-API.patch rename to patches/api/0411-Add-transient-modifier-API.patch diff --git a/patches/api/0414-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0412-Properly-remove-the-experimental-smithing-inventory-.patch similarity index 100% rename from patches/api/0414-Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/api/0412-Properly-remove-the-experimental-smithing-inventory-.patch diff --git a/patches/api/0415-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0413-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/api/0415-Add-method-to-remove-all-active-potion-effects.patch rename to patches/api/0413-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/api/0416-Folia-scheduler-and-owned-region-API.patch b/patches/api/0414-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/api/0416-Folia-scheduler-and-owned-region-API.patch rename to patches/api/0414-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/api/0417-Add-event-for-player-editing-sign.patch b/patches/api/0415-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/api/0417-Add-event-for-player-editing-sign.patch rename to patches/api/0415-Add-event-for-player-editing-sign.patch diff --git a/patches/api/0418-Add-Sign-getInteractableSideFor.patch b/patches/api/0416-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/api/0418-Add-Sign-getInteractableSideFor.patch rename to patches/api/0416-Add-Sign-getInteractableSideFor.patch diff --git a/patches/api/0419-Fix-BanList-API.patch b/patches/api/0417-Fix-BanList-API.patch similarity index 98% rename from patches/api/0419-Fix-BanList-API.patch rename to patches/api/0417-Fix-BanList-API.patch index 190177a822..e6e242f0d1 100644 --- a/patches/api/0419-Fix-BanList-API.patch +++ b/patches/api/0417-Fix-BanList-API.patch @@ -130,7 +130,7 @@ index e805e629cede1c4c0674282c930cb67852718c3e..5248cf08ef83c7304dd76c42a2f646bb + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 12ac53a8ca8d91b8189dbb8775121b89f402de43..a948445b96a7c8c7803103171df644fc9a6f77f3 100644 +index 41e7e24c65c3ae8cb451608db7598297fd9ffff2..5b00c51157a724e1d3f89198e97ba7e33b3a163d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -299,7 +299,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0420-Add-whitelist-events.patch b/patches/api/0418-Add-whitelist-events.patch similarity index 100% rename from patches/api/0420-Add-whitelist-events.patch rename to patches/api/0418-Add-whitelist-events.patch diff --git a/patches/api/0421-API-for-updating-recipes-on-clients.patch b/patches/api/0419-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/api/0421-API-for-updating-recipes-on-clients.patch rename to patches/api/0419-API-for-updating-recipes-on-clients.patch diff --git a/patches/api/0422-Add-PlayerFailMoveEvent.patch b/patches/api/0420-Add-PlayerFailMoveEvent.patch similarity index 100% rename from patches/api/0422-Add-PlayerFailMoveEvent.patch rename to patches/api/0420-Add-PlayerFailMoveEvent.patch diff --git a/patches/api/0423-Fix-custom-statistic-criteria-creation.patch b/patches/api/0421-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/api/0423-Fix-custom-statistic-criteria-creation.patch rename to patches/api/0421-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/api/0424-SculkCatalyst-bloom-API.patch b/patches/api/0422-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/api/0424-SculkCatalyst-bloom-API.patch rename to patches/api/0422-SculkCatalyst-bloom-API.patch diff --git a/patches/api/0425-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0423-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/api/0425-API-for-an-entity-s-scoreboard-name.patch rename to patches/api/0423-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/api/0426-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0424-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/api/0426-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/api/0424-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/api/0427-Add-Listing-API-for-Player.patch b/patches/api/0425-Add-Listing-API-for-Player.patch similarity index 93% rename from patches/api/0427-Add-Listing-API-for-Player.patch rename to patches/api/0425-Add-Listing-API-for-Player.patch index 1273b6fb85..6029b9a632 100644 --- a/patches/api/0427-Add-Listing-API-for-Player.patch +++ b/patches/api/0425-Add-Listing-API-for-Player.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Listing API for Player diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a948445b96a7c8c7803103171df644fc9a6f77f3..0909c7d1dae6192e3103f4eaeb08bf3efbbd4153 100644 +index 5b00c51157a724e1d3f89198e97ba7e33b3a163d..8ca61bca18c5520d20b0405d5add37759349560b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1902,6 +1902,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0428-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0426-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/api/0428-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/api/0426-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/api/0429-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0427-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/api/0429-Fix-NPE-on-Boat-getStatus.patch rename to patches/api/0427-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/api/0430-Expand-Pose-API.patch b/patches/api/0428-Expand-Pose-API.patch similarity index 100% rename from patches/api/0430-Expand-Pose-API.patch rename to patches/api/0428-Expand-Pose-API.patch diff --git a/patches/api/0431-MerchantRecipe-add-copy-constructor.patch b/patches/api/0429-MerchantRecipe-add-copy-constructor.patch similarity index 100% rename from patches/api/0431-MerchantRecipe-add-copy-constructor.patch rename to patches/api/0429-MerchantRecipe-add-copy-constructor.patch diff --git a/patches/api/0432-More-DragonBattle-API.patch b/patches/api/0430-More-DragonBattle-API.patch similarity index 100% rename from patches/api/0432-More-DragonBattle-API.patch rename to patches/api/0430-More-DragonBattle-API.patch diff --git a/patches/api/0433-Add-PlayerPickItemEvent.patch b/patches/api/0431-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/api/0433-Add-PlayerPickItemEvent.patch rename to patches/api/0431-Add-PlayerPickItemEvent.patch diff --git a/patches/api/0434-Allow-trident-custom-damage.patch b/patches/api/0432-Allow-trident-custom-damage.patch similarity index 100% rename from patches/api/0434-Allow-trident-custom-damage.patch rename to patches/api/0432-Allow-trident-custom-damage.patch diff --git a/patches/api/0435-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0433-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/api/0435-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/api/0433-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/api/0436-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0434-Limit-setBurnTime-to-valid-short-values.patch similarity index 100% rename from patches/api/0436-Limit-setBurnTime-to-valid-short-values.patch rename to patches/api/0434-Limit-setBurnTime-to-valid-short-values.patch diff --git a/patches/api/0437-Add-OfflinePlayer-isConnected.patch b/patches/api/0435-Add-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/api/0437-Add-OfflinePlayer-isConnected.patch rename to patches/api/0435-Add-OfflinePlayer-isConnected.patch diff --git a/patches/api/0438-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0436-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/api/0438-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/api/0436-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/api/0439-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0437-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/api/0439-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/api/0437-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/api/0440-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0438-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch similarity index 100% rename from patches/api/0440-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch rename to patches/api/0438-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch diff --git a/patches/api/0441-Add-player-idle-duration-API.patch b/patches/api/0439-Add-player-idle-duration-API.patch similarity index 93% rename from patches/api/0441-Add-player-idle-duration-API.patch rename to patches/api/0439-Add-player-idle-duration-API.patch index 8ebed078d4..dbe78e032c 100644 --- a/patches/api/0441-Add-player-idle-duration-API.patch +++ b/patches/api/0439-Add-player-idle-duration-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API Implements API for getting and resetting a player's idle duration. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 118ecb48f014539f18105a20bdebe2e03ee8e6f8..9f8d0242c00008432012319a95453a25c5ef761e 100644 +index 8ca61bca18c5520d20b0405d5add37759349560b..c09f423fe2a029c933bd2697c8ff104fc4230cf0 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3508,6 +3508,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0440-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/api/0442-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/api/0440-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/api/0443-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0441-Add-predicate-for-blocks-when-raytracing.patch similarity index 98% rename from patches/api/0443-Add-predicate-for-blocks-when-raytracing.patch rename to patches/api/0441-Add-predicate-for-blocks-when-raytracing.patch index 04fc2e3ab9..2d0f899ec0 100644 --- a/patches/api/0443-Add-predicate-for-blocks-when-raytracing.patch +++ b/patches/api/0441-Add-predicate-for-blocks-when-raytracing.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add predicate for blocks when raytracing diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 298e63e0ca9d4cbac3172fd93a217af79fad91df..f72f0f0f8eee95f95adc969d55ba7de82ee30e2a 100644 +index 0f60823426898974b7d61123fb848006fdc7bfcf..e014a71f2fd20e41f985ce68301006c4a4e0c5e3 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1692,6 +1692,27 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0444-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0442-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/api/0444-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/api/0442-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/api/0445-Add-UUID-attribute-modifier-API.patch b/patches/api/0443-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/api/0445-Add-UUID-attribute-modifier-API.patch rename to patches/api/0443-Add-UUID-attribute-modifier-API.patch diff --git a/patches/api/0446-Expand-LingeringPotion-API.patch b/patches/api/0444-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/api/0446-Expand-LingeringPotion-API.patch rename to patches/api/0444-Expand-LingeringPotion-API.patch diff --git a/patches/api/0447-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0445-Remove-unnecessary-durability-check-in-ItemStack-isS.patch similarity index 100% rename from patches/api/0447-Remove-unnecessary-durability-check-in-ItemStack-isS.patch rename to patches/api/0445-Remove-unnecessary-durability-check-in-ItemStack-isS.patch diff --git a/patches/api/0448-Add-Structure-check-API.patch b/patches/api/0446-Add-Structure-check-API.patch similarity index 94% rename from patches/api/0448-Add-Structure-check-API.patch rename to patches/api/0446-Add-Structure-check-API.patch index d6d4ff6970..d993eeba7f 100644 --- a/patches/api/0448-Add-Structure-check-API.patch +++ b/patches/api/0446-Add-Structure-check-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index f72f0f0f8eee95f95adc969d55ba7de82ee30e2a..567a36a4887da8994c9170e2885aa8cc357efa0c 100644 +index e014a71f2fd20e41f985ce68301006c4a4e0c5e3..bf4b94ea2577e9d7e344385209fc0644a4e6bfbb 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -76,6 +76,30 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0449-add-missing-Experimental-annotations.patch b/patches/api/0447-add-missing-Experimental-annotations.patch similarity index 100% rename from patches/api/0449-add-missing-Experimental-annotations.patch rename to patches/api/0447-add-missing-Experimental-annotations.patch diff --git a/patches/api/0450-Add-more-scoreboard-API.patch b/patches/api/0448-Add-more-scoreboard-API.patch similarity index 100% rename from patches/api/0450-Add-more-scoreboard-API.patch rename to patches/api/0448-Add-more-scoreboard-API.patch diff --git a/patches/api/0451-Improve-Registry.patch b/patches/api/0449-Improve-Registry.patch similarity index 100% rename from patches/api/0451-Improve-Registry.patch rename to patches/api/0449-Improve-Registry.patch diff --git a/patches/api/0452-Add-experience-points-API.patch b/patches/api/0450-Add-experience-points-API.patch similarity index 100% rename from patches/api/0452-Add-experience-points-API.patch rename to patches/api/0450-Add-experience-points-API.patch diff --git a/patches/api/0453-Add-missing-InventoryType.patch b/patches/api/0451-Add-missing-InventoryType.patch similarity index 100% rename from patches/api/0453-Add-missing-InventoryType.patch rename to patches/api/0451-Add-missing-InventoryType.patch diff --git a/patches/api/0454-Add-drops-to-shear-events.patch b/patches/api/0452-Add-drops-to-shear-events.patch similarity index 100% rename from patches/api/0454-Add-drops-to-shear-events.patch rename to patches/api/0452-Add-drops-to-shear-events.patch diff --git a/patches/api/0455-Add-HiddenPotionEffect-API.patch b/patches/api/0453-Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/api/0455-Add-HiddenPotionEffect-API.patch rename to patches/api/0453-Add-HiddenPotionEffect-API.patch diff --git a/patches/api/0456-Add-PlayerShieldDisableEvent.patch b/patches/api/0454-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/api/0456-Add-PlayerShieldDisableEvent.patch rename to patches/api/0454-Add-PlayerShieldDisableEvent.patch diff --git a/patches/api/0457-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0455-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch similarity index 100% rename from patches/api/0457-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch rename to patches/api/0455-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch diff --git a/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch deleted file mode 100644 index d77acd59c5..0000000000 --- a/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Sun, 18 Mar 2018 11:45:57 -0400 -Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent - -This will allow you to change the players name or skin on login. - -diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 000e5e6085b95e4fc4995e53dc83d9075e27aa05..08a40d2418dc7e3f481a0a45e0c1845d68a74f07 100644 ---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -@@ -293,8 +293,16 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, - java.util.UUID uniqueId = gameprofile.getId(); - final org.bukkit.craftbukkit.CraftServer server = ServerLoginPacketListenerImpl.this.server.server; - -- AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId); -+ // Paper start -+ com.destroystokyo.paper.profile.PlayerProfile profile = org.bukkit.Bukkit.createProfile(uniqueId, playerName); -+ AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId, profile); - server.getPluginManager().callEvent(asyncEvent); -+ profile = asyncEvent.getPlayerProfile(); -+ profile.complete(); -+ gameprofile = com.destroystokyo.paper.profile.CraftPlayerProfile.asAuthlibCopy(profile); -+ playerName = gameprofile.getName(); -+ uniqueId = gameprofile.getId(); -+ // Paper end - - if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) { - final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId); diff --git a/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch new file mode 100644 index 0000000000..d56e4c78c9 --- /dev/null +++ b/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch @@ -0,0 +1,72 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Sun, 18 Mar 2018 11:45:57 -0400 +Subject: [PATCH] Add more fields to AsyncPreLoginEvent + +Co-authored-by: Connor Linfoot +Co-authored-by: MCMDEV + +diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +index 000e5e6085b95e4fc4995e53dc83d9075e27aa05..58d97fce07ad8f786940c3f5e74e9aaeabe8d261 100644 +--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java ++++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +@@ -157,7 +157,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, + try { + GameProfile gameprofile = ServerLoginPacketListenerImpl.this.createOfflineProfile(ServerLoginPacketListenerImpl.this.requestedUsername); // Spigot + +- ServerLoginPacketListenerImpl.this.callPlayerPreLoginEvents(gameprofile); ++ gameprofile = ServerLoginPacketListenerImpl.this.callPlayerPreLoginEvents(gameprofile); // Paper - Add more fields to AsyncPlayerPreLoginEvent + ServerLoginPacketListenerImpl.LOGGER.info("UUID of player {} is {}", gameprofile.getName(), gameprofile.getId()); + ServerLoginPacketListenerImpl.this.startClientVerification(gameprofile); + } catch (Exception ex) { +@@ -248,7 +248,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, + if (!ServerLoginPacketListenerImpl.this.connection.isConnected()) { + return; + } +- ServerLoginPacketListenerImpl.this.callPlayerPreLoginEvents(gameprofile); ++ gameprofile = ServerLoginPacketListenerImpl.this.callPlayerPreLoginEvents(gameprofile); // Paper - Add more fields to AsyncPlayerPreLoginEvent + // CraftBukkit end + ServerLoginPacketListenerImpl.LOGGER.info("UUID of player {} is {}", gameprofile.getName(), gameprofile.getId()); + ServerLoginPacketListenerImpl.this.startClientVerification(gameprofile); +@@ -287,14 +287,23 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, + } + + // CraftBukkit start +- private void callPlayerPreLoginEvents(GameProfile gameprofile) throws Exception { ++ private GameProfile callPlayerPreLoginEvents(GameProfile gameprofile) throws Exception { // Paper - Add more fields to AsyncPlayerPreLoginEvent + String playerName = gameprofile.getName(); + java.net.InetAddress address = ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getAddress(); + java.util.UUID uniqueId = gameprofile.getId(); + final org.bukkit.craftbukkit.CraftServer server = ServerLoginPacketListenerImpl.this.server.server; + +- AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId); ++ // Paper start - Add more fields to AsyncPlayerPreLoginEvent ++ final java.net.InetAddress rawAddress = ((java.net.InetSocketAddress) this.connection.channel.remoteAddress()).getAddress(); ++ com.destroystokyo.paper.profile.PlayerProfile profile = org.bukkit.Bukkit.createProfile(uniqueId, playerName); ++ AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, rawAddress, uniqueId, profile, this.connection.hostname); + server.getPluginManager().callEvent(asyncEvent); ++ profile = asyncEvent.getPlayerProfile(); ++ profile.complete(); ++ gameprofile = com.destroystokyo.paper.profile.CraftPlayerProfile.asAuthlibCopy(profile); ++ playerName = gameprofile.getName(); ++ uniqueId = gameprofile.getId(); ++ // Paper end - Add more fields to AsyncPlayerPreLoginEvent + + if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) { + final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId); +@@ -312,14 +321,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, + ServerLoginPacketListenerImpl.this.server.processQueue.add(waitable); + if (waitable.get() != PlayerPreLoginEvent.Result.ALLOWED) { + this.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.kickMessage())); // Paper - Adventure +- return; + } + } else { + if (asyncEvent.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) { + this.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(asyncEvent.kickMessage())); // Paper - Adventure +- return; + } + } ++ return gameprofile; // Paper - Add more fields to AsyncPlayerPreLoginEvent + } + // CraftBukkit end + diff --git a/patches/server/0180-Player.setPlayerProfile-API.patch b/patches/server/0180-Player.setPlayerProfile-API.patch index 7608558483..cce5e09728 100644 --- a/patches/server/0180-Player.setPlayerProfile-API.patch +++ b/patches/server/0180-Player.setPlayerProfile-API.patch @@ -22,16 +22,11 @@ index 9c0440a6e3768ca6300e128da7f1b11a96f10f91..c1c9076be05cd4b0b19d16aabbf0320c if (Float.isNaN(f)) { f = 0; diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 08a40d2418dc7e3f481a0a45e0c1845d68a74f07..3a250865ed364cdcd6f75e874c218b259b1aaad5 100644 +index 58d97fce07ad8f786940c3f5e74e9aaeabe8d261..fd2a8959e9a929ae7ea17dcb554591a6e2b1ac92 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -@@ -294,11 +294,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, - final org.bukkit.craftbukkit.CraftServer server = ServerLoginPacketListenerImpl.this.server.server; - - // Paper start -- com.destroystokyo.paper.profile.PlayerProfile profile = org.bukkit.Bukkit.createProfile(uniqueId, playerName); -+ com.destroystokyo.paper.profile.PlayerProfile profile = com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitMirror(gameprofile); - AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId, profile); +@@ -299,7 +299,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, + AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, rawAddress, uniqueId, profile, this.connection.hostname); server.getPluginManager().callEvent(asyncEvent); profile = asyncEvent.getPlayerProfile(); - profile.complete(); diff --git a/patches/server/0585-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0585-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch deleted file mode 100644 index 2a75ad4204..0000000000 --- a/patches/server/0585-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Connor Linfoot -Date: Wed, 12 May 2021 08:09:19 +0100 -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 70e89b77e99846258aae59de6246f82cff312452..b1b778c534fae23294b95b084fac0f52f94c37c2 100644 ---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -@@ -290,12 +290,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, - private void callPlayerPreLoginEvents(GameProfile gameprofile) throws Exception { - String playerName = gameprofile.getName(); - java.net.InetAddress address = ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getAddress(); -+ java.net.InetAddress rawAddress = ((java.net.InetSocketAddress) this.connection.channel.remoteAddress()).getAddress(); // Paper - java.util.UUID uniqueId = gameprofile.getId(); - final org.bukkit.craftbukkit.CraftServer server = ServerLoginPacketListenerImpl.this.server.server; - - // Paper start - com.destroystokyo.paper.profile.PlayerProfile profile = com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitMirror(gameprofile); -- AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, uniqueId, profile); -+ AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, rawAddress, uniqueId, profile); // Paper - add rawAddress - server.getPluginManager().callEvent(asyncEvent); - profile = asyncEvent.getPlayerProfile(); - profile.complete(true); // Paper - setPlayerProfileAPI diff --git a/patches/server/0586-Inventory-close.patch b/patches/server/0585-Inventory-close.patch similarity index 100% rename from patches/server/0586-Inventory-close.patch rename to patches/server/0585-Inventory-close.patch diff --git a/patches/server/0587-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0586-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0587-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0586-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0588-Add-basic-Datapack-API.patch b/patches/server/0587-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0588-Add-basic-Datapack-API.patch rename to patches/server/0587-Add-basic-Datapack-API.patch diff --git a/patches/server/0589-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0588-Add-environment-variable-to-disable-server-gui.patch similarity index 90% rename from patches/server/0589-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0588-Add-environment-variable-to-disable-server-gui.patch index 0e06008d89..f143fe1787 100644 --- a/patches/server/0589-Add-environment-variable-to-disable-server-gui.patch +++ b/patches/server/0588-Add-environment-variable-to-disable-server-gui.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add environment variable to disable server gui diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 0cb453b03977e90addc26f71d0518f134af3c36a..444b21bbc596ce79007560bfb0a4008ccab1dab8 100644 +index 1c64c81980739bbf09b71e1d1dd6d86dbf924e0d..415d55285bb02442d8d1ec907d37b07fad4f3fcc 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -326,6 +326,7 @@ public class Main { diff --git a/patches/server/0590-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0589-additions-to-PlayerGameModeChangeEvent.patch similarity index 98% rename from patches/server/0590-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0589-additions-to-PlayerGameModeChangeEvent.patch index 29e14396aa..1323b067ea 100644 --- a/patches/server/0590-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0589-additions-to-PlayerGameModeChangeEvent.patch @@ -45,7 +45,7 @@ index aee8618e27b893b72931e925724dd683d2e6d2aa..5cb15e2209d7b315904a1fc6d650ce1e } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9db7bfe3782e96921e3a65ed60f4494770210d5a..48a5fda8d59e8a13bcca61e21c7cb1358c2d17a2 100644 +index 33477a639304c1491b5eea8585051e266ec93bc7..8766c1a6485b371c1d95804d7ad364fd5ba826de 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1989,8 +1989,16 @@ public class ServerPlayer extends Player { @@ -131,7 +131,7 @@ index c61754976fab6654f55b1403d769eb1721871dca..236dabc1d4ae9dc9a2a2c07a4a27fc0b } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 60945de12bf3b7068da9897d3af778f4f8577134..7223e30011defb34db176408e528025eef96be07 100644 +index 206c0a1e783699ed272e3640a29fe349eb0b465e..4ea889c12a6750914b82d796ed641cdd810ea957 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2653,7 +2653,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0591-ItemStack-repair-check-API.patch b/patches/server/0590-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0591-ItemStack-repair-check-API.patch rename to patches/server/0590-ItemStack-repair-check-API.patch diff --git a/patches/server/0592-More-Enchantment-API.patch b/patches/server/0591-More-Enchantment-API.patch similarity index 100% rename from patches/server/0592-More-Enchantment-API.patch rename to patches/server/0591-More-Enchantment-API.patch diff --git a/patches/server/0593-Move-range-check-for-block-placing-up.patch b/patches/server/0592-Move-range-check-for-block-placing-up.patch similarity index 92% rename from patches/server/0593-Move-range-check-for-block-placing-up.patch rename to patches/server/0592-Move-range-check-for-block-placing-up.patch index 397ec7b4ec..e2caddd0a7 100644 --- a/patches/server/0593-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0592-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3a7592f022a5fdd90a525d84502b450c08409cf1..808b000b43c6099bb4d1a0ea3041ec221ce3e6bb 100644 +index 4ea889c12a6750914b82d796ed641cdd810ea957..4d3452fb5cf9330e87d914f775c1a8e0c955a571 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1743,6 +1743,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0594-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0593-Fix-and-optimise-world-force-upgrading.patch similarity index 97% rename from patches/server/0594-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0593-Fix-and-optimise-world-force-upgrading.patch index e7c3e4464c..948e820991 100644 --- a/patches/server/0594-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0593-Fix-and-optimise-world-force-upgrading.patch @@ -247,7 +247,7 @@ index 0000000000000000000000000000000000000000..513833c2ea23df5b079d157bc5cb89d5 + } +} diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 444b21bbc596ce79007560bfb0a4008ccab1dab8..62f4c2c9485f7700a46f33cf9d158ce3d0552185 100644 +index 415d55285bb02442d8d1ec907d37b07fad4f3fcc..9b0bbaf23b90a04b6e6f6c97d9174fe31af557ce 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -385,6 +385,15 @@ public class Main { @@ -267,7 +267,7 @@ index 444b21bbc596ce79007560bfb0a4008ccab1dab8..62f4c2c9485f7700a46f33cf9d158ce3 Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, dimensionOptionsRegistry, eraseCache); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 36ca381445102fee1960410aa56e8b2a28dca615..8937b71511bc1dce082683b4107d52e0e632e7a2 100644 +index fbfe5d18a004225396f2d33084fb5073af2d9731..2acd875f34c367f9b9db85dee5052140c05d0add 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -586,11 +586,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Reviewed-by: Mariell Hoversholm diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 8f9ea1907ed4574cca8d362a0f207fb546cb6484..0008e63e96841c48fa039001f282ffa70c88494f 100644 +index f9e39f557f04269769b869ff24127a6f312ddec3..a8621519c2fec415c8d56c3510b0780b6ccd9eeb 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -93,7 +93,7 @@ index 6641fd04821240b1bbeff1bd8d996a8f2fff8385..5f625acf04ddb56e3596d086252f9bfc } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 089f4670aec8612b1e0e9cc69d785dcd135dc44a..294074cb4cac5089b57f3629f46d71175911a906 100644 +index 4d3452fb5cf9330e87d914f775c1a8e0c955a571..4d23d019173d0921145338544e190bc34f9f45c2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2476,6 +2476,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0597-Add-EntityInsideBlockEvent.patch b/patches/server/0596-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0597-Add-EntityInsideBlockEvent.patch rename to patches/server/0596-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0598-Attributes-API-for-item-defaults.patch b/patches/server/0597-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0598-Attributes-API-for-item-defaults.patch rename to patches/server/0597-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0599-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0598-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 97% rename from patches/server/0599-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0598-Add-cause-to-Weather-ThunderChangeEvents.patch index 7dd8dcb77a..3c2e6af4c6 100644 --- a/patches/server/0599-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0598-Add-cause-to-Weather-ThunderChangeEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7b1374c8ee66c58fe6bd25173966d62e8971e3e4..e00fe39fbcd4aa54eb498b91783b7e4dd021acc0 100644 +index a3288d3cd160978e8bab4ca34d1fe6dbee042e28..8b2f72be4304ebab84fc46e6c4c0984abd8e8905 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -672,8 +672,8 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -95,7 +95,7 @@ index f5ac36fa54f3d3b39de103c95abb9ca3adfe8dda..47266d2b86e7f2022de7ea0c9347b4f5 if (weather.isCancelled()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6ab03cc55658789baedf5374ebb9c0a6c0187826..7612ceb9ac9dedeaaade51ba4cac3f35c010da4b 100644 +index 43d3c45cd7a178a4ca30e4c0c7fb1e7e21cd89f1..e88b42727ba0b87ba01933116b6ef456203d9dbb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1243,7 +1243,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0600-More-Lidded-Block-API.patch b/patches/server/0599-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0600-More-Lidded-Block-API.patch rename to patches/server/0599-More-Lidded-Block-API.patch diff --git a/patches/server/0601-Limit-item-frame-cursors-on-maps.patch b/patches/server/0600-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0601-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0600-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0602-Add-PlayerKickEvent-causes.patch b/patches/server/0601-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0602-Add-PlayerKickEvent-causes.patch rename to patches/server/0601-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0603-Add-PufferFishStateChangeEvent.patch b/patches/server/0602-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0603-Add-PufferFishStateChangeEvent.patch rename to patches/server/0602-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0604-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0603-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0604-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0603-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0605-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0604-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0605-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0604-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0606-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0605-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0606-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0605-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0607-Add-BellRevealRaiderEvent.patch b/patches/server/0606-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0607-Add-BellRevealRaiderEvent.patch rename to patches/server/0606-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0608-Fix-invulnerable-end-crystals.patch b/patches/server/0607-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0608-Fix-invulnerable-end-crystals.patch rename to patches/server/0607-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0609-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0608-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0609-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0608-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0610-Fix-dangerous-end-portal-logic.patch b/patches/server/0609-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0610-Fix-dangerous-end-portal-logic.patch rename to patches/server/0609-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0611-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0610-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0611-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0610-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0612-Make-item-validations-configurable.patch b/patches/server/0611-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0612-Make-item-validations-configurable.patch rename to patches/server/0611-Make-item-validations-configurable.patch diff --git a/patches/server/0613-Line-Of-Sight-Changes.patch b/patches/server/0612-Line-Of-Sight-Changes.patch similarity index 97% rename from patches/server/0613-Line-Of-Sight-Changes.patch rename to patches/server/0612-Line-Of-Sight-Changes.patch index 810215b75d..7dc4e57a02 100644 --- a/patches/server/0613-Line-Of-Sight-Changes.patch +++ b/patches/server/0612-Line-Of-Sight-Changes.patch @@ -19,7 +19,7 @@ index 383c39ac381f9a86693abb7935b5b142b889d7be..ca6e0f27b9d0c5d867909abd89262132 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 2667822413c329fc004aad826e5890ab4dc5bfeb..eeb1bd05d4407224aefa26b5ae2f2a8da1101b31 100644 +index 9cd267f53505658d1c75187b662c4d9f68cd6bae..5f4958d28b6d79fe9e589e4794d9a7e8ab67c8b3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -510,5 +510,21 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0614-add-per-world-spawn-limits.patch b/patches/server/0613-add-per-world-spawn-limits.patch similarity index 91% rename from patches/server/0614-add-per-world-spawn-limits.patch rename to patches/server/0613-add-per-world-spawn-limits.patch index b03a6ab08e..c70252598b 100644 --- a/patches/server/0614-add-per-world-spawn-limits.patch +++ b/patches/server/0613-add-per-world-spawn-limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits Taken from #2982. Credit to Chasewhip8 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index bc2c56b0a3ea8e9107c3ef798bb058ae1ff41652..6c91471b5459ca45b532934d25c682ddc5b00042 100644 +index e88b42727ba0b87ba01933116b6ef456203d9dbb..a920936018a2e05ea72d68a83e6debb3807df353 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -215,6 +215,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0615-Fix-potions-splash-events.patch b/patches/server/0614-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0615-Fix-potions-splash-events.patch rename to patches/server/0614-Fix-potions-splash-events.patch diff --git a/patches/server/0616-Add-more-LimitedRegion-API.patch b/patches/server/0615-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0616-Add-more-LimitedRegion-API.patch rename to patches/server/0615-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0617-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0616-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 94% rename from patches/server/0617-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0616-Fix-PlayerDropItemEvent-using-wrong-item.patch index 8cf564db7f..b41a629e54 100644 --- a/patches/server/0617-Fix-PlayerDropItemEvent-using-wrong-item.patch +++ b/patches/server/0616-Fix-PlayerDropItemEvent-using-wrong-item.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 48a5fda8d59e8a13bcca61e21c7cb1358c2d17a2..bb44d07bdffcf077dae3c5c2aef2aa87a77bb264 100644 +index 8766c1a6485b371c1d95804d7ad364fd5ba826de..76eb668311d2aa2659adf4f7857a670d81387830 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2391,7 +2391,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0618-Missing-Entity-API.patch b/patches/server/0617-Missing-Entity-API.patch similarity index 99% rename from patches/server/0618-Missing-Entity-API.patch rename to patches/server/0617-Missing-Entity-API.patch index b014179c90..4cbbbf5a03 100644 --- a/patches/server/0618-Missing-Entity-API.patch +++ b/patches/server/0617-Missing-Entity-API.patch @@ -257,7 +257,7 @@ index edbb933d1f6f7fc6432f7a8b074c5dc20f47adfb..91fb62807b3c5600c83d4dc8d3fadf36 public Llama(EntityType type, Level world) { super(type, world); diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 29b603f5d361fdfb4dd0d20b7e77a29a920f6961..32b69b09ba2ee63e393aa6b4b6a142aaca6819a1 100644 +index 14b09adeb9222600c24f3fb846ea8aee467952e6..8241dbf7591b2f56b25cdc3ce9009c7133d2e4ef 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -84,6 +84,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob @@ -942,7 +942,7 @@ index 9304e201db1ec96d0916aa8ea781f3e4bc7991e6..8338effd39b1709dbe578e247710a8e5 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java -index 8b9695de6e3411cbcc2f97e4a4e243ec1d1dd076..03e74b29ebf0f9b9a0dbc6ffc872e22a22be20f0 100644 +index f5ecb8c1dc92e5a4b123effd2859123b17a586d3..5124a383b60b2c8de89fa992547d0c61db760c21 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java @@ -84,4 +84,37 @@ public class CraftPiglin extends CraftPiglinAbstract implements Piglin, com.dest diff --git a/patches/server/0619-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0618-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 92% rename from patches/server/0619-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0618-Ensure-disconnect-for-book-edit-is-called-on-main.patch index efc0788640..0e9946cfe0 100644 --- a/patches/server/0619-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/server/0618-Ensure-disconnect-for-book-edit-is-called-on-main.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5382fc27e4f0147cae32c2ee2959428d28ab9265..4440c872aaf0a708de5c561f46ababadef95d900 100644 +index 1a85755ad62498c263783d1d54130d023105ec8d..fe969ecdca0e93319449f2fe3c3f41b4e17b385e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1099,7 +1099,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0620-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0619-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0620-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0619-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0621-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0620-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0621-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0620-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0622-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0621-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0622-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0621-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0623-Adds-PlayerArmSwingEvent.patch b/patches/server/0622-Adds-PlayerArmSwingEvent.patch similarity index 93% rename from patches/server/0623-Adds-PlayerArmSwingEvent.patch rename to patches/server/0622-Adds-PlayerArmSwingEvent.patch index 1f1f4f77f0..f2f4cf9cd1 100644 --- a/patches/server/0623-Adds-PlayerArmSwingEvent.patch +++ b/patches/server/0622-Adds-PlayerArmSwingEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3ed491afc47273cb8d648ff527c81d968a1a3833..8e229a43a5b6042597532419cf6e63439a94d4f9 100644 +index fe969ecdca0e93319449f2fe3c3f41b4e17b385e..da21fdec10a10e4dcec3b0cadb72fa82ef56e4b4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2333,7 +2333,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0624-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0623-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 97% rename from patches/server/0624-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0623-Fixes-kick-event-leave-message-not-being-sent.patch index 4cb254bdb9..fdd06094ab 100644 --- a/patches/server/0624-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0623-Fixes-kick-event-leave-message-not-being-sent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 19ce7611ea1ebef24f246118839b57d9b6949c34..83ba8472a5f3dc2c5d804e49310d8d0a2332a709 100644 +index 76eb668311d2aa2659adf4f7857a670d81387830..ae9acf496b866309d336ebd480a0b99aa03694df 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -273,7 +273,6 @@ public class ServerPlayer extends Player { @@ -50,7 +50,7 @@ index 70458ff8c9bf6f3263868b0f5570840fe3d89ed2..d28d0ef6105ddeb562ddf31ae9088739 MinecraftServer minecraftserver = this.server; Connection networkmanager = this.connection; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2d7b88d0ea0acdd6e40d7c3e622af26de26bc0b7..685f4bb5c0c6c7e546e44bf6d2e4bf1f4c6dce68 100644 +index da21fdec10a10e4dcec3b0cadb72fa82ef56e4b4..8ed347ad9e758a3d5df7110ea0b098a207f61094 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1887,6 +1887,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0625-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0624-Add-config-for-mobs-immune-to-default-effects.patch similarity index 94% rename from patches/server/0625-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0624-Add-config-for-mobs-immune-to-default-effects.patch index 0693018bf1..cf7f8ac4c4 100644 --- a/patches/server/0625-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/server/0624-Add-config-for-mobs-immune-to-default-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4a11bf06a725a5c1927e24ac4ad066f7631a430a..ddfac0ec3baeff8596bea7e742707aa1fddfc1c2 100644 +index ca6e0f27b9d0c5d867909abd89262132bf1aa6bd..0e004d32250fea991c66caead50f2f64dbe0bbf7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1164,7 +1164,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -18,7 +18,7 @@ index 4a11bf06a725a5c1927e24ac4ad066f7631a430a..ddfac0ec3baeff8596bea7e742707aa1 } } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 32b69b09ba2ee63e393aa6b4b6a142aaca6819a1..0d1afaecc35b4c7f7656a2d903f08f92a706cb3f 100644 +index 8241dbf7591b2f56b25cdc3ce9009c7133d2e4ef..2beece01e1b2acc69eeb92810ce14db01a311f23 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -606,7 +606,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob diff --git a/patches/server/0626-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0625-Don-t-apply-cramming-damage-to-players.patch similarity index 94% rename from patches/server/0626-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0625-Don-t-apply-cramming-damage-to-players.patch index 065aae286b..c14d98b487 100644 --- a/patches/server/0626-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0625-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 6a21b06d07fd3ee8ea0fa567240ad6aec9e57096..064b7ccea1342a871caad96fc42db38720043c3b 100644 +index ae9acf496b866309d336ebd480a0b99aa03694df..b49b56848bdbbd07c49e44d85997fa36192332c5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -95,6 +95,7 @@ import net.minecraft.util.Mth; diff --git a/patches/server/0627-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0626-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0627-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0626-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0628-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0627-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0628-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0627-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0629-Stinger-API.patch b/patches/server/0628-Stinger-API.patch similarity index 100% rename from patches/server/0629-Stinger-API.patch rename to patches/server/0628-Stinger-API.patch diff --git a/patches/server/0630-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0629-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0630-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0629-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0631-Add-System.out-err-catcher.patch b/patches/server/0630-Add-System.out-err-catcher.patch similarity index 98% rename from patches/server/0631-Add-System.out-err-catcher.patch rename to patches/server/0630-Add-System.out-err-catcher.patch index 0b6cdc01dc..1398271867 100644 --- a/patches/server/0631-Add-System.out-err-catcher.patch +++ b/patches/server/0630-Add-System.out-err-catcher.patch @@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0ed5db37759e66647bc54cdaa0e612cf2e851771..21dfa2d10e1c67c968b59eb11132ab1ff46ba2d7 100644 +index b3225546c6c65dc18aa71930a38a72c7b6997ad5..7621b77d49330e462c4857f2033d74723eee4281 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -303,6 +303,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0632-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0631-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0632-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0631-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0633-Improve-boat-collision-performance.patch b/patches/server/0632-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0633-Improve-boat-collision-performance.patch rename to patches/server/0632-Improve-boat-collision-performance.patch diff --git a/patches/server/0634-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0633-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0634-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0633-Prevent-AFK-kick-while-watching-end-credits.patch index c0d096df58..08e7d79e1e 100644 --- a/patches/server/0634-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0633-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 685f4bb5c0c6c7e546e44bf6d2e4bf1f4c6dce68..80a31b422ecae9eb30a418034b6eb357076eded1 100644 +index 8ed347ad9e758a3d5df7110ea0b098a207f61094..28fdf5f4df4b61383e6d132f603c50ec35f62024 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -390,7 +390,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0635-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0634-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 97% rename from patches/server/0635-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0634-Allow-skipping-writing-of-comments-to-server.propert.patch index 591481a8b5..5f22e4194a 100644 --- a/patches/server/0635-Allow-skipping-writing-of-comments-to-server.propert.patch +++ b/patches/server/0634-Allow-skipping-writing-of-comments-to-server.propert.patch @@ -8,7 +8,7 @@ Makes less git noise, as it won't update the date every single time Use -DPaper.skipServerPropertiesComments=true flag to disable writing it diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java -index d9ad5087d152a2233d16743768d9ce885f32071d..15bd96f42fa6add2455e6e6a29deb8e6ff643ca0 100644 +index fc45c2c4ecdf3906df6bceaf3e019c462fe62186..f04bfbef6876ceb1fc7d28d9f964b730d1e5c238 100644 --- a/src/main/java/net/minecraft/server/dedicated/Settings.java +++ b/src/main/java/net/minecraft/server/dedicated/Settings.java @@ -29,6 +29,7 @@ public abstract class Settings> { diff --git a/patches/server/0636-Add-PlayerSetSpawnEvent.patch b/patches/server/0635-Add-PlayerSetSpawnEvent.patch similarity index 99% rename from patches/server/0636-Add-PlayerSetSpawnEvent.patch rename to patches/server/0635-Add-PlayerSetSpawnEvent.patch index e2e6dcdd12..4233f9c921 100644 --- a/patches/server/0636-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0635-Add-PlayerSetSpawnEvent.patch @@ -49,7 +49,7 @@ index a2d0699e8427b2262a2396495111125eccafbb66..d797637f61bdf8a424f56fbb48e28b7c } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 064b7ccea1342a871caad96fc42db38720043c3b..b7cdc097e77cb133442191af6e46324a4d0310da 100644 +index b49b56848bdbbd07c49e44d85997fa36192332c5..9f7c149d3ad1175d55ec02e295ee43bc571c3280 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1356,7 +1356,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0637-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0636-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0637-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0636-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0638-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0637-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0638-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0637-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0639-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0638-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0639-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0638-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0640-Added-EntityDamageItemEvent.patch b/patches/server/0639-Added-EntityDamageItemEvent.patch similarity index 97% rename from patches/server/0640-Added-EntityDamageItemEvent.patch rename to patches/server/0639-Added-EntityDamageItemEvent.patch index ef1aeee736..c4a3268367 100644 --- a/patches/server/0640-Added-EntityDamageItemEvent.patch +++ b/patches/server/0639-Added-EntityDamageItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added EntityDamageItemEvent diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 0dfa1ca78f747b2ea7e6b9f59d4561daad8bfcc8..368837172f87ac45e1d58e9905b4693cc0804328 100644 +index 761a46c21aaddcd43b4c33f477658605648127e9..fdcec8496abda362e611b42ef054ea730f47f408 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -622,7 +622,7 @@ public final class ItemStack { diff --git a/patches/server/0641-Optimize-indirect-passenger-iteration.patch b/patches/server/0640-Optimize-indirect-passenger-iteration.patch similarity index 95% rename from patches/server/0641-Optimize-indirect-passenger-iteration.patch rename to patches/server/0640-Optimize-indirect-passenger-iteration.patch index 04f5ad2db9..302d90eab0 100644 --- a/patches/server/0641-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0640-Optimize-indirect-passenger-iteration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 229ed03a59c77d37242b44edabc2ddb843037fa6..6889b02637178db2caad58e5513847fb96e04ecb 100644 +index 486a4d9e5cd421e2444327e2c28e4f674c98894a..c598247bd8cf65f33845502107277518f7260d4d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3926,20 +3926,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0642-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0641-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0642-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0641-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0643-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0642-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0643-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0642-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0644-Clear-bucket-NBT-after-dispense.patch b/patches/server/0643-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0644-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0643-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0645-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0644-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0645-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0644-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0646-Add-BlockBreakBlockEvent.patch b/patches/server/0645-Add-BlockBreakBlockEvent.patch similarity index 98% rename from patches/server/0646-Add-BlockBreakBlockEvent.patch rename to patches/server/0645-Add-BlockBreakBlockEvent.patch index bd3d51aa81..79b68d6784 100644 --- a/patches/server/0646-Add-BlockBreakBlockEvent.patch +++ b/patches/server/0645-Add-BlockBreakBlockEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockBreakBlockEvent diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java -index 2c190473b98899e86d8bcd5a81c72bbc0a85b2a9..f0a85f1b48a911ffd8740df5ebe869e8f0371a58 100644 +index 5e5199b50847958f7abc6d8e42cfb6806df8421f..142f9438f75cb7e2d97011fdeb3f9e367ff81599 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -326,6 +326,23 @@ public class Block extends BlockBehaviour implements ItemLike { diff --git a/patches/server/0647-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0646-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0647-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0646-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0648-More-CommandBlock-API.patch b/patches/server/0647-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0648-More-CommandBlock-API.patch rename to patches/server/0647-More-CommandBlock-API.patch diff --git a/patches/server/0649-Add-missing-team-sidebar-display-slots.patch b/patches/server/0648-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0649-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0648-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0650-Add-back-EntityPortalExitEvent.patch b/patches/server/0649-Add-back-EntityPortalExitEvent.patch similarity index 97% rename from patches/server/0650-Add-back-EntityPortalExitEvent.patch rename to patches/server/0649-Add-back-EntityPortalExitEvent.patch index 97155b3279..ab399684bb 100644 --- a/patches/server/0650-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0649-Add-back-EntityPortalExitEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6889b02637178db2caad58e5513847fb96e04ecb..6f023b22a1051baaa5310d8c5a1aa6d8b76d8992 100644 +index c598247bd8cf65f33845502107277518f7260d4d..8db434d01f2771a94cd4c4a662ea0482b2a02307 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3373,6 +3373,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0651-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0650-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 93% rename from patches/server/0651-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0650-Add-methods-to-find-targets-for-lightning-strikes.patch index 5ee092eda0..8b56c0c4a7 100644 --- a/patches/server/0651-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/server/0650-Add-methods-to-find-targets-for-lightning-strikes.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 89396f956fc413f6ce53c2f66a85c395557aa883..0830f7671ade925e0b89b2723cef9f43d4f20922 100644 +index dbfd4a642e862f46a8b4fd1f3fc52c13ecf74284..1629a94a272f34d395b6be8f16944b9a8837d195 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -998,6 +998,11 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -31,7 +31,7 @@ index 89396f956fc413f6ce53c2f66a85c395557aa883..0830f7671ade925e0b89b2723cef9f43 blockposition1 = blockposition1.above(2); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 144d49ddf5b4daf9d36ba84a25b130c1491fcc02..392714a19fc977678a7a7041d48ff553934ecf51 100644 +index a920936018a2e05ea72d68a83e6debb3807df353..095fa9e4c4d367a3cdd343ca71bef7a6564759be 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -701,6 +701,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0652-Get-entity-default-attributes.patch b/patches/server/0651-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0652-Get-entity-default-attributes.patch rename to patches/server/0651-Get-entity-default-attributes.patch diff --git a/patches/server/0653-Left-handed-API.patch b/patches/server/0652-Left-handed-API.patch similarity index 100% rename from patches/server/0653-Left-handed-API.patch rename to patches/server/0652-Left-handed-API.patch diff --git a/patches/server/0654-Add-more-advancement-API.patch b/patches/server/0653-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0654-Add-more-advancement-API.patch rename to patches/server/0653-Add-more-advancement-API.patch diff --git a/patches/server/0655-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0654-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0655-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0654-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0656-Add-critical-damage-API.patch b/patches/server/0655-Add-critical-damage-API.patch similarity index 98% rename from patches/server/0656-Add-critical-damage-API.patch rename to patches/server/0655-Add-critical-damage-API.patch index 05210d88e4..d2acf3ffd5 100644 --- a/patches/server/0656-Add-critical-damage-API.patch +++ b/patches/server/0655-Add-critical-damage-API.patch @@ -71,7 +71,7 @@ index 004c130fc03dc01ef75fabdb4ef1ef711e33cb95..ae4319c2532855315bc45995a39d7eb9 int k = entity.getRemainingFireTicks(); boolean flag1 = entity.getType().is(EntityTypeTags.DEFLECTS_ARROWS); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index ca586aef7a22b4824f3c954d9574682f6a25ab28..e4d08d4b85f9ce57af50e6aaf4a308a8a6c85ce3 100644 +index 8a7c90014beb5e044abc1fd6f8832bb3c78ffb12..1894fddf867df210d041307d72118eacde9fe5cb 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1043,7 +1043,7 @@ public class CraftEventFactory { diff --git a/patches/server/0657-Fix-issues-with-mob-conversion.patch b/patches/server/0656-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0657-Fix-issues-with-mob-conversion.patch rename to patches/server/0656-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0658-Add-isCollidable-methods-to-various-places.patch b/patches/server/0657-Add-isCollidable-methods-to-various-places.patch similarity index 96% rename from patches/server/0658-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0657-Add-isCollidable-methods-to-various-places.patch index f02bfe0a1d..9623c46599 100644 --- a/patches/server/0658-Add-isCollidable-methods-to-various-places.patch +++ b/patches/server/0657-Add-isCollidable-methods-to-various-places.patch @@ -23,7 +23,7 @@ index ce297420f695404356655b1df2847a32fb98ec59..068b3735b6c50a7a2053c7dc39856f72 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java -index aca63719790429d3d7c7c59a1931a98221c70fc0..31bb92c026a4a2de0e8d3500f6ecf35b60d61fb9 100644 +index 928a301627134b49915b0ceaeabb7dc350605dc2..08716e757b2e100f7bc47a046f02db664d882aba 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java @@ -331,4 +331,11 @@ public class CraftBlockState implements BlockState { diff --git a/patches/server/0659-Goat-ram-API.patch b/patches/server/0658-Goat-ram-API.patch similarity index 100% rename from patches/server/0659-Goat-ram-API.patch rename to patches/server/0658-Goat-ram-API.patch diff --git a/patches/server/0660-Add-API-for-resetting-a-single-score.patch b/patches/server/0659-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0660-Add-API-for-resetting-a-single-score.patch rename to patches/server/0659-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0661-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0660-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0661-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0660-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0662-Vanilla-command-permission-fixes.patch b/patches/server/0661-Vanilla-command-permission-fixes.patch similarity index 97% rename from patches/server/0662-Vanilla-command-permission-fixes.patch rename to patches/server/0661-Vanilla-command-permission-fixes.patch index b0ff5eb32d..6813c9adc7 100644 --- a/patches/server/0662-Vanilla-command-permission-fixes.patch +++ b/patches/server/0661-Vanilla-command-permission-fixes.patch @@ -33,7 +33,7 @@ index 899008b2980d13f1be6280cd8cb959c53a29bebf..f875507241ac6769545e91cd3285232b private RedirectModifier modifier = null; private boolean forks; diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index 1409801946be84e3256748c68ba0c62d42b869de..713e665ee962d9e8bebeb13d2621d43849084090 100644 +index 3b3fa067ee5a95d52645147c2d9d1e43d7a789b6..bc0f9bf88de8f79f8e2aa2261d5a8bdc9dd1f53a 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -257,6 +257,13 @@ public class Commands { diff --git a/patches/server/0663-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0662-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 97% rename from patches/server/0663-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0662-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index 15f28499ca..55882d0841 100644 --- a/patches/server/0663-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0662-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/ state desync POV because the TE is getting unloaded anyways. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0830f7671ade925e0b89b2723cef9f43d4f20922..5329fe64b64fab73d3bda02c700a6f01aa2d9637 100644 +index 1629a94a272f34d395b6be8f16944b9a8837d195..ce74bfb123427c5459c03c3c8f85445077c329c7 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1578,9 +1578,13 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0664-Fix-GameProfileCache-concurrency.patch b/patches/server/0663-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0664-Fix-GameProfileCache-concurrency.patch rename to patches/server/0663-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0665-Improve-and-expand-AsyncCatcher.patch b/patches/server/0664-Improve-and-expand-AsyncCatcher.patch similarity index 98% rename from patches/server/0665-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0664-Improve-and-expand-AsyncCatcher.patch index 4ec9137a17..810bd9cbce 100644 --- a/patches/server/0665-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0664-Improve-and-expand-AsyncCatcher.patch @@ -17,7 +17,7 @@ Async catch modifications to critical entity state Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 80a31b422ecae9eb30a418034b6eb357076eded1..93cb76c8e96488051b10ed4a634c681305628fcc 100644 +index 28fdf5f4df4b61383e6d132f603c50ec35f62024..b203c945e7c013e202013f7bce6b3c7077bf2d42 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1575,6 +1575,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -166,7 +166,7 @@ index bbbf6dd8e566ecdca8794e3b03765fe7e426a2bd..66ab901956ca394c251c420338643d39 PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason}); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 392714a19fc977678a7a7041d48ff553934ecf51..5910373dfbe561e52c507129d506f68aa9252249 100644 +index 095fa9e4c4d367a3cdd343ca71bef7a6564759be..b52d3413cfe725ff5778c897a0ba06ca834e533f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1803,6 +1803,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0666-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0665-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0666-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0665-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0667-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0666-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0667-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0666-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0668-Optimise-general-POI-access.patch b/patches/server/0667-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0668-Optimise-general-POI-access.patch rename to patches/server/0667-Optimise-general-POI-access.patch diff --git a/patches/server/0669-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0668-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0669-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0668-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0670-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0669-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0670-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0669-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0671-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0670-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0671-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0670-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0672-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0671-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 94% rename from patches/server/0672-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0671-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch index 5931189e15..779fad9d1a 100644 --- a/patches/server/0672-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch +++ b/patches/server/0671-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch @@ -13,7 +13,7 @@ Paper recently reverted this optimisation, so it's been reintroduced here. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 2b29b1cf3cd8abccd4b7629e56f18eee741522a5..18e26a5fd8843618710403b3fa4818287e90376c 100644 +index 35ca44c88497e0b07f43ba7bf092360365b1c53a..e297be9cf8c59b6b8d051d5db70c3bebcd235a2d 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -458,6 +458,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0673-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0672-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0673-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0672-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0674-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0673-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0674-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0673-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0675-Time-scoreboard-search.patch b/patches/server/0674-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0675-Time-scoreboard-search.patch rename to patches/server/0674-Time-scoreboard-search.patch diff --git a/patches/server/0676-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0675-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0676-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0675-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0677-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0676-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0677-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0676-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0678-Execute-chunk-tasks-mid-tick.patch b/patches/server/0677-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0678-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0677-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0679-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0678-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0679-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0678-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0680-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0679-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0680-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0679-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0681-Optimise-random-block-ticking.patch b/patches/server/0680-Optimise-random-block-ticking.patch similarity index 99% rename from patches/server/0681-Optimise-random-block-ticking.patch rename to patches/server/0680-Optimise-random-block-ticking.patch index d875078af0..347a22d5c4 100644 --- a/patches/server/0681-Optimise-random-block-ticking.patch +++ b/patches/server/0680-Optimise-random-block-ticking.patch @@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 4df6c879aae57cb85c67a0c7342fc33db6f180dc..bc826660514a76738f5256bf571eb2abf8bf85ef 100644 +index 6b999e05f93b0da1a3cc9a679a3a88b89df4aab5..a9f336ed75ef406c1179bdc6e63e6fd944470534 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -860,6 +860,10 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -324,7 +324,7 @@ index 722e323d2ae3f4ac8aa3197fed79f7d926d5ccfa..f8c1dfc8e121a406955348a1ec00c264 public BlockPos getHomePos() { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 43f43c59138b661299f20cba89d91aa5585cdf32..3b13a13c4e7de12ed0cac354701bf3502d788b59 100644 +index 02dfea10b27c6f932bc5742f6c577e30c155b3fe..94a4ceeea167164fb589518881952dd5e082f8c2 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1398,10 +1398,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0682-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0681-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 99% rename from patches/server/0682-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0681-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch index 0a7c36c977..d2cc318b7d 100644 --- a/patches/server/0682-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch +++ b/patches/server/0681-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch @@ -10,7 +10,7 @@ hoping that at least then we don't swap chunks, and maybe recover them all. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index 19b35d1c07c75b27cef9a53258a68ec5d9f721d5..e1ad2152bbd55435495bdad57a0984842e55fcb8 100644 +index a95909bc818f395ce5772c5129f9cc9b789ce133..df9ae808c5a59ea25145c9df62f42fb33d159021 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -70,6 +70,18 @@ import net.minecraft.world.ticks.ProtoChunkTicks; @@ -685,7 +685,7 @@ index 647ce340c81606ab86d33e1f9dec1fb0afc262d8..98c8b676fc5b2add44d6ddf5d32f85bc return bytebuffer; } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 7dee0f7d49f3492c92fceff7750e696239f840ed..134a5cf10073c27dfbc19709e81ffa75bcc73743 100644 +index 9fa07295bf73317a4c2bbbbaf1918393c891f09a..a2794ec3d846136da64b6888d846587499a5f635 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java @@ -24,6 +24,7 @@ public class RegionFileStorage implements AutoCloseable { diff --git a/patches/server/0683-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0682-Use-Velocity-compression-and-cipher-natives.patch similarity index 99% rename from patches/server/0683-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0682-Use-Velocity-compression-and-cipher-natives.patch index d1fecc8c75..159866c83f 100644 --- a/patches/server/0683-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/0682-Use-Velocity-compression-and-cipher-natives.patch @@ -337,7 +337,7 @@ index 5f625acf04ddb56e3596d086252f9bfccfdb95f2..54c7f34ba3dc8466223e589702d0c93a protected void initChannel(Channel channel) { Connection.setInitialProtocolAttributes(channel); diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 8f60341a3f17fa4553a22e4a98699e0855c54e06..7da7571eef2a90d039da3a3ec122398b523b6730 100644 +index 0bed0d7aff06a400fa28348f8658d7ad385e8749..453ed111a6640bfafe66d914db976243e94f94c8 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -223,12 +223,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0684-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0683-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0684-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0683-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0685-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0684-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0685-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0684-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0686-Distance-manager-tick-timings.patch b/patches/server/0685-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0686-Distance-manager-tick-timings.patch rename to patches/server/0685-Distance-manager-tick-timings.patch diff --git a/patches/server/0687-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0686-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 94% rename from patches/server/0687-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0686-Fix-merchant-inventory-not-closing-on-entity-removal.patch index f42b637cae..5a15e29fbe 100644 --- a/patches/server/0687-Fix-merchant-inventory-not-closing-on-entity-removal.patch +++ b/patches/server/0686-Fix-merchant-inventory-not-closing-on-entity-removal.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 53ab0a55cef95bf7660ccf68558967ce9b63c741..15533cf984bc29edc8015f0cc6b1d510c672c896 100644 +index 56c999c7f80b280966e81a0b1ca4929f034edb20..cae00701c5dbf40be07ea5c2d01ea8929f4fa216 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2696,6 +2696,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0688-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0687-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0688-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0687-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0689-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0688-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 92% rename from patches/server/0689-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0688-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index a0919cf953..23944724e9 100644 --- a/patches/server/0689-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/server/0688-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8ad189164db55c8416b07511dc349ee7a94752a0..3fb7e355a86851731f5f11b6b8bb8e4515806a33 100644 +index b203c945e7c013e202013f7bce6b3c7077bf2d42..648530ce3183362ed71cbd2de534471da65ab787 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -736,6 +736,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0690-Add-packet-limiter-config.patch b/patches/server/0689-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0690-Add-packet-limiter-config.patch rename to patches/server/0689-Add-packet-limiter-config.patch diff --git a/patches/server/0691-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0690-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0691-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0690-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0692-Ensure-valid-vehicle-status.patch b/patches/server/0691-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0692-Ensure-valid-vehicle-status.patch rename to patches/server/0691-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0693-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0692-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0693-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0692-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0694-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0693-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0694-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0693-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0695-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0694-Don-t-log-debug-logging-being-disabled.patch similarity index 88% rename from patches/server/0695-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0694-Don-t-log-debug-logging-being-disabled.patch index 2130840734..8daedd938d 100644 --- a/patches/server/0695-Don-t-log-debug-logging-being-disabled.patch +++ b/patches/server/0694-Don-t-log-debug-logging-being-disabled.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't log debug logging being disabled diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 1eafb92fdf3c6ddce5f5f847bd9034287e2d4b84..68602dfb171d47e47fd0710b4324013ef05214d0 100644 +index 56dbc23f10d946a7ec992b08fd868f3ee5089068..6c260403d91d640da0473a3df56e1c5582459fde 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -382,7 +382,7 @@ public class SpigotConfig diff --git a/patches/server/0696-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0695-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0696-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0695-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0697-Preserve-overstacked-loot.patch b/patches/server/0696-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0697-Preserve-overstacked-loot.patch rename to patches/server/0696-Preserve-overstacked-loot.patch diff --git a/patches/server/0698-Update-head-rotation-in-missing-places.patch b/patches/server/0697-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0698-Update-head-rotation-in-missing-places.patch rename to patches/server/0697-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0699-prevent-unintended-light-block-manipulation.patch b/patches/server/0698-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0699-prevent-unintended-light-block-manipulation.patch rename to patches/server/0698-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0700-Fix-CraftCriteria-defaults-map.patch b/patches/server/0699-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0700-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0699-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0701-Fix-upstreams-block-state-factories.patch b/patches/server/0700-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0701-Fix-upstreams-block-state-factories.patch rename to patches/server/0700-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0702-Configurable-feature-seeds.patch b/patches/server/0701-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0702-Configurable-feature-seeds.patch rename to patches/server/0701-Configurable-feature-seeds.patch diff --git a/patches/server/0703-Add-root-admin-user-detection.patch b/patches/server/0702-Add-root-admin-user-detection.patch similarity index 97% rename from patches/server/0703-Add-root-admin-user-detection.patch rename to patches/server/0702-Add-root-admin-user-detection.patch index 1b3440b012..a8a91bed0f 100644 --- a/patches/server/0703-Add-root-admin-user-detection.patch +++ b/patches/server/0702-Add-root-admin-user-detection.patch @@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6 + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 0008e63e96841c48fa039001f282ffa70c88494f..a305557e97d8719f5f82e70794d15242364ce136 100644 +index a8621519c2fec415c8d56c3510b0780b6ccd9eeb..c9af6ba082d1d387aa2e6ecf5fb4647d994447f4 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0704-Always-allow-item-changing-in-Fireball.patch b/patches/server/0703-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0704-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0703-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0705-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0704-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0705-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0704-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0706-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0705-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0706-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0705-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0707-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0706-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0707-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0706-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0708-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0707-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0708-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0707-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0709-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0708-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0709-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0708-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0710-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0709-Hide-unnecessary-itemmeta-from-clients.patch similarity index 98% rename from patches/server/0710-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0709-Hide-unnecessary-itemmeta-from-clients.patch index a500bba162..2279e31033 100644 --- a/patches/server/0710-Hide-unnecessary-itemmeta-from-clients.patch +++ b/patches/server/0709-Hide-unnecessary-itemmeta-from-clients.patch @@ -18,7 +18,7 @@ index 8d2870c780c4c253f6570c7ef73f6e7c2ccc46ad..0cbb5dd17c5b37ad90ce11a31b644707 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3fb7e355a86851731f5f11b6b8bb8e4515806a33..3d2ef1728a54d7612a773dfb7066b7370c9df178 100644 +index 648530ce3183362ed71cbd2de534471da65ab787..1e519cdd673a4d4beb53ae84822e7b85c25a5e97 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2566,8 +2566,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0711-Fix-Spigot-growth-modifiers.patch b/patches/server/0710-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0711-Fix-Spigot-growth-modifiers.patch rename to patches/server/0710-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0712-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0711-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0712-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0711-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0713-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0712-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0713-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0712-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0714-Optimize-HashMapPalette.patch b/patches/server/0713-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0714-Optimize-HashMapPalette.patch rename to patches/server/0713-Optimize-HashMapPalette.patch diff --git a/patches/server/0715-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0714-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0715-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0714-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0716-Collision-optimisations.patch b/patches/server/0715-Collision-optimisations.patch similarity index 100% rename from patches/server/0716-Collision-optimisations.patch rename to patches/server/0715-Collision-optimisations.patch diff --git a/patches/server/0717-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0716-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 99% rename from patches/server/0717-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0716-Optimise-collision-checking-in-player-move-packet-ha.patch index aac62fe828..67f3734290 100644 --- a/patches/server/0717-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/server/0716-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN CHECK ME diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3d2ef1728a54d7612a773dfb7066b7370c9df178..846db5783d85b68ca1f3788fe5434bc88b90c2d9 100644 +index 1e519cdd673a4d4beb53ae84822e7b85c25a5e97..554b0cd2f61005b57e1b0f68730354a8753fb0b7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -543,7 +543,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0718-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0717-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0718-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0717-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0719-Add-more-Campfire-API.patch b/patches/server/0718-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0719-Add-more-Campfire-API.patch rename to patches/server/0718-Add-more-Campfire-API.patch diff --git a/patches/server/0720-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0719-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0720-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0719-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0721-Fix-tripwire-state-inconsistency.patch b/patches/server/0720-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0721-Fix-tripwire-state-inconsistency.patch rename to patches/server/0720-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0722-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0721-Forward-CraftEntity-in-teleport-command.patch similarity index 94% rename from patches/server/0722-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0721-Forward-CraftEntity-in-teleport-command.patch index 7cecf97561..0133abe04e 100644 --- a/patches/server/0722-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0721-Forward-CraftEntity-in-teleport-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4903c0ddff7a7fcfdadb62e92ff285b77bd8eacf..0d561537ab767e357c2e4385d0d87f8e3db022d8 100644 +index 519e3f0e376198fb399819f4587ccf935b93ea1a..4ffd551e6ea540cff14eaba0e95ed2c7c0bca513 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3531,6 +3531,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0723-Improve-scoreboard-entries.patch b/patches/server/0722-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0723-Improve-scoreboard-entries.patch rename to patches/server/0722-Improve-scoreboard-entries.patch diff --git a/patches/server/0724-Entity-powdered-snow-API.patch b/patches/server/0723-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0724-Entity-powdered-snow-API.patch rename to patches/server/0723-Entity-powdered-snow-API.patch diff --git a/patches/server/0725-Add-API-for-item-entity-health.patch b/patches/server/0724-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0725-Add-API-for-item-entity-health.patch rename to patches/server/0724-Add-API-for-item-entity-health.patch diff --git a/patches/server/0726-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0725-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 98% rename from patches/server/0726-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0725-Fix-entity-type-tags-suggestions-in-selectors.patch index 2064d7103a..225dce154f 100644 --- a/patches/server/0726-Fix-entity-type-tags-suggestions-in-selectors.patch +++ b/patches/server/0725-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 e58c2844356c71973d81b460a21aab795b506d77..20b2cbbc73f6420b6ace9746016527b90d9f01b9 100644 +index 79732086bc4cdbca8364d78eb60d68c758055966..82ca6267bca684a8f04ca37d40816686677a852a 100644 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java @@ -447,4 +447,20 @@ public class CommandSourceStack implements ExecutionCommandSource -Date: Fri, 24 Sep 2021 17:59:21 +0200 -Subject: [PATCH] Added getHostname 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 856699cd8976bca49bb4f7cae424bad606166b9d..12dc053af430218fae9ec30d3e793e0323ca1137 100644 ---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -@@ -299,7 +299,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, - - // Paper start - com.destroystokyo.paper.profile.PlayerProfile profile = com.destroystokyo.paper.profile.CraftPlayerProfile.asBukkitMirror(gameprofile); -- AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, rawAddress, uniqueId, profile); // Paper - add rawAddress -+ AsyncPlayerPreLoginEvent asyncEvent = new AsyncPlayerPreLoginEvent(playerName, address, rawAddress, uniqueId, profile, ServerLoginPacketListenerImpl.this.connection.hostname); // Paper - add rawAddress & hostname - server.getPluginManager().callEvent(asyncEvent); - profile = asyncEvent.getPlayerProfile(); - profile.complete(true); // Paper - setPlayerProfileAPI diff --git a/patches/server/0743-Multi-Block-Change-API-Implementation.patch b/patches/server/0741-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0743-Multi-Block-Change-API-Implementation.patch rename to patches/server/0741-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0744-Fix-NotePlayEvent.patch b/patches/server/0742-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0744-Fix-NotePlayEvent.patch rename to patches/server/0742-Fix-NotePlayEvent.patch diff --git a/patches/server/0745-Freeze-Tick-Lock-API.patch b/patches/server/0743-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0745-Freeze-Tick-Lock-API.patch rename to patches/server/0743-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0746-Dolphin-API.patch b/patches/server/0744-Dolphin-API.patch similarity index 100% rename from patches/server/0746-Dolphin-API.patch rename to patches/server/0744-Dolphin-API.patch diff --git a/patches/server/0747-More-PotionEffectType-API.patch b/patches/server/0745-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0747-More-PotionEffectType-API.patch rename to patches/server/0745-More-PotionEffectType-API.patch diff --git a/patches/server/0748-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0746-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0748-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0746-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0749-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0747-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0749-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0747-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0750-Add-missing-structure-set-seed-configs.patch b/patches/server/0748-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0750-Add-missing-structure-set-seed-configs.patch rename to patches/server/0748-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0751-Implement-regenerateChunk.patch b/patches/server/0749-Implement-regenerateChunk.patch similarity index 98% rename from patches/server/0751-Implement-regenerateChunk.patch rename to patches/server/0749-Implement-regenerateChunk.patch index b4ba01ed7b..18db0bc2db 100644 --- a/patches/server/0751-Implement-regenerateChunk.patch +++ b/patches/server/0749-Implement-regenerateChunk.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 83f51cbe9de3fdde19d02a564f873f51f697a828..e709b6fda1703c0787ddeedec9b7cc09f440d652 100644 +index 999602a6c11257b05083bcc2d36b6e30b2b129f4..d41cd3075a5f59f271ddee7009a3ed26a34d3041 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -144,6 +144,7 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/server/0752-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0750-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0752-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0750-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0753-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0751-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0753-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0751-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0754-Add-GameEvent-tags.patch b/patches/server/0752-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0754-Add-GameEvent-tags.patch rename to patches/server/0752-Add-GameEvent-tags.patch diff --git a/patches/server/0755-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0753-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0755-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0753-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0756-Furnace-RecipesUsed-API.patch b/patches/server/0754-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0756-Furnace-RecipesUsed-API.patch rename to patches/server/0754-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0757-Configurable-sculk-sensor-listener-range.patch b/patches/server/0755-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0757-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0755-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0758-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0756-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0758-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0756-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0759-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0757-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 96% rename from patches/server/0759-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0757-Option-to-have-default-CustomSpawners-in-custom-worl.patch index b584e52ee2..e48a115689 100644 --- a/patches/server/0759-Option-to-have-default-CustomSpawners-in-custom-worl.patch +++ b/patches/server/0757-Option-to-have-default-CustomSpawners-in-custom-worl.patch @@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which is one level below that. Defaults to off to keep vanilla behavior. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8f375cc054f6c15537eca4927ea5cb0eb6a93b67..abd20b1bbda4177a3f3be8abf3977866780a9b67 100644 +index 396cbd1a0a94e913475bad65faf8e871b7105895..67bda174adb74e6176e81f986382b3bbbfe6b95f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -623,7 +623,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { + try { -+ this.callPlayerPreLoginEvents(this.authenticatedProfile); ++ final GameProfile gameprofile = this.callPlayerPreLoginEvents(this.authenticatedProfile); ++ ServerLoginPacketListenerImpl.LOGGER.info("UUID of player {} is {}", gameprofile.getName(), gameprofile.getId()); ++ ServerLoginPacketListenerImpl.this.startClientVerification(gameprofile); + } catch (Exception ex) { + disconnect("Failed to verify username!"); + server.server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + this.authenticatedProfile.getName(), ex); diff --git a/patches/server/0830-Add-NamespacedKey-biome-methods.patch b/patches/server/0828-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0830-Add-NamespacedKey-biome-methods.patch rename to patches/server/0828-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0831-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0829-Fix-plugin-loggers-on-server-shutdown.patch similarity index 96% rename from patches/server/0831-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0829-Fix-plugin-loggers-on-server-shutdown.patch index ed3aa5f07b..ba6d4a0a8d 100644 --- a/patches/server/0831-Fix-plugin-loggers-on-server-shutdown.patch +++ b/patches/server/0829-Fix-plugin-loggers-on-server-shutdown.patch @@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5b39e4a6b39e73cfe5645d80cd823e582ade6bc2..a2961f1453e3805879941c709ab74a608285db42 100644 +index 002511a54565aab9eb4552fecdf974fe0eab9122..7c9f7aefc59ae1a785b261f80f25d3304f3bdd22 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1026,6 +1026,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7b6c3d1feeb390485e5ef5507e6dae3992155212..bdd2909b1ce8932509ab37ff1124a97171658d18 100644 +index 3f60f33c43dfcc4ea99a80c66a70222b2ea2f4a6..2fdc9fcc8f88d78fd4b06bfae947c5cb28f8eea7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2658,7 +2658,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0880-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0878-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0880-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0878-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0881-fix-Instruments.patch b/patches/server/0879-fix-Instruments.patch similarity index 100% rename from patches/server/0881-fix-Instruments.patch rename to patches/server/0879-fix-Instruments.patch diff --git a/patches/server/0882-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0880-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 97% rename from patches/server/0882-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0880-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch index e454a32d6d..b956dd543c 100644 --- a/patches/server/0882-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch +++ b/patches/server/0880-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Improve inlining for some hot BlockBehavior and FluidState diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index 84d7aeafafe1497d96dca2238b579007cbe27146..3ab8b99837b1d1faea722c598b0228b2780be8b1 100644 +index d91a82428a435a65bc55ad466ccebe91e0d905e0..17d2b90441d7513d7907b988610be8604ac05282 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java @@ -1078,15 +1078,15 @@ public abstract class BlockBehaviour implements FeatureElement { diff --git a/patches/server/0883-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0881-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0883-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0881-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0884-Add-BlockLockCheckEvent.patch b/patches/server/0882-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0884-Add-BlockLockCheckEvent.patch rename to patches/server/0882-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0885-Add-Sneaking-API-for-Entities.patch b/patches/server/0883-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0885-Add-Sneaking-API-for-Entities.patch rename to patches/server/0883-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0886-Improve-logging-and-errors.patch b/patches/server/0884-Improve-logging-and-errors.patch similarity index 98% rename from patches/server/0886-Improve-logging-and-errors.patch rename to patches/server/0884-Improve-logging-and-errors.patch index 7a98293c52..aaf43d1ac7 100644 --- a/patches/server/0886-Improve-logging-and-errors.patch +++ b/patches/server/0884-Improve-logging-and-errors.patch @@ -40,7 +40,7 @@ index 536f0c496ce36ca3248fc6eeac9bbd77214a36f9..5e24c1e712eb16d0d5343760a65310bd while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index bdd2909b1ce8932509ab37ff1124a97171658d18..623de7ab6d45f48db7637ecb46e07488c01d4dc6 100644 +index 2fdc9fcc8f88d78fd4b06bfae947c5cb28f8eea7..e602a3b5182e68e7cb20395169bb392d49a23e89 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3395,7 +3395,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0887-Improve-PortalEvents.patch b/patches/server/0885-Improve-PortalEvents.patch similarity index 93% rename from patches/server/0887-Improve-PortalEvents.patch rename to patches/server/0885-Improve-PortalEvents.patch index 26f33f7a45..333ac5fa11 100644 --- a/patches/server/0887-Improve-PortalEvents.patch +++ b/patches/server/0885-Improve-PortalEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bee8fe397c960c4f2ceba8777d0cc4e6e2bd060d..250a0ade29d4cf619d99a1c052e521e94482a213 100644 +index 5968a555ce7cc4681f5c096bda7d007005e2a8bf..04ca1f84c68a73addd2177256268bb9b444f72da 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3765,7 +3765,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0888-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0886-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0888-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0886-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0889-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0887-Add-missing-SpigotConfig-logCommands-check.patch similarity index 92% rename from patches/server/0889-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0887-Add-missing-SpigotConfig-logCommands-check.patch index 53541ae431..855d972537 100644 --- a/patches/server/0889-Add-missing-SpigotConfig-logCommands-check.patch +++ b/patches/server/0887-Add-missing-SpigotConfig-logCommands-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 623de7ab6d45f48db7637ecb46e07488c01d4dc6..23fe6877cadd780f4db99955fd993e1461a21040 100644 +index e602a3b5182e68e7cb20395169bb392d49a23e89..b9d6f38df243bbdd55639716cfaff24eb95aaa74 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2139,7 +2139,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0890-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0888-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0890-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0888-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0891-Flying-Fall-Damage.patch b/patches/server/0889-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0891-Flying-Fall-Damage.patch rename to patches/server/0889-Flying-Fall-Damage.patch diff --git a/patches/server/0892-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0890-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0892-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0890-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0893-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0891-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0893-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0891-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0894-config-for-disabling-entity-tag-tags.patch b/patches/server/0892-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0894-config-for-disabling-entity-tag-tags.patch rename to patches/server/0892-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0895-Use-single-player-info-update-packet-on-join.patch b/patches/server/0893-Use-single-player-info-update-packet-on-join.patch similarity index 97% rename from patches/server/0895-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0893-Use-single-player-info-update-packet-on-join.patch index 890fc64712..4b599b6723 100644 --- a/patches/server/0895-Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/0893-Use-single-player-info-update-packet-on-join.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 23fe6877cadd780f4db99955fd993e1461a21040..00855a1e3519a43ab5b203cf0313b297baa254a0 100644 +index b9d6f38df243bbdd55639716cfaff24eb95aaa74..ab5b354b0fb42535e8d176a219876e23f08c1f3d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3425,7 +3425,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0896-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0894-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0896-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0894-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0897-Win-Screen-API.patch b/patches/server/0895-Win-Screen-API.patch similarity index 100% rename from patches/server/0897-Win-Screen-API.patch rename to patches/server/0895-Win-Screen-API.patch diff --git a/patches/server/0898-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0896-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 93% rename from patches/server/0898-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0896-Remove-CraftItemStack-setAmount-null-assignment.patch index 2cc8370e15..4dff637cb9 100644 --- a/patches/server/0898-Remove-CraftItemStack-setAmount-null-assignment.patch +++ b/patches/server/0896-Remove-CraftItemStack-setAmount-null-assignment.patch @@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create a problem with operations on the vanilla ItemStack. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 8c06ff72bcc7cce2c853bf999bda8afc10e53ca6..7081aebf67cc3d8deb27dfc508970f0fa5e9d1b6 100644 +index a4d522a19f1a1288baa2688d5beb62c91a5fb3a3..749bf6a897b053197988112551192abe6af2f186 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -157,7 +157,7 @@ public final class CraftItemStack extends ItemStack { diff --git a/patches/server/0899-Fix-force-opening-enchantment-tables.patch b/patches/server/0897-Fix-force-opening-enchantment-tables.patch similarity index 94% rename from patches/server/0899-Fix-force-opening-enchantment-tables.patch rename to patches/server/0897-Fix-force-opening-enchantment-tables.patch index b258d63751..7137782d6f 100644 --- a/patches/server/0899-Fix-force-opening-enchantment-tables.patch +++ b/patches/server/0897-Fix-force-opening-enchantment-tables.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix force-opening enchantment tables diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 7ce6d05b99cce1672ce397b5ce64d266f68a8cae..4e2e16a7c40f69ff79979a7b580364224c64585f 100644 +index 267863ff81a95d686b8db6cfee9256a2c5ad3f68..5e5fda690605f767b33f8225bffea98d23299fea 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -402,7 +402,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0900-Add-Entity-Body-Yaw-API.patch b/patches/server/0898-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0900-Add-Entity-Body-Yaw-API.patch rename to patches/server/0898-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0901-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0899-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0901-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0899-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0902-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0900-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 90% rename from patches/server/0902-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0900-Update-the-flag-when-a-captured-block-state-is-outda.patch index 17e4b0c331..82ed0eb325 100644 --- a/patches/server/0902-Update-the-flag-when-a-captured-block-state-is-outda.patch +++ b/patches/server/0900-Update-the-flag-when-a-captured-block-state-is-outda.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Update the flag when a captured block state is outdated diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index e6c49b780b802fce13451e71be0b36160fabbef7..9f08ab23b9c0c24c4b6131b110dfc7d4a9cdd1b2 100644 +index 28ed2605bc3f4d657f6f58729134aeb81a98dac4..c7eb97008b8096f69602678722506fddbeac3148 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -923,6 +923,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0903-Add-EntityFertilizeEggEvent.patch b/patches/server/0901-Add-EntityFertilizeEggEvent.patch similarity index 98% rename from patches/server/0903-Add-EntityFertilizeEggEvent.patch rename to patches/server/0901-Add-EntityFertilizeEggEvent.patch index 28c9a823c0..e24d728361 100644 --- a/patches/server/0903-Add-EntityFertilizeEggEvent.patch +++ b/patches/server/0901-Add-EntityFertilizeEggEvent.patch @@ -69,7 +69,7 @@ index 36b3945832733b5ad66d25aa3a31335234d2acff..47a5125e44cea1ece84657cdb874807f this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F); } // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a6ccc177a3435d807dd6be3bdfca7f016c094158..9ad9f18b62c8c7d2b4f53bf795817e4fcce3c4cc 100644 +index ef7d6f898c2c94d0697e38230564e110948b0460..dfab64b21eedfbdd129c881b7c862ad962c78f3d 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -2092,4 +2092,29 @@ public class CraftEventFactory { diff --git a/patches/server/0904-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0902-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 94% rename from patches/server/0904-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0902-Fix-HumanEntity-drop-not-updating-the-client-inv.patch index 9e8f8139fb..e8652816d7 100644 --- a/patches/server/0904-Fix-HumanEntity-drop-not-updating-the-client-inv.patch +++ b/patches/server/0902-Fix-HumanEntity-drop-not-updating-the-client-inv.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Fix HumanEntity#drop not updating the client inv public net.minecraft.server.level.ServerPlayer containerSynchronizer diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 4e2e16a7c40f69ff79979a7b580364224c64585f..e0ab2124b339d0053a1d075204ca1070be572e75 100644 +index 5e5fda690605f767b33f8225bffea98d23299fea..52c9244194f3c0182f3a6010ed97d4238efd4eb4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -755,8 +755,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0905-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0903-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0905-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0903-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0906-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0904-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0906-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0904-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0907-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0905-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0907-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0905-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0908-Fix-text-display-error-on-spawn.patch b/patches/server/0906-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0908-Fix-text-display-error-on-spawn.patch rename to patches/server/0906-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0909-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0907-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0909-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0907-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0910-Add-Shearable-API.patch b/patches/server/0908-Add-Shearable-API.patch similarity index 100% rename from patches/server/0910-Add-Shearable-API.patch rename to patches/server/0908-Add-Shearable-API.patch diff --git a/patches/server/0911-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0909-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0911-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0909-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0912-Optimize-Hoppers.patch b/patches/server/0910-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0912-Optimize-Hoppers.patch rename to patches/server/0910-Optimize-Hoppers.patch diff --git a/patches/server/0913-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0911-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0913-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0911-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0914-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0912-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0914-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0912-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0915-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0913-Treat-sequence-violations-like-they-should-be.patch similarity index 91% rename from patches/server/0915-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0913-Treat-sequence-violations-like-they-should-be.patch index 9eb3ebf470..f08f796d75 100644 --- a/patches/server/0915-Treat-sequence-violations-like-they-should-be.patch +++ b/patches/server/0913-Treat-sequence-violations-like-they-should-be.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 00855a1e3519a43ab5b203cf0313b297baa254a0..6f1602e5e077b9dd401a1ca80aef445b257801fd 100644 +index ab5b354b0fb42535e8d176a219876e23f08c1f3d..e0bdb0ef35494b376960613bd6e319d179676bf3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2043,6 +2043,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0916-remove-duplicate-animate-packet-for-records.patch b/patches/server/0914-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0916-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0914-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0917-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0915-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 97% rename from patches/server/0917-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0915-Prevent-causing-expired-keys-from-impacting-new-join.patch index 2df3ae6626..66b0be1bb3 100644 --- a/patches/server/0917-Prevent-causing-expired-keys-from-impacting-new-join.patch +++ b/patches/server/0915-Prevent-causing-expired-keys-from-impacting-new-join.patch @@ -24,7 +24,7 @@ index 0e54e8faa48751a651b953bec72543a94edf74bc..aa1c6de4d6cb7bbca33d25895c54707d UPDATE_GAME_MODE((serialized, buf) -> { serialized.gameMode = GameType.byId(buf.readVarInt()); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6f1602e5e077b9dd401a1ca80aef445b257801fd..70adc48f7126425b43a667c4d82d511f92909807 100644 +index e0bdb0ef35494b376960613bd6e319d179676bf3..361d31a4a527c32ff3b8cd2e763e23963ec0a2b4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -287,6 +287,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0918-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0916-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 90% rename from patches/server/0918-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0916-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch index 7907f1339e..c98ffaa074 100644 --- a/patches/server/0918-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch +++ b/patches/server/0916-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 93bd05adb8dcc1dae81b820e262bc1fb43430981..abef96d4c0ee22d05fc8b462811189128900fb8d 100644 +index 4e8e1f4562b3edb7041e299b6719e965df975636..a7f2e8755af41abc66070f1971e526b4f05bc710 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1724,6 +1724,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0919-Use-array-for-gamerule-storage.patch b/patches/server/0917-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0919-Use-array-for-gamerule-storage.patch rename to patches/server/0917-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0920-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0918-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0920-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0918-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0921-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0919-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 91% rename from patches/server/0921-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0919-Fix-demo-flag-not-enabling-demo-mode.patch index 7810e020e8..01bdc03d01 100644 --- a/patches/server/0921-Fix-demo-flag-not-enabling-demo-mode.patch +++ b/patches/server/0919-Fix-demo-flag-not-enabling-demo-mode.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix demo flag not enabling demo mode https://github.com/PaperMC/Paper/issues/9046 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 4a451d6d5b11f10db9c583823c4d742f4a69970c..7573c12a77797146c51ef2dfe4b2a636df45e21a 100644 +index 786104fb12f02f493619dfc0d81ab98140d70912..2568272a10c0d92bc49c0c244b10791db7bfae2b 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -333,7 +333,9 @@ public class Main { diff --git a/patches/server/0922-Add-Mob-Experience-reward-API.patch b/patches/server/0920-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0922-Add-Mob-Experience-reward-API.patch rename to patches/server/0920-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0923-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0921-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0923-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0921-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0924-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0922-Fix-DamageCause-for-Falling-Blocks.patch similarity index 92% rename from patches/server/0924-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0922-Fix-DamageCause-for-Falling-Blocks.patch index cbe24321bd..e1935baf2e 100644 --- a/patches/server/0924-Fix-DamageCause-for-Falling-Blocks.patch +++ b/patches/server/0922-Fix-DamageCause-for-Falling-Blocks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 9ad9f18b62c8c7d2b4f53bf795817e4fcce3c4cc..7bd1147362d057a16cdac0893615483479233c66 100644 +index dfab64b21eedfbdd129c881b7c862ad962c78f3d..454365ea4795ac6c0e30530f795cbdb511908440 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1085,6 +1085,11 @@ public class CraftEventFactory { diff --git a/patches/server/0925-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0923-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0925-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0923-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0926-More-accurate-isInOpenWater-impl.patch b/patches/server/0924-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0926-More-accurate-isInOpenWater-impl.patch rename to patches/server/0924-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0927-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0925-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0927-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0925-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0928-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0926-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0928-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0926-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0929-Expand-PlayerItemMendEvent.patch b/patches/server/0927-Expand-PlayerItemMendEvent.patch similarity index 98% rename from patches/server/0929-Expand-PlayerItemMendEvent.patch rename to patches/server/0927-Expand-PlayerItemMendEvent.patch index b0c81d037f..0ad40b41eb 100644 --- a/patches/server/0929-Expand-PlayerItemMendEvent.patch +++ b/patches/server/0927-Expand-PlayerItemMendEvent.patch @@ -51,7 +51,7 @@ index b1d12c30dd23e092531c0d4d3af367262ccb5402..809932208bdf8e01d7bc73f885c44497 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7bd1147362d057a16cdac0893615483479233c66..d55e1611028a836a34dd85f08c4463f1ec15662e 100644 +index 454365ea4795ac6c0e30530f795cbdb511908440..a6897c9a46d9cef083d5424c5b4a2ed0a32dfe3b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1321,10 +1321,10 @@ public class CraftEventFactory { diff --git a/patches/server/0930-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0928-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0930-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0928-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0931-Add-transient-modifier-API.patch b/patches/server/0929-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0931-Add-transient-modifier-API.patch rename to patches/server/0929-Add-transient-modifier-API.patch diff --git a/patches/server/0932-Fix-block-place-logic.patch b/patches/server/0930-Fix-block-place-logic.patch similarity index 97% rename from patches/server/0932-Fix-block-place-logic.patch rename to patches/server/0930-Fix-block-place-logic.patch index 5437387225..0f786528da 100644 --- a/patches/server/0932-Fix-block-place-logic.patch +++ b/patches/server/0930-Fix-block-place-logic.patch @@ -41,7 +41,7 @@ index 3f420bbe8c2b9128a051030c4acd3603ea487132..453f48b540560a340721d762ca80eadf } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 9f08ab23b9c0c24c4b6131b110dfc7d4a9cdd1b2..3a6615df0e9e0043cebe35268509b882893725fb 100644 +index c7eb97008b8096f69602678722506fddbeac3148..7a4c21beaa4004f72cbfe75e567cafb3279a1c94 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1038,17 +1038,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0933-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0931-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0933-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0931-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0934-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0932-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0934-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0932-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0935-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0933-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 94% rename from patches/server/0935-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0933-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch index 26067bee3d..0fec15f9b7 100644 --- a/patches/server/0935-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch +++ b/patches/server/0933-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2836eb1edefc46556d71a23ddbb50cb495b44021..036d1d133dbe39194ba8bc5201bdae1a3bdae56c 100644 +index 0b4639e56b87319e78c1b46fb581d8bb74ead2e4..4310134fe9cb74cb11591d52562bc35039130d19 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -352,7 +352,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0936-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0934-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0936-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0934-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0937-Fix-sniffer-removeExploredLocation.patch b/patches/server/0935-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0937-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0935-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0938-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0936-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0938-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0936-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/server/0939-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0937-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch similarity index 100% rename from patches/server/0939-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch rename to patches/server/0937-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch diff --git a/patches/server/0940-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0938-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0940-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0938-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0941-Properly-Cancel-Usable-Items.patch b/patches/server/0939-Properly-Cancel-Usable-Items.patch similarity index 97% rename from patches/server/0941-Properly-Cancel-Usable-Items.patch rename to patches/server/0939-Properly-Cancel-Usable-Items.patch index 2055eb8ac7..4122f9b89f 100644 --- a/patches/server/0941-Properly-Cancel-Usable-Items.patch +++ b/patches/server/0939-Properly-Cancel-Usable-Items.patch @@ -34,7 +34,7 @@ index f58386e952d29a16d160b628a23efbe102791277..82f26186156a487f29ad3abff3f68852 return enuminteractionresult; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 70adc48f7126425b43a667c4d82d511f92909807..9fc1ed35896563ba5fd3e19512db6a2bc79fd0ad 100644 +index 361d31a4a527c32ff3b8cd2e763e23963ec0a2b4..ab2fcbdd9567e18a59eb70b3557da7a3f4a91f38 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1955,6 +1955,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0942-Add-event-for-player-editing-sign.patch b/patches/server/0940-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0942-Add-event-for-player-editing-sign.patch rename to patches/server/0940-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0943-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0941-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0943-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0941-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0944-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0942-Fix-cmd-permission-levels-for-command-blocks.patch similarity index 97% rename from patches/server/0944-Fix-cmd-permission-levels-for-command-blocks.patch rename to patches/server/0942-Fix-cmd-permission-levels-for-command-blocks.patch index ac6fec8981..7f1a397233 100644 --- a/patches/server/0944-Fix-cmd-permission-levels-for-command-blocks.patch +++ b/patches/server/0942-Fix-cmd-permission-levels-for-command-blocks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix cmd permission levels for command blocks diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java -index 20b2cbbc73f6420b6ace9746016527b90d9f01b9..37ba8fd69a0099f80bdf7c28b593241f1f5d681f 100644 +index 82ca6267bca684a8f04ca37d40816686677a852a..4e81a823c49807d9978aeaef8293baaa67194c4d 100644 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java @@ -204,10 +204,29 @@ public class CommandSourceStack implements ExecutionCommandSource