diff --git a/patches/api/0160-Turtle-API.patch b/patches/api/0160-Turtle-API.patch index 06abb703f4..8d4767cd07 100644 --- a/patches/api/0160-Turtle-API.patch +++ b/patches/api/0160-Turtle-API.patch @@ -221,10 +221,10 @@ index 0000000000000000000000000000000000000000..abeb24fccda2acfdb0dfdadacb8fe688 + } +} diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java -index 0a4cd29930c2f1c28f5a3e6884c7dec45b5cac11..5375ea14097f4f10b2294488b92924a35a72d4d7 100644 +index 0a4cd29930c2f1c28f5a3e6884c7dec45b5cac11..8bee07c81172e189fab9b82b398983f509099474 100644 --- a/src/main/java/org/bukkit/entity/Turtle.java +++ b/src/main/java/org/bukkit/entity/Turtle.java -@@ -1,6 +1,55 @@ +@@ -1,6 +1,62 @@ package org.bukkit.entity; +import org.bukkit.Location; @@ -279,5 +279,12 @@ index 0a4cd29930c2f1c28f5a3e6884c7dec45b5cac11..5375ea14097f4f10b2294488b92924a3 + * @param hasEgg True if carrying egg + */ + void setHasEgg(boolean hasEgg); ++ ++ /** ++ * Returns whether the turtle is currently laying an egg. ++ * ++ * @return whether the turtle is laying an egg ++ */ ++ boolean isLayingEgg(); + // Paper end +} diff --git a/patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0261-added-Wither-API.patch b/patches/api/0261-added-Wither-API.patch deleted file mode 100644 index dbfc15a42c..0000000000 --- a/patches/api/0261-added-Wither-API.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Sun, 5 Jul 2020 15:39:40 -0700 -Subject: [PATCH] added Wither API - - -diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java -index 426d3693317cd303d35d8203026b528d87e401d5..8c95cd6933f11076de936854f379e6fc8600b525 100644 ---- a/src/main/java/org/bukkit/entity/Wither.java -+++ b/src/main/java/org/bukkit/entity/Wither.java -@@ -6,4 +6,34 @@ import com.destroystokyo.paper.entity.RangedEntity; - * Represents a Wither boss - */ - public interface Wither extends Monster, Boss, RangedEntity { // Paper -+ // Paper start -+ /** -+ * @return whether the wither is charged -+ */ -+ boolean isCharged(); -+ -+ /** -+ * @return ticks the wither is invulnerable for -+ */ -+ int getInvulnerableTicks(); -+ -+ /** -+ * Sets for how long in the future, the wither should be invulnerable. -+ * -+ * @param ticks ticks the wither is invulnerable for -+ */ -+ void setInvulnerableTicks(int ticks); -+ -+ /** -+ * @return whether the wither can travel through portals -+ */ -+ boolean canTravelThroughPortals(); -+ -+ /** -+ * Sets whether the wither can travel through portals. -+ * -+ * @param value whether the wither can travel through portals -+ */ -+ void setCanTravelThroughPortals(boolean value); -+ // Paper end - } diff --git a/patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/api/0265-add-DragonEggFormEvent.patch b/patches/api/0264-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0265-add-DragonEggFormEvent.patch rename to patches/api/0264-add-DragonEggFormEvent.patch diff --git a/patches/api/0266-EntityMoveEvent.patch b/patches/api/0265-EntityMoveEvent.patch similarity index 100% rename from patches/api/0266-EntityMoveEvent.patch rename to patches/api/0265-EntityMoveEvent.patch diff --git a/patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0269-living-entity-allow-attribute-registration.patch b/patches/api/0268-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0269-living-entity-allow-attribute-registration.patch rename to patches/api/0268-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0270-Add-missing-effects.patch b/patches/api/0269-Add-missing-effects.patch similarity index 100% rename from patches/api/0270-Add-missing-effects.patch rename to patches/api/0269-Add-missing-effects.patch diff --git a/patches/api/0271-Expose-Tracked-Players.patch b/patches/api/0270-Expose-Tracked-Players.patch similarity index 100% rename from patches/api/0271-Expose-Tracked-Players.patch rename to patches/api/0270-Expose-Tracked-Players.patch diff --git a/patches/api/0272-Cache-the-result-of-Material-isBlock.patch b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch similarity index 100% rename from patches/api/0272-Cache-the-result-of-Material-isBlock.patch rename to patches/api/0271-Cache-the-result-of-Material-isBlock.patch diff --git a/patches/api/0273-Add-worldborder-events.patch b/patches/api/0272-Add-worldborder-events.patch similarity index 100% rename from patches/api/0273-Add-worldborder-events.patch rename to patches/api/0272-Add-worldborder-events.patch diff --git a/patches/api/0274-added-PlayerNameEntityEvent.patch b/patches/api/0273-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0274-added-PlayerNameEntityEvent.patch rename to patches/api/0273-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0275-Add-recipe-to-cook-events.patch b/patches/api/0274-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0275-Add-recipe-to-cook-events.patch rename to patches/api/0274-Add-recipe-to-cook-events.patch diff --git a/patches/api/0276-Add-Block-isValidTool.patch b/patches/api/0275-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0276-Add-Block-isValidTool.patch rename to patches/api/0275-Add-Block-isValidTool.patch diff --git a/patches/api/0277-Implement-Keyed-on-World.patch b/patches/api/0276-Implement-Keyed-on-World.patch similarity index 98% rename from patches/api/0277-Implement-Keyed-on-World.patch rename to patches/api/0276-Implement-Keyed-on-World.patch index 86b1e2d5ef..5de0465b32 100644 --- a/patches/api/0277-Implement-Keyed-on-World.patch +++ b/patches/api/0276-Implement-Keyed-on-World.patch @@ -28,7 +28,7 @@ index 0aa141c590cf61a1fc99bec4cf8d5590a3ab6519..c8ea04b06d7178c6cc992a9a1b0355a7 /** * Gets the map from the given item ID. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index b1cfea011efa985f644328486196edf5c73e72cd..67c6443c5639beafade19bc39932f30bf1001a8d 100644 +index 76e42cc79bf3f7e677e06f136fd6c1fe0d94f260..75aba8c3db5198c11e0bb9c262388632a47d93e6 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -673,6 +673,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0278-Item-Rarity-API.patch b/patches/api/0277-Item-Rarity-API.patch similarity index 100% rename from patches/api/0278-Item-Rarity-API.patch rename to patches/api/0277-Item-Rarity-API.patch diff --git a/patches/api/0279-Expose-protocol-version.patch b/patches/api/0278-Expose-protocol-version.patch similarity index 100% rename from patches/api/0279-Expose-protocol-version.patch rename to patches/api/0278-Expose-protocol-version.patch diff --git a/patches/api/0280-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/api/0280-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/api/0281-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0281-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0282-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0282-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0283-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/api/0283-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/api/0284-Added-PlayerDeepSleepEvent.patch b/patches/api/0283-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0284-Added-PlayerDeepSleepEvent.patch rename to patches/api/0283-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0285-More-World-API.patch b/patches/api/0284-More-World-API.patch similarity index 100% rename from patches/api/0285-More-World-API.patch rename to patches/api/0284-More-World-API.patch diff --git a/patches/api/0286-Added-PlayerBedFailEnterEvent.patch b/patches/api/0285-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0286-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0285-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0287-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0286-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0287-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0286-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0288-PlayerMoveEvent-Improvements.patch b/patches/api/0287-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0288-PlayerMoveEvent-Improvements.patch rename to patches/api/0287-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0289-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0289-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0290-Add-more-WanderingTrader-API.patch b/patches/api/0289-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0290-Add-more-WanderingTrader-API.patch rename to patches/api/0289-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0291-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0290-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0291-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0290-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0292-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0292-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0293-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0293-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0294-Inventory-close.patch b/patches/api/0293-Inventory-close.patch similarity index 100% rename from patches/api/0294-Inventory-close.patch rename to patches/api/0293-Inventory-close.patch diff --git a/patches/api/0295-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0295-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0296-Add-basic-Datapack-API.patch b/patches/api/0295-Add-basic-Datapack-API.patch similarity index 96% rename from patches/api/0296-Add-basic-Datapack-API.patch rename to patches/api/0295-Add-basic-Datapack-API.patch index 0069bae1d4..522d3a11c0 100644 --- a/patches/api/0296-Add-basic-Datapack-API.patch +++ b/patches/api/0295-Add-basic-Datapack-API.patch @@ -89,7 +89,7 @@ index c8ea04b06d7178c6cc992a9a1b0355a70a035152..7732d26277ca8b845898cb01c7623a2f @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 67c6443c5639beafade19bc39932f30bf1001a8d..ca4a9428e89b084436ef43099974ae7684648776 100644 +index 75aba8c3db5198c11e0bb9c262388632a47d93e6..1d2970dc4d18122e95db8cc9830aa5c41a59e24b 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1961,5 +1961,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0297-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0297-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0298-ItemStack-repair-check-API.patch b/patches/api/0297-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0298-ItemStack-repair-check-API.patch rename to patches/api/0297-ItemStack-repair-check-API.patch diff --git a/patches/api/0299-More-Enchantment-API.patch b/patches/api/0298-More-Enchantment-API.patch similarity index 100% rename from patches/api/0299-More-Enchantment-API.patch rename to patches/api/0298-More-Enchantment-API.patch diff --git a/patches/api/0300-List-all-missing-hard-depends-not-just-first.patch b/patches/api/0299-List-all-missing-hard-depends-not-just-first.patch similarity index 100% rename from patches/api/0300-List-all-missing-hard-depends-not-just-first.patch rename to patches/api/0299-List-all-missing-hard-depends-not-just-first.patch diff --git a/patches/api/0301-Add-Mob-lookAt-API.patch b/patches/api/0300-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0301-Add-Mob-lookAt-API.patch rename to patches/api/0300-Add-Mob-lookAt-API.patch diff --git a/patches/api/0302-ItemStack-editMeta.patch b/patches/api/0301-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0302-ItemStack-editMeta.patch rename to patches/api/0301-ItemStack-editMeta.patch diff --git a/patches/api/0303-Add-EntityInsideBlockEvent.patch b/patches/api/0302-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0303-Add-EntityInsideBlockEvent.patch rename to patches/api/0302-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0304-Attributes-API-for-item-defaults.patch b/patches/api/0303-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0304-Attributes-API-for-item-defaults.patch rename to patches/api/0303-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0305-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0305-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0306-More-Lidded-Block-API.patch b/patches/api/0305-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0306-More-Lidded-Block-API.patch rename to patches/api/0305-More-Lidded-Block-API.patch diff --git a/patches/api/0307-Add-PlayerKickEvent-causes.patch b/patches/api/0306-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/api/0307-Add-PlayerKickEvent-causes.patch rename to patches/api/0306-Add-PlayerKickEvent-causes.patch diff --git a/patches/api/0308-Add-PufferFishStateChangeEvent.patch b/patches/api/0307-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0308-Add-PufferFishStateChangeEvent.patch rename to patches/api/0307-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0309-Add-BellRevealRaiderEvent.patch b/patches/api/0308-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0309-Add-BellRevealRaiderEvent.patch rename to patches/api/0308-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0310-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0309-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0310-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0309-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0311-Add-more-line-of-sight-methods.patch b/patches/api/0310-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0311-Add-more-line-of-sight-methods.patch rename to patches/api/0310-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0312-Add-more-LimitedRegion-API.patch b/patches/api/0311-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0312-Add-more-LimitedRegion-API.patch rename to patches/api/0311-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0313-Missing-Entity-Behavior-API.patch b/patches/api/0312-Missing-Entity-Behavior-API.patch similarity index 61% rename from patches/api/0313-Missing-Entity-Behavior-API.patch rename to patches/api/0312-Missing-Entity-Behavior-API.patch index 4e3e31610d..0d01b16877 100644 --- a/patches/api/0313-Missing-Entity-Behavior-API.patch +++ b/patches/api/0312-Missing-Entity-Behavior-API.patch @@ -3,6 +3,8 @@ From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Fri, 28 May 2021 21:06:59 -0400 Subject: [PATCH] Missing Entity Behavior API +Co-authored-by: Nassim Jahnke +Co-authored-by: Jake Potrebic diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java index 0d88dce9978243a1f995c5fb448c5d71b01136eb..cad47139de57642fb3bb483e7a5acaa7fea78cb4 100644 @@ -108,6 +110,47 @@ index c2a566b864c82ffb094b7334d9e6e25a1bfc87d1..c340fecb61bac66baf0f44189d21bc85 + public boolean isHeadUp(); + // Paper End - More cat api } +diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java +index 821c690f8a32918bdb284ffec4af98f411f76ccc..f4664855f22ba9d6c5aa1db4f8551fe28b7d980c 100644 +--- a/src/main/java/org/bukkit/entity/Enderman.java ++++ b/src/main/java/org/bukkit/entity/Enderman.java +@@ -50,4 +50,36 @@ public interface Enderman extends Monster { + * @param blockData data to set the carried block to, or null to remove + */ + public void setCarriedBlock(@Nullable BlockData blockData); ++ ++ // Paper start ++ /** ++ * Returns whether the enderman is screaming/angry. ++ * ++ * @return whether the enderman is screaming ++ */ ++ boolean isScreaming(); ++ ++ /** ++ * Sets whether the enderman is screaming/angry. ++ * ++ * @param screaming whether the enderman is screaming ++ */ ++ void setScreaming(boolean screaming); ++ ++ /** ++ * Returns whether the enderman has been stared at. ++ * If set to true, players will hear an ambient sound. ++ * ++ * @return whether the enderman has been stared at ++ */ ++ boolean hasBeenStaredAt(); ++ ++ /** ++ * Sets whether the enderman has been stared at. ++ * If set to true, players will hear an ambient sound. ++ * ++ * @param hasBeenStaredAt whether the enderman has been stared at ++ */ ++ void setHasBeenStaredAt(boolean hasBeenStaredAt); ++ // Paper end + } diff --git a/src/main/java/org/bukkit/entity/Fox.java b/src/main/java/org/bukkit/entity/Fox.java index 498e182846b81d50b3a594254e8b341fb23e8763..3826363a1954afcddaadec7f96ac18300f8e89e9 100644 --- a/src/main/java/org/bukkit/entity/Fox.java @@ -357,3 +400,140 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..1dcc2c8f4899da029af8b1c1b2ff1b5e + boolean isSitting(); + // Paper end - Panda API } +diff --git a/src/main/java/org/bukkit/entity/PolarBear.java b/src/main/java/org/bukkit/entity/PolarBear.java +index 479f7a7c54c85cb685f56e60906650d1989c03ff..60267ee382de80fab86b440ff72a2455f427d148 100644 +--- a/src/main/java/org/bukkit/entity/PolarBear.java ++++ b/src/main/java/org/bukkit/entity/PolarBear.java +@@ -3,4 +3,21 @@ package org.bukkit.entity; + /** + * Represents a polar bear. + */ +-public interface PolarBear extends Animals {} ++// Paper start ++public interface PolarBear extends Animals { ++ ++ /** ++ * Returns whether the polar bear is standing. ++ * ++ * @return whether the polar bear is standing ++ */ ++ boolean isStanding(); ++ ++ /** ++ * Sets whether the polar bear is standing. ++ * ++ * @param standing whether the polar bear should be standing ++ */ ++ void setStanding(boolean standing); ++} ++// Paper end +diff --git a/src/main/java/org/bukkit/entity/Raider.java b/src/main/java/org/bukkit/entity/Raider.java +index 9a99b8ca1ec9c3c88b29275c88b1221e1b22bcef..756b4a7794ea0905abd4e4fe777f69ffe36658f5 100644 +--- a/src/main/java/org/bukkit/entity/Raider.java ++++ b/src/main/java/org/bukkit/entity/Raider.java +@@ -47,4 +47,20 @@ public interface Raider extends Monster { + * @param join CanJoinRaid status + */ + void setCanJoinRaid(boolean join); ++ ++ // Paper start ++ /** ++ * Returns whether the raider is celebrating a raid victory. ++ * ++ * @return whether the raider is celebrating a raid victory ++ */ ++ boolean isCelebrating(); ++ ++ /** ++ * Sets whether the raider is celebrating a raid victory. ++ * ++ * @param celebrating whether the raider is celebrating a raid victory ++ */ ++ void setCelebrating(boolean celebrating); ++ // Paper end + } +diff --git a/src/main/java/org/bukkit/entity/Trident.java b/src/main/java/org/bukkit/entity/Trident.java +index 28cdb3b544572ba7aeb9061e3163e3895ac7d4e6..c8015ff610e3c1222cb368ea1d8a0c2f3785d9c7 100644 +--- a/src/main/java/org/bukkit/entity/Trident.java ++++ b/src/main/java/org/bukkit/entity/Trident.java +@@ -3,4 +3,40 @@ package org.bukkit.entity; + /** + * Represents a thrown trident. + */ +-public interface Trident extends AbstractArrow, ThrowableProjectile { } ++// Paper start ++public interface Trident extends AbstractArrow, ThrowableProjectile { ++ ++ /** ++ * Returns whether the trident has an enchanted glow. ++ * This can be separate from the underlying item having any enchantments. ++ * ++ * @return whether the trident has an enchanted glow ++ */ ++ boolean hasGlint(); ++ ++ /** ++ * Sets whether the trident has an enchanted glow. ++ * This is separate from the underlying item having any enchantments. ++ * ++ * @param glint whether the trident should have an enchanted glow ++ */ ++ void setGlint(boolean glint); ++ ++ /** ++ * Returns the loyalty level of the trident. ++ * This can be separate from the underlying item's enchantments. ++ * ++ * @return loyalty level of the trident ++ */ ++ int getLoyaltyLevel(); ++ ++ /** ++ * Sets the loyalty level of the trident. ++ * This is separate from the underlying item's enchantments. ++ * ++ * @param loyaltyLevel loyalty level ++ * @throws IllegalArgumentException if the loyalty level is lower than 0 or greater than 127 ++ */ ++ void setLoyaltyLevel(int loyaltyLevel); ++} ++// Paper end +diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java +index 426d3693317cd303d35d8203026b528d87e401d5..8c95cd6933f11076de936854f379e6fc8600b525 100644 +--- a/src/main/java/org/bukkit/entity/Wither.java ++++ b/src/main/java/org/bukkit/entity/Wither.java +@@ -6,4 +6,34 @@ import com.destroystokyo.paper.entity.RangedEntity; + * Represents a Wither boss + */ + public interface Wither extends Monster, Boss, RangedEntity { // Paper ++ // Paper start ++ /** ++ * @return whether the wither is charged ++ */ ++ boolean isCharged(); ++ ++ /** ++ * @return ticks the wither is invulnerable for ++ */ ++ int getInvulnerableTicks(); ++ ++ /** ++ * Sets for how long in the future, the wither should be invulnerable. ++ * ++ * @param ticks ticks the wither is invulnerable for ++ */ ++ void setInvulnerableTicks(int ticks); ++ ++ /** ++ * @return whether the wither can travel through portals ++ */ ++ boolean canTravelThroughPortals(); ++ ++ /** ++ * Sets whether the wither can travel through portals. ++ * ++ * @param value whether the wither can travel through portals ++ */ ++ void setCanTravelThroughPortals(boolean value); ++ // Paper end + } diff --git a/patches/api/0314-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0313-Add-Git-information-to-version-command-on-startup.patch similarity index 100% rename from patches/api/0314-Add-Git-information-to-version-command-on-startup.patch rename to patches/api/0313-Add-Git-information-to-version-command-on-startup.patch diff --git a/patches/api/0315-Adds-PlayerArmSwingEvent.patch b/patches/api/0314-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0315-Adds-PlayerArmSwingEvent.patch rename to patches/api/0314-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0316-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0315-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0316-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0315-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0317-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0316-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0317-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0316-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0318-Stinger-API.patch b/patches/api/0317-Stinger-API.patch similarity index 100% rename from patches/api/0318-Stinger-API.patch rename to patches/api/0317-Stinger-API.patch diff --git a/patches/api/0319-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/api/0319-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/api/0320-Add-PlayerSetSpawnEvent.patch b/patches/api/0319-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0320-Add-PlayerSetSpawnEvent.patch rename to patches/api/0319-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0321-Added-EntityDamageItemEvent.patch b/patches/api/0320-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0321-Added-EntityDamageItemEvent.patch rename to patches/api/0320-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0322-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0321-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0322-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0321-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0323-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0322-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0323-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0322-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0324-Add-BlockBreakBlockEvent.patch b/patches/api/0323-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0324-Add-BlockBreakBlockEvent.patch rename to patches/api/0323-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0325-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0324-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0325-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0324-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0326-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/api/0326-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/api/0327-More-CommandBlock-API.patch b/patches/api/0326-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0327-More-CommandBlock-API.patch rename to patches/api/0326-More-CommandBlock-API.patch diff --git a/patches/api/0328-Fix-plugin-provides-load-order.patch b/patches/api/0327-Fix-plugin-provides-load-order.patch similarity index 100% rename from patches/api/0328-Fix-plugin-provides-load-order.patch rename to patches/api/0327-Fix-plugin-provides-load-order.patch diff --git a/patches/api/0329-Add-missing-team-sidebar-display-slots.patch b/patches/api/0328-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0329-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0328-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0330-add-back-EntityPortalExitEvent.patch b/patches/api/0329-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0330-add-back-EntityPortalExitEvent.patch rename to patches/api/0329-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0331-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/api/0331-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/api/0332-Get-entity-default-attributes.patch b/patches/api/0331-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0332-Get-entity-default-attributes.patch rename to patches/api/0331-Get-entity-default-attributes.patch diff --git a/patches/api/0333-Left-handed-API.patch b/patches/api/0332-Left-handed-API.patch similarity index 100% rename from patches/api/0333-Left-handed-API.patch rename to patches/api/0332-Left-handed-API.patch diff --git a/patches/api/0334-Add-advancement-display-API.patch b/patches/api/0333-Add-advancement-display-API.patch similarity index 100% rename from patches/api/0334-Add-advancement-display-API.patch rename to patches/api/0333-Add-advancement-display-API.patch diff --git a/patches/api/0335-Add-ItemFactory-getMonsterEgg-API.patch b/patches/api/0334-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/api/0335-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/api/0334-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/api/0336-Add-critical-damage-API.patch b/patches/api/0335-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0336-Add-critical-damage-API.patch rename to patches/api/0335-Add-critical-damage-API.patch diff --git a/patches/api/0337-Fix-issues-with-mob-conversion.patch b/patches/api/0336-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0337-Fix-issues-with-mob-conversion.patch rename to patches/api/0336-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0338-Add-isCollidable-methods-to-various-places.patch b/patches/api/0337-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0338-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0337-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0339-Goat-ram-API.patch b/patches/api/0338-Goat-ram-API.patch similarity index 100% rename from patches/api/0339-Goat-ram-API.patch rename to patches/api/0338-Goat-ram-API.patch diff --git a/patches/api/0340-Add-API-for-resetting-a-single-score.patch b/patches/api/0339-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0340-Add-API-for-resetting-a-single-score.patch rename to patches/api/0339-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0341-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch similarity index 96% rename from patches/api/0341-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch index c610203889..d71e8a9daf 100644 --- a/patches/api/0341-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 329612597a2cdf556f5ca970f5409e1c77a5d911..ec8328ecd1d4d555d1f411c70f15347cd7aacf67 100644 +index 54b0fe21d3b6379e6550a3b1dc81c2a44e7699da..b39d1474210da1974d7e95f10daaf496a9330442 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -112,6 +112,14 @@ public interface UnsafeValues { diff --git a/patches/api/0342-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0341-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0342-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0341-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0343-Add-player-health-update-API.patch b/patches/api/0342-Add-player-health-update-API.patch similarity index 100% rename from patches/api/0343-Add-player-health-update-API.patch rename to patches/api/0342-Add-player-health-update-API.patch diff --git a/patches/api/0344-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 97% rename from patches/api/0344-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch index 554fdecaf1..be873543de 100644 --- a/patches/api/0344-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch @@ -34,7 +34,7 @@ index 2af2a948dc9c0d4ad28fccb1c9a2b28d5db99203..416d402b7e885ccc9b187a8e8111da23 * Creates a boss bar instance to display to players. The progress * defaults to 1.0 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index ca4a9428e89b084436ef43099974ae7684648776..32f84a04add01a244e4abba4c7e1c1183aa62db1 100644 +index 1d2970dc4d18122e95db8cc9830aa5c41a59e24b..d90026c9331321ca749f7090b76c21b4608b2ee8 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1553,6 +1553,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0345-Add-more-Campfire-API.patch b/patches/api/0344-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0345-Add-more-Campfire-API.patch rename to patches/api/0344-Add-more-Campfire-API.patch diff --git a/patches/api/0346-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch similarity index 100% rename from patches/api/0346-Move-VehicleCollisionEvent-HandlerList-up.patch rename to patches/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch diff --git a/patches/api/0347-Improve-scoreboard-entries.patch b/patches/api/0346-Improve-scoreboard-entries.patch similarity index 98% rename from patches/api/0347-Improve-scoreboard-entries.patch rename to patches/api/0346-Improve-scoreboard-entries.patch index c608060558..34c175dad7 100644 --- a/patches/api/0347-Improve-scoreboard-entries.patch +++ b/patches/api/0346-Improve-scoreboard-entries.patch @@ -37,7 +37,7 @@ index 75acd6f8f3d774bb79e8e513125e801c5569a244..b93b1b0428d11589605c8edf5c053369 + // Paper end } diff --git a/src/main/java/org/bukkit/scoreboard/Scoreboard.java b/src/main/java/org/bukkit/scoreboard/Scoreboard.java -index f7754ab421c7b452a53c28d1e2fafdccfbba24bf..9a395b138be3f6fa9a52639f0ac4070c23f7d77c 100644 +index 1ada91d790abedbc9b3aeb6e96467a0d78560f15..fc3456bb79f2fe1504359455b937c162780110c2 100644 --- a/src/main/java/org/bukkit/scoreboard/Scoreboard.java +++ b/src/main/java/org/bukkit/scoreboard/Scoreboard.java @@ -163,9 +163,8 @@ public interface Scoreboard { diff --git a/patches/api/0348-Entity-powdered-snow-API.patch b/patches/api/0347-Entity-powdered-snow-API.patch similarity index 100% rename from patches/api/0348-Entity-powdered-snow-API.patch rename to patches/api/0347-Entity-powdered-snow-API.patch diff --git a/patches/api/0349-Add-API-for-item-entity-health.patch b/patches/api/0348-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0349-Add-API-for-item-entity-health.patch rename to patches/api/0348-Add-API-for-item-entity-health.patch diff --git a/patches/api/0350-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0350-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0351-Bucketable-API.patch b/patches/api/0350-Bucketable-API.patch similarity index 100% rename from patches/api/0351-Bucketable-API.patch rename to patches/api/0350-Bucketable-API.patch diff --git a/patches/api/0352-System-prop-for-default-config-comment-parsing.patch b/patches/api/0351-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0352-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0351-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0353-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0352-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0353-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0352-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0354-Remove-upstream-snakeyaml-fix.patch b/patches/api/0353-Remove-upstream-snakeyaml-fix.patch similarity index 100% rename from patches/api/0354-Remove-upstream-snakeyaml-fix.patch rename to patches/api/0353-Remove-upstream-snakeyaml-fix.patch diff --git a/patches/api/0355-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0354-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/api/0355-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/api/0354-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/api/0356-Multiple-Entries-with-Scoreboards.patch b/patches/api/0355-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0356-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0355-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0357-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0357-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0358-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0357-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0358-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0357-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0359-Multi-Block-Change-API.patch b/patches/api/0358-Multi-Block-Change-API.patch similarity index 100% rename from patches/api/0359-Multi-Block-Change-API.patch rename to patches/api/0358-Multi-Block-Change-API.patch diff --git a/patches/api/0360-Fix-NotePlayEvent.patch b/patches/api/0359-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0360-Fix-NotePlayEvent.patch rename to patches/api/0359-Fix-NotePlayEvent.patch diff --git a/patches/api/0361-Freeze-Tick-Lock-API.patch b/patches/api/0360-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/api/0361-Freeze-Tick-Lock-API.patch rename to patches/api/0360-Freeze-Tick-Lock-API.patch diff --git a/patches/api/0362-Dolphin-API.patch b/patches/api/0361-Dolphin-API.patch similarity index 100% rename from patches/api/0362-Dolphin-API.patch rename to patches/api/0361-Dolphin-API.patch diff --git a/patches/api/0363-More-PotionEffectType-API.patch b/patches/api/0362-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0363-More-PotionEffectType-API.patch rename to patches/api/0362-More-PotionEffectType-API.patch diff --git a/patches/api/0364-Expand-the-Registry-API.patch b/patches/api/0363-Expand-the-Registry-API.patch similarity index 100% rename from patches/api/0364-Expand-the-Registry-API.patch rename to patches/api/0363-Expand-the-Registry-API.patch diff --git a/patches/api/0365-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 95% rename from patches/api/0365-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch index 36ab64333c..69107d315e 100644 --- a/patches/api/0365-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch @@ -30,7 +30,7 @@ index 416d402b7e885ccc9b187a8e8111da2378197b45..795f8c0aa3929f6de4b4ea4b139bef8b * Gets the folder that contains all of the various {@link World}s. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 32f84a04add01a244e4abba4c7e1c1183aa62db1..a62c27777672eff1c488517b37876e3a44a2d57d 100644 +index d90026c9331321ca749f7090b76c21b4608b2ee8..79120b42a3993beda1e3474fa4b722402e9d849f 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1151,6 +1151,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0366-Implement-regenerateChunk.patch b/patches/api/0365-Implement-regenerateChunk.patch similarity index 100% rename from patches/api/0366-Implement-regenerateChunk.patch rename to patches/api/0365-Implement-regenerateChunk.patch diff --git a/patches/api/0367-Don-t-load-plugins-prefixed-with-a-dot.patch b/patches/api/0366-Don-t-load-plugins-prefixed-with-a-dot.patch similarity index 100% rename from patches/api/0367-Don-t-load-plugins-prefixed-with-a-dot.patch rename to patches/api/0366-Don-t-load-plugins-prefixed-with-a-dot.patch diff --git a/patches/api/0368-Add-GameEvent-tags.patch b/patches/api/0367-Add-GameEvent-tags.patch similarity index 100% rename from patches/api/0368-Add-GameEvent-tags.patch rename to patches/api/0367-Add-GameEvent-tags.patch diff --git a/patches/api/0369-Furnace-RecipesUsed-API.patch b/patches/api/0368-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0369-Furnace-RecipesUsed-API.patch rename to patches/api/0368-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0370-Configurable-sculk-sensor-listener-range.patch b/patches/api/0369-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0370-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0369-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0371-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0370-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0371-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0370-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0372-Custom-Potion-Mixes.patch b/patches/api/0371-Custom-Potion-Mixes.patch similarity index 98% rename from patches/api/0372-Custom-Potion-Mixes.patch rename to patches/api/0371-Custom-Potion-Mixes.patch index 9ec547303b..55a3c3f3e3 100644 --- a/patches/api/0372-Custom-Potion-Mixes.patch +++ b/patches/api/0371-Custom-Potion-Mixes.patch @@ -122,7 +122,7 @@ index 795f8c0aa3929f6de4b4ea4b139bef8b672ab97a..944f9b87a11472ac6d7e328acc00bf09 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index a62c27777672eff1c488517b37876e3a44a2d57d..cca362e54d6ff4a5a1e60f85a7eb1b3d222d3d48 100644 +index 79120b42a3993beda1e3474fa4b722402e9d849f..f63587cfa651a3893d2efa3730dc80f271d56b1c 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1995,5 +1995,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0373-Expose-furnace-minecart-push-values.patch b/patches/api/0372-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0373-Expose-furnace-minecart-push-values.patch rename to patches/api/0372-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0276-Turtle-API.patch b/patches/server/0276-Turtle-API.patch index 619fa7ebfc..fb6ff88d30 100644 --- a/patches/server/0276-Turtle-API.patch +++ b/patches/server/0276-Turtle-API.patch @@ -52,10 +52,10 @@ index ea1bb6924043dfd05452b793afd7651c867de5dc..1b0be28ebfd7ec2f978b5d87f6d26e4d @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java -index ed08089f21c8958fc9fc7e6e73a2b6ff9108242c..a3849ebba14b47b33f1af57c47f94c02aebea232 100644 +index ed08089f21c8958fc9fc7e6e73a2b6ff9108242c..b78289dd6a71b962c02247af578e939bc97847c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java -@@ -24,4 +24,36 @@ public class CraftTurtle extends CraftAnimals implements Turtle { +@@ -24,4 +24,41 @@ public class CraftTurtle extends CraftAnimals implements Turtle { public EntityType getType() { return EntityType.TURTLE; } @@ -90,5 +90,10 @@ index ed08089f21c8958fc9fc7e6e73a2b6ff9108242c..a3849ebba14b47b33f1af57c47f94c02 + public void setHasEgg(boolean hasEgg) { + getHandle().setHasEgg(hasEgg); + } ++ ++ @Override ++ public boolean isLayingEgg() { ++ return this.getHandle().isLayingEgg(); ++ } + // Paper end } diff --git a/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0587-added-Wither-API.patch b/patches/server/0587-added-Wither-API.patch deleted file mode 100644 index 80d4af7f38..0000000000 --- a/patches/server/0587-added-Wither-API.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Sun, 5 Jul 2020 15:39:19 -0700 -Subject: [PATCH] added Wither API - - -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 32b302aad0319ce3ee412912425c1c8db9979f8a..92734f767fde60351a179a88350a97b861be0e88 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 - return entityliving.getMobType() != MobType.UNDEAD && entityliving.attackable(); - }; - private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0D).selector(WitherBoss.LIVING_ENTITY_SELECTOR); -+ // Paper start -+ private boolean canPortal = false; -+ -+ public void setCanTravelThroughPortals(boolean canPortal) { this.canPortal = canPortal; } -+ // Paper end - - public WitherBoss(EntityType type, Level world) { - super(type, world); -@@ -602,7 +607,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob - - @Override - public boolean canChangeDimensions() { -- return false; -+ return super.canChangeDimensions() && canPortal; // Paper - } - - @Override -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java -index 640b0860fbe3412da32d03187e6f355ba8f099ea..299d5e47489cfe489ac130a33a08cdb29ba76d72 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java -@@ -38,4 +38,31 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok - public BossBar getBossBar() { - return this.bossBar; - } -+ -+ // Paper start -+ @Override -+ public boolean isCharged() { -+ return getHandle().isPowered(); -+ } -+ -+ @Override -+ public int getInvulnerableTicks() { -+ return getHandle().getInvulnerableTicks(); -+ } -+ -+ @Override -+ public void setInvulnerableTicks(int ticks) { -+ getHandle().setInvulnerableTicks(ticks); -+ } -+ -+ @Override -+ public boolean canTravelThroughPortals() { -+ return getHandle().canChangeDimensions(); -+ } -+ -+ @Override -+ public void setCanTravelThroughPortals(boolean value) { -+ getHandle().setCanTravelThroughPortals(value); -+ } -+ // Paper end - } diff --git a/patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0592-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0591-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0592-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0591-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0593-add-DragonEggFormEvent.patch b/patches/server/0592-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0593-add-DragonEggFormEvent.patch rename to patches/server/0592-add-DragonEggFormEvent.patch diff --git a/patches/server/0594-EntityMoveEvent.patch b/patches/server/0593-EntityMoveEvent.patch similarity index 100% rename from patches/server/0594-EntityMoveEvent.patch rename to patches/server/0593-EntityMoveEvent.patch diff --git a/patches/server/0595-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0594-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0595-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0594-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0596-Inline-shift-direction-fields.patch b/patches/server/0595-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0596-Inline-shift-direction-fields.patch rename to patches/server/0595-Inline-shift-direction-fields.patch diff --git a/patches/server/0597-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0596-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0597-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0596-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0598-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0598-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0599-living-entity-allow-attribute-registration.patch b/patches/server/0598-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0599-living-entity-allow-attribute-registration.patch rename to patches/server/0598-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0600-fix-dead-slime-setSize-invincibility.patch b/patches/server/0599-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0600-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0599-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0601-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0600-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0601-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0600-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0602-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0601-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0602-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0601-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0603-Expose-Tracked-Players.patch b/patches/server/0602-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0603-Expose-Tracked-Players.patch rename to patches/server/0602-Expose-Tracked-Players.patch diff --git a/patches/server/0604-Remove-streams-from-SensorNearest.patch b/patches/server/0603-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0604-Remove-streams-from-SensorNearest.patch rename to patches/server/0603-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0605-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0604-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0605-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0604-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0606-Improve-ServerGUI.patch b/patches/server/0605-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0606-Improve-ServerGUI.patch rename to patches/server/0605-Improve-ServerGUI.patch diff --git a/patches/server/0607-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0607-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0608-fix-converting-txt-to-json-file.patch b/patches/server/0607-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0608-fix-converting-txt-to-json-file.patch rename to patches/server/0607-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0609-Add-worldborder-events.patch b/patches/server/0608-Add-worldborder-events.patch similarity index 100% rename from patches/server/0609-Add-worldborder-events.patch rename to patches/server/0608-Add-worldborder-events.patch diff --git a/patches/server/0610-added-PlayerNameEntityEvent.patch b/patches/server/0609-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0610-added-PlayerNameEntityEvent.patch rename to patches/server/0609-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0611-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0610-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0611-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0610-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0612-Add-recipe-to-cook-events.patch b/patches/server/0611-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0612-Add-recipe-to-cook-events.patch rename to patches/server/0611-Add-recipe-to-cook-events.patch diff --git a/patches/server/0613-Add-Block-isValidTool.patch b/patches/server/0612-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0613-Add-Block-isValidTool.patch rename to patches/server/0612-Add-Block-isValidTool.patch diff --git a/patches/server/0614-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0613-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0614-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0613-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0615-Implement-Keyed-on-World.patch b/patches/server/0614-Implement-Keyed-on-World.patch similarity index 96% rename from patches/server/0615-Implement-Keyed-on-World.patch rename to patches/server/0614-Implement-Keyed-on-World.patch index 6c9519f39b..891f329487 100644 --- a/patches/server/0615-Implement-Keyed-on-World.patch +++ b/patches/server/0614-Implement-Keyed-on-World.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Keyed on World diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6124142faeeb792c0f7f6c167f8da47af446cba9..153c2551544dffe36e836fa62f2752160e2cd64a 100644 +index 841d984292b7d3d7610a671b7f6192d6cbd48835..48e2d5e2b53e32af53387f2e63c67ff9e0a7c5bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1231,7 +1231,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0616-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0615-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0616-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0615-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0617-Item-Rarity-API.patch b/patches/server/0616-Item-Rarity-API.patch similarity index 100% rename from patches/server/0617-Item-Rarity-API.patch rename to patches/server/0616-Item-Rarity-API.patch diff --git a/patches/server/0618-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0618-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0619-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0618-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0619-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0618-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0620-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0619-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0620-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0619-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0621-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0620-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0621-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0620-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0622-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0622-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0623-Entity-load-save-limit-per-chunk.patch b/patches/server/0622-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0623-Entity-load-save-limit-per-chunk.patch rename to patches/server/0622-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0624-Expose-protocol-version.patch b/patches/server/0623-Expose-protocol-version.patch similarity index 100% rename from patches/server/0624-Expose-protocol-version.patch rename to patches/server/0623-Expose-protocol-version.patch diff --git a/patches/server/0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/server/0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/server/0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 99% rename from patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch index 0fe6d987f6..aeffa16121 100644 --- a/patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch +++ b/patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index c75005b934271e4b8864d949052d56465571f011..4a7e4c2038dd4a7496ed4084a19f31a611ee319a 100644 +index 327e39646bd2ab398d9da582d4620052c3c92bc1..f06ba478f3ed7c333cba18c2443d62f0eb01d4d7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -106,6 +106,13 @@ public class PaperConfig { diff --git a/patches/server/0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0628-Add-bypass-host-check.patch b/patches/server/0627-Add-bypass-host-check.patch similarity index 95% rename from patches/server/0628-Add-bypass-host-check.patch rename to patches/server/0627-Add-bypass-host-check.patch index a9a87f8a74..5e9b983ad1 100644 --- a/patches/server/0628-Add-bypass-host-check.patch +++ b/patches/server/0627-Add-bypass-host-check.patch @@ -8,7 +8,7 @@ Paper.bypassHostCheck Seriously, fix your firewalls. -.- diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java -index 54de844431cf9cc88d6e82014d5eb69babd7784c..b5b929a504164aefd2498cd9fad66a5c7aaf59e4 100644 +index 8060d6461835d5b5b4429e9b280d08eae4e435e9..f74b6d2110e51c76eeb1aea7665153509b6e6371 100644 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java @@ -30,6 +30,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL diff --git a/patches/server/0629-Set-area-affect-cloud-rotation.patch b/patches/server/0628-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0629-Set-area-affect-cloud-rotation.patch rename to patches/server/0628-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0630-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0629-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0630-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0629-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0631-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0630-Fix-duplicating-give-items-on-item-drop-cancel.patch similarity index 100% rename from patches/server/0631-Fix-duplicating-give-items-on-item-drop-cancel.patch rename to patches/server/0630-Fix-duplicating-give-items-on-item-drop-cancel.patch diff --git a/patches/server/0632-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0631-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0632-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0631-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0633-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0632-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0633-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0632-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0634-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0633-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0634-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0633-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0635-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0634-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0635-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0634-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0636-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0635-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0636-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0635-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0637-Added-PlayerDeepSleepEvent.patch b/patches/server/0636-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0637-Added-PlayerDeepSleepEvent.patch rename to patches/server/0636-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0638-More-World-API.patch b/patches/server/0637-More-World-API.patch similarity index 100% rename from patches/server/0638-More-World-API.patch rename to patches/server/0637-More-World-API.patch diff --git a/patches/server/0639-Added-PlayerBedFailEnterEvent.patch b/patches/server/0638-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0639-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0638-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0640-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0639-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0640-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0639-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0642-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0641-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0642-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0641-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0643-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0642-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0643-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0642-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0644-Add-Channel-initialization-listeners.patch b/patches/server/0643-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0644-Add-Channel-initialization-listeners.patch rename to patches/server/0643-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0645-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0644-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0645-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0644-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0646-Add-more-WanderingTrader-API.patch b/patches/server/0645-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0646-Add-more-WanderingTrader-API.patch rename to patches/server/0645-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0647-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0646-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0647-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0646-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0650-Inventory-close.patch b/patches/server/0649-Inventory-close.patch similarity index 100% rename from patches/server/0650-Inventory-close.patch rename to patches/server/0649-Inventory-close.patch diff --git a/patches/server/0651-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0650-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0651-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0650-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0653-Fix-CraftPotionBrewer-cache.patch b/patches/server/0652-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0653-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0652-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0654-Add-basic-Datapack-API.patch b/patches/server/0653-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0654-Add-basic-Datapack-API.patch rename to patches/server/0653-Add-basic-Datapack-API.patch diff --git a/patches/server/0655-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0654-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0655-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0654-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0656-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0655-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0656-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0655-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0657-ItemStack-repair-check-API.patch b/patches/server/0656-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0657-ItemStack-repair-check-API.patch rename to patches/server/0656-ItemStack-repair-check-API.patch diff --git a/patches/server/0658-More-Enchantment-API.patch b/patches/server/0657-More-Enchantment-API.patch similarity index 100% rename from patches/server/0658-More-Enchantment-API.patch rename to patches/server/0657-More-Enchantment-API.patch diff --git a/patches/server/0659-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0658-Fix-and-optimise-world-force-upgrading.patch similarity index 99% rename from patches/server/0659-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0658-Fix-and-optimise-world-force-upgrading.patch index 18f64f42aa..b110c0d528 100644 --- a/patches/server/0659-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0658-Fix-and-optimise-world-force-upgrading.patch @@ -272,7 +272,7 @@ index 69dc1271be0a3f3f2fb4ce15981ed25d24dce785..1e0d261439255091a6f61485c0747231 Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1cac02ba1eced8c1cda0de750dfe640acdca21c0..e2f647f3bdacd950ba098103d82a6f4f90794f36 100644 +index abb6b8f3b69826d69956a248770fc7b87745ba9a..5a2c5dc61580ff343ca96561fa56400c31995529 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -557,11 +557,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Date: Mon, 21 Jun 2021 23:56:07 -0400 Subject: [PATCH] Missing Entity Behavior API +Co-authored-by: Nassim Jahnke +Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java index cd278a859c87fc89c421378ffab1bd36a45bd65d..a726006888bbbdb290bcda3ac4fd45d68ba51b79 100644 @@ -35,6 +37,52 @@ index cd278a859c87fc89c421378ffab1bd36a45bd65d..a726006888bbbdb290bcda3ac4fd45d6 public void setStanding(boolean angry) { if (angry) { this.setEating(false); +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 32b302aad0319ce3ee412912425c1c8db9979f8a..92734f767fde60351a179a88350a97b861be0e88 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 + return entityliving.getMobType() != MobType.UNDEAD && entityliving.attackable(); + }; + private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0D).selector(WitherBoss.LIVING_ENTITY_SELECTOR); ++ // Paper start ++ private boolean canPortal = false; ++ ++ public void setCanTravelThroughPortals(boolean canPortal) { this.canPortal = canPortal; } ++ // Paper end + + public WitherBoss(EntityType type, Level world) { + super(type, world); +@@ -602,7 +607,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob + + @Override + public boolean canChangeDimensions() { +- return false; ++ return super.canChangeDimensions() && canPortal; // Paper + } + + @Override +diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +index 4920f5465298b4da33b53f80b8af6220cb0e8ccc..411eb4d495907aa1d646673bf07d56ff01e52eee 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java ++++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +@@ -429,6 +429,16 @@ public class EnderMan extends Monster implements NeutralMob { + this.entityData.set(EnderMan.DATA_STARED_AT, true); + } + ++ // Paper start ++ public void setCreepy(boolean creepy) { ++ this.entityData.set(EnderMan.DATA_CREEPY, creepy); ++ } ++ ++ public void setHasBeenStaredAt(boolean hasBeenStaredAt) { ++ this.entityData.set(EnderMan.DATA_STARED_AT, hasBeenStaredAt); ++ } ++ // Paper end ++ + @Override + public boolean requiresCustomPersistence() { + return super.requiresCustomPersistence() || this.getCarriedBlock() != null; diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java index f834e96c48cce6af65a65dafcdeb2cf0ea12763a..77a5f8339df5a46967713b51570735de828f0b49 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java @@ -52,6 +100,31 @@ index f834e96c48cce6af65a65dafcdeb2cf0ea12763a..77a5f8339df5a46967713b51570735de @Override protected boolean shouldDespawnInPeaceful() { return true; +diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java +index a367f50b0e3fe9e7a1b87892a8c98e88bd678f6f..1b31b32d42eeb54680b902cd7e82d10ba7daa5d0 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java +@@ -105,6 +105,20 @@ public class ThrownTrident extends AbstractArrow { + return (Boolean) this.entityData.get(ThrownTrident.ID_FOIL); + } + ++ // Paper start ++ public void setFoil(boolean foil) { ++ this.entityData.set(ThrownTrident.ID_FOIL, foil); ++ } ++ ++ public int getLoyalty() { ++ return this.entityData.get(ThrownTrident.ID_LOYALTY); ++ } ++ ++ public void setLoyalty(byte loyalty) { ++ this.entityData.set(ThrownTrident.ID_LOYALTY, loyalty); ++ } ++ // Paper end ++ + @Nullable + @Override + protected EntityHitResult findHitEntity(Vec3 currentPosition, Vec3 nextPosition) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java index 254d4f2e45d7c8f572a4368eccd84560d4d0d836..299ab868252c8f326e3a56e878c9ee230c9635dc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -123,6 +196,39 @@ index a4f909123de26d911aea7cd767d2315ed1f697c9..0eee53c068bca070a86645d0ba54fb1a + } + // Paper End - More cat api } +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java +index ae669a970aa1f17ed786640de8a481364543c58e..acdc4e578d70f8121c8c6be7682ba1ecef7687cf 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java +@@ -39,6 +39,28 @@ public class CraftEnderman extends CraftMonster implements Enderman { + this.getHandle().setCarriedBlock(blockData == null ? null : ((CraftBlockData) blockData).getState()); + } + ++ // Paper start ++ @Override ++ public boolean isScreaming() { ++ return this.getHandle().isCreepy(); ++ } ++ ++ @Override ++ public void setScreaming(boolean screaming) { ++ this.getHandle().setCreepy(screaming); ++ } ++ ++ @Override ++ public boolean hasBeenStaredAt() { ++ return this.getHandle().hasBeenStaredAt(); ++ } ++ ++ @Override ++ public void setHasBeenStaredAt(boolean hasBeenStaredAt) { ++ this.getHandle().setHasBeenStaredAt(hasBeenStaredAt); ++ } ++ // Paper end ++ + @Override + public EnderMan getHandle() { + return (EnderMan) entity; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java index b647a5b9fdc1da61c4035d6f2cef7814033dc608..9795341efa748c2d94567e882cd5f26adf0f1591 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java @@ -287,3 +393,113 @@ index 2d2620dbb16aec850e8afda02174508a4be5a313..ba4e6deaaa725296be830324d2c64868 public static Gene fromNms(net.minecraft.world.entity.animal.Panda.Gene gene) { Preconditions.checkArgument(gene != null, "Gene may not be null"); +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java +index da1488c9cae53bd554727c850da2192adda2478a..30a0eac179c86b0fe94a2a40b5bfcd3eee01e53b 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java +@@ -23,4 +23,16 @@ public class CraftPolarBear extends CraftAnimals implements PolarBear { + public EntityType getType() { + return EntityType.POLAR_BEAR; + } ++ ++ // Paper start ++ @Override ++ public boolean isStanding() { ++ return this.getHandle().isStanding(); ++ } ++ ++ @Override ++ public void setStanding(boolean standing) { ++ this.getHandle().setStanding(standing); ++ } ++ // Paper end + } +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java +index 27a8a2b1e03254b1fc6fe8edc3ff77841a42f5f6..8d77b870fd9de69b57ae1affdfbd2a02f62e75c7 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java +@@ -58,4 +58,16 @@ public abstract class CraftRaider extends CraftMonster implements Raider { + public void setCanJoinRaid(boolean join) { + this.getHandle().setCanJoinRaid(join); + } ++ ++ // Paper start ++ @Override ++ public boolean isCelebrating() { ++ return this.getHandle().isCelebrating(); ++ } ++ ++ @Override ++ public void setCelebrating(boolean celebrating) { ++ this.getHandle().setCelebrating(celebrating); ++ } ++ // Paper end + } +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java +index bf5b2fd6676c4430578db4cc6c603c501cc5e349..832981b07ef5c633ef00a382f56798ee87eec0df 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java +@@ -37,4 +37,27 @@ public class CraftTrident extends CraftArrow implements Trident { + public EntityType getType() { + return EntityType.TRIDENT; + } ++ ++ // Paper start ++ @Override ++ public boolean hasGlint() { ++ return this.getHandle().isFoil(); ++ } ++ ++ @Override ++ public void setGlint(boolean glint) { ++ this.getHandle().setFoil(glint); ++ } ++ ++ @Override ++ public int getLoyaltyLevel() { ++ return this.getHandle().getLoyalty(); ++ } ++ ++ @Override ++ public void setLoyaltyLevel(int loyaltyLevel) { ++ com.google.common.base.Preconditions.checkArgument(loyaltyLevel >= 0 && loyaltyLevel <= 127, "The loyalty level has to be between 0 and 127"); ++ this.getHandle().setLoyalty((byte) loyaltyLevel); ++ } ++ // Paper end + } +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +index 640b0860fbe3412da32d03187e6f355ba8f099ea..299d5e47489cfe489ac130a33a08cdb29ba76d72 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +@@ -38,4 +38,31 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok + public BossBar getBossBar() { + return this.bossBar; + } ++ ++ // Paper start ++ @Override ++ public boolean isCharged() { ++ return getHandle().isPowered(); ++ } ++ ++ @Override ++ public int getInvulnerableTicks() { ++ return getHandle().getInvulnerableTicks(); ++ } ++ ++ @Override ++ public void setInvulnerableTicks(int ticks) { ++ getHandle().setInvulnerableTicks(ticks); ++ } ++ ++ @Override ++ public boolean canTravelThroughPortals() { ++ return getHandle().canChangeDimensions(); ++ } ++ ++ @Override ++ public void setCanTravelThroughPortals(boolean value) { ++ getHandle().setCanTravelThroughPortals(value); ++ } ++ // Paper end + } diff --git a/patches/server/0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0686-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0685-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0686-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0685-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0687-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0686-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0687-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0686-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0688-Adds-PlayerArmSwingEvent.patch b/patches/server/0687-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0688-Adds-PlayerArmSwingEvent.patch rename to patches/server/0687-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0690-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0689-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0690-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0689-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0691-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0690-Fix-incorrect-message-for-outdated-client.patch similarity index 94% rename from patches/server/0691-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0690-Fix-incorrect-message-for-outdated-client.patch index 87ff34d0b8..1b0f3a3869 100644 --- a/patches/server/0691-Fix-incorrect-message-for-outdated-client.patch +++ b/patches/server/0690-Fix-incorrect-message-for-outdated-client.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix incorrect message for outdated client diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java -index 97ee159867c4800c8fdec9a5fa42f648112be186..150050fb343ef6119204b7d5220207765a6937bc 100644 +index e76b9670213de966ee275e624e7ee5f673d3f210..e8a79277f3e57bc82d67ada6543c7f8665311bd3 100644 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java @@ -81,7 +81,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL diff --git a/patches/server/0692-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0691-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0692-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0691-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0693-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0693-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0695-Stinger-API.patch b/patches/server/0694-Stinger-API.patch similarity index 100% rename from patches/server/0695-Stinger-API.patch rename to patches/server/0694-Stinger-API.patch diff --git a/patches/server/0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0697-Add-System.out-err-catcher.patch b/patches/server/0696-Add-System.out-err-catcher.patch similarity index 98% rename from patches/server/0697-Add-System.out-err-catcher.patch rename to patches/server/0696-Add-System.out-err-catcher.patch index 704b758183..dde83aa3c8 100644 --- a/patches/server/0697-Add-System.out-err-catcher.patch +++ b/patches/server/0696-Add-System.out-err-catcher.patch @@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2256a680d4f53d143e4ebfd82221074a84a86fdc..1b2aec9215d82a8ad60439a8ac38651319c0bdef 100644 +index 99a679945337f412fe7d1c51280b05b5b0bcfb5b..0537f6661b145f4d0f8dd58dde45fb9eebb40561 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -282,6 +282,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0698-Fix-test-not-bootstrapping.patch b/patches/server/0697-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0698-Fix-test-not-bootstrapping.patch rename to patches/server/0697-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0700-Improve-boat-collision-performance.patch b/patches/server/0699-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0700-Improve-boat-collision-performance.patch rename to patches/server/0699-Improve-boat-collision-performance.patch diff --git a/patches/server/0701-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0701-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0702-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0702-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0703-Add-PlayerSetSpawnEvent.patch b/patches/server/0702-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0703-Add-PlayerSetSpawnEvent.patch rename to patches/server/0702-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0704-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0704-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0705-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0704-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0705-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0704-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0706-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0705-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0706-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0705-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0707-Added-EntityDamageItemEvent.patch b/patches/server/0706-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0707-Added-EntityDamageItemEvent.patch rename to patches/server/0706-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0708-Optimize-indirect-passenger-iteration.patch b/patches/server/0707-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0708-Optimize-indirect-passenger-iteration.patch rename to patches/server/0707-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0709-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0709-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0710-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0710-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0711-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0710-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0711-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0710-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0712-Clear-bucket-NBT-after-dispense.patch b/patches/server/0711-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0712-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0711-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0712-Respect-despawn-rate-in-item-merge-check.patch similarity index 100% rename from patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch rename to patches/server/0712-Respect-despawn-rate-in-item-merge-check.patch diff --git a/patches/server/0714-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0713-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0714-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0713-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0715-Add-BlockBreakBlockEvent.patch b/patches/server/0714-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0715-Add-BlockBreakBlockEvent.patch rename to patches/server/0714-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0717-More-CommandBlock-API.patch b/patches/server/0716-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0717-More-CommandBlock-API.patch rename to patches/server/0716-More-CommandBlock-API.patch diff --git a/patches/server/0718-Add-missing-team-sidebar-display-slots.patch b/patches/server/0717-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0718-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0717-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0719-Add-back-EntityPortalExitEvent.patch b/patches/server/0718-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0719-Add-back-EntityPortalExitEvent.patch rename to patches/server/0718-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0720-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0719-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0720-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0719-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0721-Get-entity-default-attributes.patch b/patches/server/0720-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0721-Get-entity-default-attributes.patch rename to patches/server/0720-Get-entity-default-attributes.patch diff --git a/patches/server/0722-Left-handed-API.patch b/patches/server/0721-Left-handed-API.patch similarity index 100% rename from patches/server/0722-Left-handed-API.patch rename to patches/server/0721-Left-handed-API.patch diff --git a/patches/server/0723-Add-advancement-display-API.patch b/patches/server/0722-Add-advancement-display-API.patch similarity index 100% rename from patches/server/0723-Add-advancement-display-API.patch rename to patches/server/0722-Add-advancement-display-API.patch diff --git a/patches/server/0724-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0723-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/server/0724-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/server/0723-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/server/0725-Add-critical-damage-API.patch b/patches/server/0724-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0725-Add-critical-damage-API.patch rename to patches/server/0724-Add-critical-damage-API.patch diff --git a/patches/server/0726-Fix-issues-with-mob-conversion.patch b/patches/server/0725-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0726-Fix-issues-with-mob-conversion.patch rename to patches/server/0725-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0727-Add-isCollidable-methods-to-various-places.patch b/patches/server/0726-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0727-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0726-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0728-Goat-ram-API.patch b/patches/server/0727-Goat-ram-API.patch similarity index 100% rename from patches/server/0728-Goat-ram-API.patch rename to patches/server/0727-Goat-ram-API.patch diff --git a/patches/server/0729-Add-API-for-resetting-a-single-score.patch b/patches/server/0728-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0729-Add-API-for-resetting-a-single-score.patch rename to patches/server/0728-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch similarity index 97% rename from patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch index 39fb7967f8..d7e938d57a 100644 --- a/patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch @@ -45,7 +45,7 @@ index 23f3acdc37968ec76ffb57e022755c97ff02ff67..9e5f338d0bb64ac47a99cd08a2ab083d // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index a451cbbff84b8f156ba4de807f4927f7645c3363..e504554e606788b66725edb0ce98d3d6246e4fac 100644 +index 17e67d32522ddeb9a8db06089fb7b7f3ed894d4d..bda04a3a7865cfaf6eff7a40b3f12fa3145771e9 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -457,6 +457,30 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0731-Vanilla-command-permission-fixes.patch b/patches/server/0730-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0731-Vanilla-command-permission-fixes.patch rename to patches/server/0730-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0732-Make-CallbackExecutor-strict-again.patch b/patches/server/0731-Make-CallbackExecutor-strict-again.patch similarity index 95% rename from patches/server/0732-Make-CallbackExecutor-strict-again.patch rename to patches/server/0731-Make-CallbackExecutor-strict-again.patch index b1f2cffeba..d2fcbba34f 100644 --- a/patches/server/0732-Make-CallbackExecutor-strict-again.patch +++ b/patches/server/0731-Make-CallbackExecutor-strict-again.patch @@ -10,7 +10,7 @@ schedules. Effectively, use the callback executor as a tool of finding issues rather than hiding these issues. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 4f7894d9458733a5bf42e6d1094db2aaf5ae8ea0..7595f2bd6b26946e9f437dbd962a3b23e95a52b6 100644 +index 9d9312cb8e9681428f7ab1b1e6eb803fc558d651..edb35a483ae44073d560df1fe949aad60bf3d39d 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -164,17 +164,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0732-Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 100% rename from patches/server/0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/server/0732-Do-not-allow-the-server-to-unload-chunks-at-request-.patch diff --git a/patches/server/0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0735-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0734-Correctly-handle-recursion-for-chunkholder-updates.patch similarity index 100% rename from patches/server/0735-Correctly-handle-recursion-for-chunkholder-updates.patch rename to patches/server/0734-Correctly-handle-recursion-for-chunkholder-updates.patch diff --git a/patches/server/0736-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0735-Separate-lookup-locking-from-state-access-in-UserCac.patch similarity index 100% rename from patches/server/0736-Separate-lookup-locking-from-state-access-in-UserCac.patch rename to patches/server/0735-Separate-lookup-locking-from-state-access-in-UserCac.patch diff --git a/patches/server/0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0736-Fix-chunks-refusing-to-unload-at-low-TPS.patch similarity index 100% rename from patches/server/0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch rename to patches/server/0736-Fix-chunks-refusing-to-unload-at-low-TPS.patch diff --git a/patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch similarity index 97% rename from patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch rename to patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch index a057742e50..477937d99b 100644 --- a/patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch +++ b/patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch @@ -8,7 +8,7 @@ Sync loading the chunk at this stage would cause it to load older data, as well as screwing our region state. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 5602576dd8aea04fc233a801cce9bc14d27a55ec..3dc7e0188bc279f640e0c9655e49e85624742e85 100644 +index fdfac353fe9cf8509a08b5157ed0762c3a12f3e3..33eebcd8f3459fcdc51c0a327563a1abc3c1d432 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -313,6 +313,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0738-Do-not-allow-ticket-level-changes-when-updating-chun.patch similarity index 100% rename from patches/server/0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch rename to patches/server/0738-Do-not-allow-ticket-level-changes-when-updating-chun.patch diff --git a/patches/server/0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0739-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0739-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0741-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0740-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0741-Log-when-the-async-catcher-is-tripped.patch rename to patches/server/0740-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 99% rename from patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch index 906528460b..f36284ae0c 100644 --- a/patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -293,7 +293,7 @@ index 1622450b53e0f0f48c3ca107e4d705b4ad29dadf..f6a225eed29eed364b7e2ea6bc85d55d public static void spawnCategoryForChunk(MobCategory group, ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner) { spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1b2aec9215d82a8ad60439a8ac38651319c0bdef..492f398a1c2dbe7b821dd40be1c1c6952f056c3a 100644 +index 0537f6661b145f4d0f8dd58dde45fb9eebb40561..eb3e8256f2ce62e1a2354c902226846c96b16ed9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2137,6 +2137,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0742-Prevent-unload-calls-removing-tickets-for-sync-loads.patch similarity index 100% rename from patches/server/0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch rename to patches/server/0742-Prevent-unload-calls-removing-tickets-for-sync-loads.patch diff --git a/patches/server/0744-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0743-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0744-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0743-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0745-Optimise-general-POI-access.patch b/patches/server/0744-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0745-Optimise-general-POI-access.patch rename to patches/server/0744-Optimise-general-POI-access.patch diff --git a/patches/server/0746-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0745-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0746-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0745-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0747-Add-more-async-catchers.patch b/patches/server/0746-Add-more-async-catchers.patch similarity index 100% rename from patches/server/0747-Add-more-async-catchers.patch rename to patches/server/0746-Add-more-async-catchers.patch diff --git a/patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch similarity index 100% rename from patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch rename to patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch diff --git a/patches/server/0749-Optimise-chunk-tick-iteration.patch b/patches/server/0748-Optimise-chunk-tick-iteration.patch similarity index 99% rename from patches/server/0749-Optimise-chunk-tick-iteration.patch rename to patches/server/0748-Optimise-chunk-tick-iteration.patch index 7485f16502..4e6d8f0cb1 100644 --- a/patches/server/0749-Optimise-chunk-tick-iteration.patch +++ b/patches/server/0748-Optimise-chunk-tick-iteration.patch @@ -70,7 +70,7 @@ index fbfbe9adeca7364e6346c887616890bf968f38a1..bd43fbc8a93afa7604aa467392520ed7 int i = 0; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 3dc7e0188bc279f640e0c9655e49e85624742e85..9c55ab3475397040ea3ae4a530c3ee3cb10bb899 100644 +index 33eebcd8f3459fcdc51c0a327563a1abc3c1d432..9b2c5fe2389c6baa239de4f7b479d9ca273e59cf 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -159,6 +159,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0750-Execute-chunk-tasks-mid-tick.patch b/patches/server/0749-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0750-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0749-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0751-Do-not-copy-visible-chunks.patch b/patches/server/0750-Do-not-copy-visible-chunks.patch similarity index 100% rename from patches/server/0751-Do-not-copy-visible-chunks.patch rename to patches/server/0750-Do-not-copy-visible-chunks.patch diff --git a/patches/server/0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0751-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0751-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0753-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0752-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0753-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0752-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0754-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0753-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0754-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0753-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0755-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0754-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0755-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0754-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0756-Distance-manager-tick-timings.patch b/patches/server/0755-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0756-Distance-manager-tick-timings.patch rename to patches/server/0755-Distance-manager-tick-timings.patch diff --git a/patches/server/0757-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0756-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0757-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0756-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0759-Add-packet-limiter-config.patch b/patches/server/0758-Add-packet-limiter-config.patch similarity index 99% rename from patches/server/0759-Add-packet-limiter-config.patch rename to patches/server/0758-Add-packet-limiter-config.patch index 4647b9c71b..bd4772cc73 100644 --- a/patches/server/0759-Add-packet-limiter-config.patch +++ b/patches/server/0758-Add-packet-limiter-config.patch @@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK If interval or rate are less-than 0, the limit is ignored diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index b33ece9a98f94d0c09b837bc95dbfab82ff6cabe..52dcb9d05dd6ca449850b6ad3c50d8f4192f13bb 100644 +index 86cd1409de5d367e9c48460c1b5bcc1554ecfa98..1636a937ee29940954e4ce8dc7667cdd72c5ac68 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -519,4 +519,102 @@ public class PaperConfig { diff --git a/patches/server/0760-Lag-compensate-block-breaking.patch b/patches/server/0759-Lag-compensate-block-breaking.patch similarity index 98% rename from patches/server/0760-Lag-compensate-block-breaking.patch rename to patches/server/0759-Lag-compensate-block-breaking.patch index ca2395eead..c4b6860616 100644 --- a/patches/server/0760-Lag-compensate-block-breaking.patch +++ b/patches/server/0759-Lag-compensate-block-breaking.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Lag compensate block breaking Use time instead of ticks if ticks fall behind diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 52dcb9d05dd6ca449850b6ad3c50d8f4192f13bb..4444356a6bd44afdbe67593136c18b803a0ddd66 100644 +index 1636a937ee29940954e4ce8dc7667cdd72c5ac68..b2a5735c7f9f6d266c7c70325255465b0399fd15 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -617,4 +617,10 @@ public class PaperConfig { diff --git a/patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch similarity index 93% rename from patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch rename to patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch index cea585163e..53e2e20e8f 100644 --- a/patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch +++ b/patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use correct LevelStem registry when loading default diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f37dfe1bd53567239bf69852e75f09440dc1628c..a9fce6bd112c06453b7f460f3d746e290dca5f4a 100644 +index ee33fd892e97e1ffea259a4f7974675923377d6b..dff3ce704d44d13a250b9a6ae1ec1768e4a8187a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -565,7 +565,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop chunkToSaveHistory; public int oldTicketLevel; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 09d266afc606817309ba0ca795f0d86fff1fc127..24b2191d0d0e88b701492f4f42e31745f28975d2 100644 +index 9ba13ee1df980b9bd5318cefeb3412a8923b66a3..78aab9174f8359ffc38fb5a79930e541b5cd419e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -133,7 +133,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0808-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0808-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0810-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0809-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0810-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0809-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0811-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0810-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0811-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0810-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0812-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0811-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0812-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0811-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch similarity index 100% rename from patches/server/0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch rename to patches/server/0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch diff --git a/patches/server/0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0813-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0813-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0815-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0814-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0815-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0814-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0816-Add-player-health-update-API.patch b/patches/server/0815-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0816-Add-player-health-update-API.patch rename to patches/server/0815-Add-player-health-update-API.patch diff --git a/patches/server/0817-Optimize-HashMapPalette.patch b/patches/server/0816-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0817-Optimize-HashMapPalette.patch rename to patches/server/0816-Optimize-HashMapPalette.patch diff --git a/patches/server/0818-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0817-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 98% rename from patches/server/0818-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0817-Allow-delegation-to-vanilla-chunk-gen.patch index fd3b042044..13bdd0f1d7 100644 --- a/patches/server/0818-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/server/0817-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 492f398a1c2dbe7b821dd40be1c1c6952f056c3a..fba20c4228a34d4c956ce2a440eb6e495182f8f2 100644 +index eb3e8256f2ce62e1a2354c902226846c96b16ed9..e6163f2eab88fd1d77d5fb4878e2913c25df862c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2305,6 +2305,90 @@ public final class CraftServer implements Server { diff --git a/patches/server/0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0819-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0819-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0821-Actually-unload-POI-data.patch b/patches/server/0820-Actually-unload-POI-data.patch similarity index 99% rename from patches/server/0821-Actually-unload-POI-data.patch rename to patches/server/0820-Actually-unload-POI-data.patch index a9863251a5..b23193ed6b 100644 --- a/patches/server/0821-Actually-unload-POI-data.patch +++ b/patches/server/0820-Actually-unload-POI-data.patch @@ -10,7 +10,7 @@ This patch also prevents the saving/unloading of POI data when world saving is disabled. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 24b2191d0d0e88b701492f4f42e31745f28975d2..9f367f3e33c6bad8b9df4f18559ebcd98a97c95c 100644 +index 78aab9174f8359ffc38fb5a79930e541b5cd419e..a29b97f941eadb1ede5db805d32f2917469cccb9 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -848,6 +848,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0821-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0821-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0823-Update-Log4j.patch b/patches/server/0822-Update-Log4j.patch similarity index 100% rename from patches/server/0823-Update-Log4j.patch rename to patches/server/0822-Update-Log4j.patch diff --git a/patches/server/0824-Add-more-Campfire-API.patch b/patches/server/0823-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0824-Add-more-Campfire-API.patch rename to patches/server/0823-Add-more-Campfire-API.patch diff --git a/patches/server/0825-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0825-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0826-Fix-tripwire-state-inconsistency.patch b/patches/server/0825-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0826-Fix-tripwire-state-inconsistency.patch rename to patches/server/0825-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0827-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0826-Fix-fluid-logging-on-Block-breakNaturally.patch similarity index 100% rename from patches/server/0827-Fix-fluid-logging-on-Block-breakNaturally.patch rename to patches/server/0826-Fix-fluid-logging-on-Block-breakNaturally.patch diff --git a/patches/server/0828-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0828-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0827-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0829-Improve-scoreboard-entries.patch b/patches/server/0828-Improve-scoreboard-entries.patch similarity index 97% rename from patches/server/0829-Improve-scoreboard-entries.patch rename to patches/server/0828-Improve-scoreboard-entries.patch index 07b32e52e9..ee3bcefafe 100644 --- a/patches/server/0829-Improve-scoreboard-entries.patch +++ b/patches/server/0828-Improve-scoreboard-entries.patch @@ -24,7 +24,7 @@ index 6752cd9b3bc246fc2a7764df0d2b40d3e638fa62..c5cf800ab8cbb5ebcf1b06ad591f08be public void unregister() throws IllegalStateException { CraftScoreboard scoreboard = this.checkState(); diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java -index 7b61a2be2be0bdf06592b65be9acd4cbbae5bf7f..152bd54ebd0b0eeee4f3f7faf0c3043d83c01cc1 100644 +index 944080939ceaf2db8bcd7d3c01f4b97440e35cc1..0102c475b6e49777c1e24c32e5eff2992e51c89f 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java @@ -234,4 +234,23 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard { diff --git a/patches/server/0830-Entity-powdered-snow-API.patch b/patches/server/0829-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0830-Entity-powdered-snow-API.patch rename to patches/server/0829-Entity-powdered-snow-API.patch diff --git a/patches/server/0831-Add-API-for-item-entity-health.patch b/patches/server/0830-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0831-Add-API-for-item-entity-health.patch rename to patches/server/0830-Add-API-for-item-entity-health.patch diff --git a/patches/server/0832-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 99% rename from patches/server/0832-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch index 8e61b0d569..a007386ad1 100644 --- a/patches/server/0832-Fix-entity-type-tags-suggestions-in-selectors.patch +++ b/patches/server/0831-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/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 3916d3e7773f4a3b6d5c5347d6a12a707bffcdad..04cb8282efae69aa62ae1dad4c39220f658ec575 100644 +index 6223c90932338070294e2241345ac76ef40d3412..d1868e8521ea923587f3364fc83e1aaa98dc0288 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -525,6 +525,11 @@ public class PaperConfig { diff --git a/patches/server/0833-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0833-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0834-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0834-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0835-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0835-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0836-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0836-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0837-Fix-bees-aging-inside-hives.patch b/patches/server/0836-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0837-Fix-bees-aging-inside-hives.patch rename to patches/server/0836-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0838-Bucketable-API.patch b/patches/server/0837-Bucketable-API.patch similarity index 100% rename from patches/server/0838-Bucketable-API.patch rename to patches/server/0837-Bucketable-API.patch diff --git a/patches/server/0839-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch similarity index 100% rename from patches/server/0839-Check-player-world-in-endPortalSoundRadius.patch rename to patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch diff --git a/patches/server/0840-Validate-usernames.patch b/patches/server/0839-Validate-usernames.patch similarity index 98% rename from patches/server/0840-Validate-usernames.patch rename to patches/server/0839-Validate-usernames.patch index 1b417d320d..2b952eef57 100644 --- a/patches/server/0840-Validate-usernames.patch +++ b/patches/server/0839-Validate-usernames.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 04cb8282efae69aa62ae1dad4c39220f658ec575..48eeeb832127f681f6cb8162cbe3954fc14bb47d 100644 +index d1868e8521ea923587f3364fc83e1aaa98dc0288..15ed7b66aefc5665ebbe81dc491f4944269ace14 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -493,6 +493,12 @@ public class PaperConfig { diff --git a/patches/server/0841-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0840-Fix-saving-configs-with-more-long-comments.patch similarity index 100% rename from patches/server/0841-Fix-saving-configs-with-more-long-comments.patch rename to patches/server/0840-Fix-saving-configs-with-more-long-comments.patch diff --git a/patches/server/0842-Make-water-animal-spawn-height-configurable.patch b/patches/server/0841-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0842-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0841-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0843-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 97% rename from patches/server/0843-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index 3570231be3..ba7ebe0dba 100644 --- a/patches/server/0843-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a9fce6bd112c06453b7f460f3d746e290dca5f4a..7a3ca8968e4d2ea26ed20bb4c8d78ab12ee44258 100644 +index dff3ce704d44d13a250b9a6ae1ec1768e4a8187a..4eafa147edad4fe66fb419635c320a01186e7fea 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -584,7 +584,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop