diff --git a/patches/api/0008-Paper-Plugins.patch b/patches/api/0008-Paper-Plugins.patch index f00f09d789..f62a996f4b 100644 --- a/patches/api/0008-Paper-Plugins.patch +++ b/patches/api/0008-Paper-Plugins.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins diff --git a/build.gradle.kts b/build.gradle.kts -index d95b3d504ddc9ed76fc86cd45fa922d68e597827..9d6e604c7667985dc8107a5df9d36c53e8006326 100644 +index bb1f3b3d5a22ca391f4362e5d4cf016e7e9be0e3..f900b73c52971fe682171e7f99246afdb8b080f3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { @@ -2040,7 +2040,7 @@ index 6d634b0ea813ccb19f1562a7d0e5a59cea4eab21..e4b6f278a811acbb0070e311c5c3bdaf } diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 2f74ec96ece706de23156ebabfe493211bc05391..2d2fa6ce5200eb5c75a733f9f54f400113cc22b0 100644 +index 2f74ec96ece706de23156ebabfe493211bc05391..302319acbc257a075adfb78d9f5c49fdadf45bdc 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -29,7 +29,8 @@ import org.jetbrains.annotations.Nullable; @@ -2067,7 +2067,7 @@ index 2f74ec96ece706de23156ebabfe493211bc05391..2d2fa6ce5200eb5c75a733f9f54f4001 - PluginClassLoader(@NotNull final JavaPluginLoader loader, @Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader) throws IOException, InvalidPluginException, MalformedURLException { + @org.jetbrains.annotations.ApiStatus.Internal // Paper -+ public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, @Nullable JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper // Paper - use JarFile provided by SpigotPluginProvider ++ public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper // Paper - use JarFile provided by SpigotPluginProvider super(new URL[] {file.toURI().toURL()}, parent); - Preconditions.checkArgument(loader != null, "Loader cannot be null"); + this.loader = null; // Paper - pass null into loader field @@ -2077,7 +2077,7 @@ index 2f74ec96ece706de23156ebabfe493211bc05391..2d2fa6ce5200eb5c75a733f9f54f4001 this.dataFolder = dataFolder; this.file = file; - this.jar = new JarFile(file); -+ this.jar = jarFile == null ? new JarFile(file) : jarFile; // Paper - use JarFile provided by SpigotPluginProvider ++ this.jar = jarFile; // Paper - use JarFile provided by SpigotPluginProvider this.manifest = jar.getManifest(); this.url = file.toURI().toURL(); this.libraryLoader = libraryLoader; diff --git a/patches/api/0230-Enable-multi-release-plugin-jars.patch b/patches/api/0230-Enable-multi-release-plugin-jars.patch deleted file mode 100644 index 2124a31273..0000000000 --- a/patches/api/0230-Enable-multi-release-plugin-jars.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Kyle Wood -Date: Fri, 4 Dec 2020 15:53:19 -0800 -Subject: [PATCH] Enable multi-release plugin jars - - -diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 5c5aadc15c8198e0e79b4ac0f043a45720aef002..942b313d9cee8abc7a5c9948e9e94d4d30741434 100644 ---- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -@@ -60,7 +60,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm - this.description = description; - this.dataFolder = dataFolder; - this.file = file; -- this.jar = jarFile == null ? new JarFile(file) : jarFile; // Paper - use JarFile provided by SpigotPluginProvider -+ this.jar = jarFile == null ? new JarFile(file, true, java.util.zip.ZipFile.OPEN_READ, JarFile.runtimeVersion()) : jarFile; // Paper - use JarFile provided by SpigotPluginProvider // Paper - enable multi-release jars for Java 9+ - this.manifest = jar.getManifest(); - this.url = file.toURI().toURL(); - this.libraryLoader = libraryLoader; diff --git a/patches/api/0231-Player-Chunk-Load-Unload-Events.patch b/patches/api/0230-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/api/0231-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0230-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/api/0232-Expose-LivingEntity-hurt-direction.patch b/patches/api/0231-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/api/0232-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0231-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/api/0233-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0232-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/api/0233-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0232-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/api/0234-Added-PlayerTradeEvent.patch b/patches/api/0233-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/api/0234-Added-PlayerTradeEvent.patch rename to patches/api/0233-Added-PlayerTradeEvent.patch diff --git a/patches/api/0235-Add-TargetHitEvent-API.patch b/patches/api/0234-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/api/0235-Add-TargetHitEvent-API.patch rename to patches/api/0234-Add-TargetHitEvent-API.patch diff --git a/patches/api/0236-Additional-Block-Material-API-s.patch b/patches/api/0235-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/api/0236-Additional-Block-Material-API-s.patch rename to patches/api/0235-Additional-Block-Material-API-s.patch diff --git a/patches/api/0237-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0236-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/api/0237-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/api/0236-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/api/0238-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0237-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/api/0238-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/api/0237-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/api/0239-Zombie-API-breaking-doors.patch b/patches/api/0238-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/api/0239-Zombie-API-breaking-doors.patch rename to patches/api/0238-Zombie-API-breaking-doors.patch diff --git a/patches/api/0240-Add-EntityLoadCrossbowEvent.patch b/patches/api/0239-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/api/0240-Add-EntityLoadCrossbowEvent.patch rename to patches/api/0239-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/api/0241-Added-WorldGameRuleChangeEvent.patch b/patches/api/0240-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/api/0241-Added-WorldGameRuleChangeEvent.patch rename to patches/api/0240-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/api/0242-Added-ServerResourcesReloadedEvent.patch b/patches/api/0241-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/api/0242-Added-ServerResourcesReloadedEvent.patch rename to patches/api/0241-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/api/0243-Add-BlockFailedDispenseEvent.patch b/patches/api/0242-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/api/0243-Add-BlockFailedDispenseEvent.patch rename to patches/api/0242-Add-BlockFailedDispenseEvent.patch diff --git a/patches/api/0244-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0243-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/api/0244-Added-PlayerLecternPageChangeEvent.patch rename to patches/api/0243-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/api/0245-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0244-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/api/0245-Added-PlayerLoomPatternSelectEvent.patch rename to patches/api/0244-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/api/0246-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0245-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/api/0246-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/api/0245-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/api/0247-Add-sendOpLevel-API.patch b/patches/api/0246-Add-sendOpLevel-API.patch similarity index 100% rename from patches/api/0247-Add-sendOpLevel-API.patch rename to patches/api/0246-Add-sendOpLevel-API.patch diff --git a/patches/api/0248-Add-PaperRegistry.patch b/patches/api/0247-Add-PaperRegistry.patch similarity index 100% rename from patches/api/0248-Add-PaperRegistry.patch rename to patches/api/0247-Add-PaperRegistry.patch diff --git a/patches/api/0249-Add-StructuresLocateEvent.patch b/patches/api/0248-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/api/0249-Add-StructuresLocateEvent.patch rename to patches/api/0248-Add-StructuresLocateEvent.patch diff --git a/patches/api/0250-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0249-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/api/0250-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/api/0249-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/api/0251-Add-BlockPreDispenseEvent.patch b/patches/api/0250-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/api/0251-Add-BlockPreDispenseEvent.patch rename to patches/api/0250-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0252-Added-missing-vanilla-tags.patch b/patches/api/0251-Added-missing-vanilla-tags.patch similarity index 100% rename from patches/api/0252-Added-missing-vanilla-tags.patch rename to patches/api/0251-Added-missing-vanilla-tags.patch diff --git a/patches/api/0253-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0252-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0253-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0252-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0254-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0253-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0254-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0253-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0255-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0254-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/api/0255-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0254-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/api/0256-add-DragonEggFormEvent.patch b/patches/api/0255-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0256-add-DragonEggFormEvent.patch rename to patches/api/0255-add-DragonEggFormEvent.patch diff --git a/patches/api/0257-EntityMoveEvent.patch b/patches/api/0256-EntityMoveEvent.patch similarity index 100% rename from patches/api/0257-EntityMoveEvent.patch rename to patches/api/0256-EntityMoveEvent.patch diff --git a/patches/api/0258-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0257-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0258-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0257-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0259-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0258-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0259-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0258-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0260-living-entity-allow-attribute-registration.patch b/patches/api/0259-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0260-living-entity-allow-attribute-registration.patch rename to patches/api/0259-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0261-Add-missing-effects.patch b/patches/api/0260-Add-missing-effects.patch similarity index 100% rename from patches/api/0261-Add-missing-effects.patch rename to patches/api/0260-Add-missing-effects.patch diff --git a/patches/api/0262-Expose-Tracked-Players.patch b/patches/api/0261-Expose-Tracked-Players.patch similarity index 100% rename from patches/api/0262-Expose-Tracked-Players.patch rename to patches/api/0261-Expose-Tracked-Players.patch diff --git a/patches/api/0263-Cache-the-result-of-Material-isBlock.patch b/patches/api/0262-Cache-the-result-of-Material-isBlock.patch similarity index 100% rename from patches/api/0263-Cache-the-result-of-Material-isBlock.patch rename to patches/api/0262-Cache-the-result-of-Material-isBlock.patch diff --git a/patches/api/0264-Add-worldborder-events.patch b/patches/api/0263-Add-worldborder-events.patch similarity index 100% rename from patches/api/0264-Add-worldborder-events.patch rename to patches/api/0263-Add-worldborder-events.patch diff --git a/patches/api/0265-added-PlayerNameEntityEvent.patch b/patches/api/0264-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0265-added-PlayerNameEntityEvent.patch rename to patches/api/0264-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0266-Add-recipe-to-cook-events.patch b/patches/api/0265-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0266-Add-recipe-to-cook-events.patch rename to patches/api/0265-Add-recipe-to-cook-events.patch diff --git a/patches/api/0267-Add-Block-isValidTool.patch b/patches/api/0266-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0267-Add-Block-isValidTool.patch rename to patches/api/0266-Add-Block-isValidTool.patch diff --git a/patches/api/0268-Expand-world-key-API.patch b/patches/api/0267-Expand-world-key-API.patch similarity index 100% rename from patches/api/0268-Expand-world-key-API.patch rename to patches/api/0267-Expand-world-key-API.patch diff --git a/patches/api/0269-Item-Rarity-API.patch b/patches/api/0268-Item-Rarity-API.patch similarity index 100% rename from patches/api/0269-Item-Rarity-API.patch rename to patches/api/0268-Item-Rarity-API.patch diff --git a/patches/api/0270-Expose-protocol-version.patch b/patches/api/0269-Expose-protocol-version.patch similarity index 100% rename from patches/api/0270-Expose-protocol-version.patch rename to patches/api/0269-Expose-protocol-version.patch diff --git a/patches/api/0271-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0270-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0271-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0270-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0272-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0271-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0272-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0271-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0273-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0272-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/api/0273-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0272-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/api/0274-Added-PlayerDeepSleepEvent.patch b/patches/api/0273-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0274-Added-PlayerDeepSleepEvent.patch rename to patches/api/0273-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0275-More-World-API.patch b/patches/api/0274-More-World-API.patch similarity index 100% rename from patches/api/0275-More-World-API.patch rename to patches/api/0274-More-World-API.patch diff --git a/patches/api/0276-Added-PlayerBedFailEnterEvent.patch b/patches/api/0275-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0276-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0275-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0277-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0276-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0277-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0276-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0278-PlayerMoveEvent-Improvements.patch b/patches/api/0277-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0278-PlayerMoveEvent-Improvements.patch rename to patches/api/0277-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0279-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0278-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0279-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0278-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0280-Add-more-WanderingTrader-API.patch b/patches/api/0279-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0280-Add-more-WanderingTrader-API.patch rename to patches/api/0279-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0281-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0280-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0281-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0280-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0282-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0281-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0282-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0281-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0283-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0282-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0283-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0282-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0284-Inventory-close.patch b/patches/api/0283-Inventory-close.patch similarity index 100% rename from patches/api/0284-Inventory-close.patch rename to patches/api/0283-Inventory-close.patch diff --git a/patches/api/0285-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0284-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0285-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0284-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0286-Add-basic-Datapack-API.patch b/patches/api/0285-Add-basic-Datapack-API.patch similarity index 100% rename from patches/api/0286-Add-basic-Datapack-API.patch rename to patches/api/0285-Add-basic-Datapack-API.patch diff --git a/patches/api/0287-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0286-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0287-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0286-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0288-ItemStack-repair-check-API.patch b/patches/api/0287-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0288-ItemStack-repair-check-API.patch rename to patches/api/0287-ItemStack-repair-check-API.patch diff --git a/patches/api/0289-More-Enchantment-API.patch b/patches/api/0288-More-Enchantment-API.patch similarity index 100% rename from patches/api/0289-More-Enchantment-API.patch rename to patches/api/0288-More-Enchantment-API.patch diff --git a/patches/api/0290-Add-Mob-lookAt-API.patch b/patches/api/0289-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0290-Add-Mob-lookAt-API.patch rename to patches/api/0289-Add-Mob-lookAt-API.patch diff --git a/patches/api/0291-ItemStack-editMeta.patch b/patches/api/0290-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0291-ItemStack-editMeta.patch rename to patches/api/0290-ItemStack-editMeta.patch diff --git a/patches/api/0292-Add-EntityInsideBlockEvent.patch b/patches/api/0291-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0292-Add-EntityInsideBlockEvent.patch rename to patches/api/0291-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0293-Attributes-API-for-item-defaults.patch b/patches/api/0292-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0293-Attributes-API-for-item-defaults.patch rename to patches/api/0292-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0294-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0293-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0294-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0293-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0295-More-Lidded-Block-API.patch b/patches/api/0294-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0295-More-Lidded-Block-API.patch rename to patches/api/0294-More-Lidded-Block-API.patch diff --git a/patches/api/0296-Add-PlayerKickEvent-causes.patch b/patches/api/0295-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/api/0296-Add-PlayerKickEvent-causes.patch rename to patches/api/0295-Add-PlayerKickEvent-causes.patch diff --git a/patches/api/0297-Add-PufferFishStateChangeEvent.patch b/patches/api/0296-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0297-Add-PufferFishStateChangeEvent.patch rename to patches/api/0296-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0298-Add-BellRevealRaiderEvent.patch b/patches/api/0297-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0298-Add-BellRevealRaiderEvent.patch rename to patches/api/0297-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0299-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0298-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0299-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0298-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0300-Add-more-line-of-sight-methods.patch b/patches/api/0299-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0300-Add-more-line-of-sight-methods.patch rename to patches/api/0299-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0301-Add-WaterBottleSplashEvent.patch b/patches/api/0300-Add-WaterBottleSplashEvent.patch similarity index 100% rename from patches/api/0301-Add-WaterBottleSplashEvent.patch rename to patches/api/0300-Add-WaterBottleSplashEvent.patch diff --git a/patches/api/0302-Add-more-LimitedRegion-API.patch b/patches/api/0301-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0302-Add-more-LimitedRegion-API.patch rename to patches/api/0301-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0303-Missing-Entity-Behavior-API.patch b/patches/api/0302-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/api/0303-Missing-Entity-Behavior-API.patch rename to patches/api/0302-Missing-Entity-Behavior-API.patch diff --git a/patches/api/0304-Adds-PlayerArmSwingEvent.patch b/patches/api/0303-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0304-Adds-PlayerArmSwingEvent.patch rename to patches/api/0303-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0305-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0304-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0305-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0304-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0306-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0305-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0306-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0305-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0307-Stinger-API.patch b/patches/api/0306-Stinger-API.patch similarity index 100% rename from patches/api/0307-Stinger-API.patch rename to patches/api/0306-Stinger-API.patch diff --git a/patches/api/0308-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0307-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 75% rename from patches/api/0308-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0307-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch index 795ba4e98d..639c8a6a2f 100644 --- a/patches/api/0308-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch +++ b/patches/api/0307-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Rewrite LogEvents to contain the source jars in stack traces diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 942b313d9cee8abc7a5c9948e9e94d4d30741434..a22b47d452cca95fdd5e468ef61a7f9347cc4b98 100644 +index 576df38b745c0ef0ed927e960f3f8baaff784593..efcfef28b26622454a26b99cd52e0bafb69f6549 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -54,7 +54,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm @org.jetbrains.annotations.ApiStatus.Internal // Paper - public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, @Nullable JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper // Paper - use JarFile provided by SpigotPluginProvider + public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper // Paper - use JarFile provided by SpigotPluginProvider - super(new URL[] {file.toURI().toURL()}, parent); + super(file.getName(), new URL[] {file.toURI().toURL()}, parent); this.loader = null; // Paper - pass null into loader field diff --git a/patches/api/0309-Add-PlayerSetSpawnEvent.patch b/patches/api/0308-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0309-Add-PlayerSetSpawnEvent.patch rename to patches/api/0308-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0310-Added-EntityDamageItemEvent.patch b/patches/api/0309-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0310-Added-EntityDamageItemEvent.patch rename to patches/api/0309-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0311-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0310-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0311-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0310-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0312-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0311-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0312-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0311-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0313-Add-BlockBreakBlockEvent.patch b/patches/api/0312-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0313-Add-BlockBreakBlockEvent.patch rename to patches/api/0312-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0314-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0313-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0314-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0313-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0315-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0314-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/api/0315-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/api/0314-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/api/0316-More-CommandBlock-API.patch b/patches/api/0315-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0316-More-CommandBlock-API.patch rename to patches/api/0315-More-CommandBlock-API.patch diff --git a/patches/api/0317-Add-missing-team-sidebar-display-slots.patch b/patches/api/0316-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0317-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0316-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0318-add-back-EntityPortalExitEvent.patch b/patches/api/0317-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0318-add-back-EntityPortalExitEvent.patch rename to patches/api/0317-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0319-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0318-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/api/0319-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0318-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/api/0320-Get-entity-default-attributes.patch b/patches/api/0319-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0320-Get-entity-default-attributes.patch rename to patches/api/0319-Get-entity-default-attributes.patch diff --git a/patches/api/0321-Left-handed-API.patch b/patches/api/0320-Left-handed-API.patch similarity index 100% rename from patches/api/0321-Left-handed-API.patch rename to patches/api/0320-Left-handed-API.patch diff --git a/patches/api/0322-Add-more-advancement-API.patch b/patches/api/0321-Add-more-advancement-API.patch similarity index 100% rename from patches/api/0322-Add-more-advancement-API.patch rename to patches/api/0321-Add-more-advancement-API.patch diff --git a/patches/api/0323-Add-ItemFactory-getSpawnEgg-API.patch b/patches/api/0322-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/api/0323-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/api/0322-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/api/0324-Add-critical-damage-API.patch b/patches/api/0323-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0324-Add-critical-damage-API.patch rename to patches/api/0323-Add-critical-damage-API.patch diff --git a/patches/api/0325-Fix-issues-with-mob-conversion.patch b/patches/api/0324-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0325-Fix-issues-with-mob-conversion.patch rename to patches/api/0324-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0326-Add-isCollidable-methods-to-various-places.patch b/patches/api/0325-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0326-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0325-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0327-Goat-ram-API.patch b/patches/api/0326-Goat-ram-API.patch similarity index 100% rename from patches/api/0327-Goat-ram-API.patch rename to patches/api/0326-Goat-ram-API.patch diff --git a/patches/api/0328-Add-API-for-resetting-a-single-score.patch b/patches/api/0327-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0328-Add-API-for-resetting-a-single-score.patch rename to patches/api/0327-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0329-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0328-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/api/0329-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0328-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/api/0330-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0329-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0330-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0329-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0331-Add-player-health-update-API.patch b/patches/api/0330-Add-player-health-update-API.patch similarity index 100% rename from patches/api/0331-Add-player-health-update-API.patch rename to patches/api/0330-Add-player-health-update-API.patch diff --git a/patches/api/0332-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0331-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0332-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0331-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0333-Add-more-Campfire-API.patch b/patches/api/0332-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0333-Add-more-Campfire-API.patch rename to patches/api/0332-Add-more-Campfire-API.patch diff --git a/patches/api/0334-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0333-Move-VehicleCollisionEvent-HandlerList-up.patch similarity index 100% rename from patches/api/0334-Move-VehicleCollisionEvent-HandlerList-up.patch rename to patches/api/0333-Move-VehicleCollisionEvent-HandlerList-up.patch diff --git a/patches/api/0335-Improve-scoreboard-entries.patch b/patches/api/0334-Improve-scoreboard-entries.patch similarity index 100% rename from patches/api/0335-Improve-scoreboard-entries.patch rename to patches/api/0334-Improve-scoreboard-entries.patch diff --git a/patches/api/0336-Entity-powdered-snow-API.patch b/patches/api/0335-Entity-powdered-snow-API.patch similarity index 100% rename from patches/api/0336-Entity-powdered-snow-API.patch rename to patches/api/0335-Entity-powdered-snow-API.patch diff --git a/patches/api/0337-Add-API-for-item-entity-health.patch b/patches/api/0336-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0337-Add-API-for-item-entity-health.patch rename to patches/api/0336-Add-API-for-item-entity-health.patch diff --git a/patches/api/0338-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0337-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0338-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0337-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0339-Bucketable-API.patch b/patches/api/0338-Bucketable-API.patch similarity index 100% rename from patches/api/0339-Bucketable-API.patch rename to patches/api/0338-Bucketable-API.patch diff --git a/patches/api/0340-System-prop-for-default-config-comment-parsing.patch b/patches/api/0339-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0340-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0339-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0341-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0340-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0341-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0340-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0342-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0341-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/api/0342-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/api/0341-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/api/0343-Multiple-Entries-with-Scoreboards.patch b/patches/api/0342-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0343-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0342-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0344-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0343-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0344-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0343-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0345-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0344-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0345-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0344-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0346-Multi-Block-Change-API.patch b/patches/api/0345-Multi-Block-Change-API.patch similarity index 100% rename from patches/api/0346-Multi-Block-Change-API.patch rename to patches/api/0345-Multi-Block-Change-API.patch diff --git a/patches/api/0347-Fix-NotePlayEvent.patch b/patches/api/0346-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0347-Fix-NotePlayEvent.patch rename to patches/api/0346-Fix-NotePlayEvent.patch diff --git a/patches/api/0348-Freeze-Tick-Lock-API.patch b/patches/api/0347-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/api/0348-Freeze-Tick-Lock-API.patch rename to patches/api/0347-Freeze-Tick-Lock-API.patch diff --git a/patches/api/0349-Dolphin-API.patch b/patches/api/0348-Dolphin-API.patch similarity index 100% rename from patches/api/0349-Dolphin-API.patch rename to patches/api/0348-Dolphin-API.patch diff --git a/patches/api/0350-More-PotionEffectType-API.patch b/patches/api/0349-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0350-More-PotionEffectType-API.patch rename to patches/api/0349-More-PotionEffectType-API.patch diff --git a/patches/api/0351-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0350-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/api/0351-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0350-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/api/0352-Implement-regenerateChunk.patch b/patches/api/0351-Implement-regenerateChunk.patch similarity index 100% rename from patches/api/0352-Implement-regenerateChunk.patch rename to patches/api/0351-Implement-regenerateChunk.patch diff --git a/patches/api/0353-Add-GameEvent-tags.patch b/patches/api/0352-Add-GameEvent-tags.patch similarity index 100% rename from patches/api/0353-Add-GameEvent-tags.patch rename to patches/api/0352-Add-GameEvent-tags.patch diff --git a/patches/api/0354-Furnace-RecipesUsed-API.patch b/patches/api/0353-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0354-Furnace-RecipesUsed-API.patch rename to patches/api/0353-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0355-Configurable-sculk-sensor-listener-range.patch b/patches/api/0354-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0355-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0354-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0356-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0355-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0356-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0355-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0357-Custom-Potion-Mixes.patch b/patches/api/0356-Custom-Potion-Mixes.patch similarity index 100% rename from patches/api/0357-Custom-Potion-Mixes.patch rename to patches/api/0356-Custom-Potion-Mixes.patch diff --git a/patches/api/0358-Expose-furnace-minecart-push-values.patch b/patches/api/0357-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0358-Expose-furnace-minecart-push-values.patch rename to patches/api/0357-Expose-furnace-minecart-push-values.patch diff --git a/patches/api/0359-More-Projectile-API.patch b/patches/api/0358-More-Projectile-API.patch similarity index 100% rename from patches/api/0359-More-Projectile-API.patch rename to patches/api/0358-More-Projectile-API.patch diff --git a/patches/api/0360-Add-getComputedBiome-API.patch b/patches/api/0359-Add-getComputedBiome-API.patch similarity index 100% rename from patches/api/0360-Add-getComputedBiome-API.patch rename to patches/api/0359-Add-getComputedBiome-API.patch diff --git a/patches/api/0361-Add-enchantWithLevels-API.patch b/patches/api/0360-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/api/0361-Add-enchantWithLevels-API.patch rename to patches/api/0360-Add-enchantWithLevels-API.patch diff --git a/patches/api/0362-Add-TameableDeathMessageEvent.patch b/patches/api/0361-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/api/0362-Add-TameableDeathMessageEvent.patch rename to patches/api/0361-Add-TameableDeathMessageEvent.patch diff --git a/patches/api/0363-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0362-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/api/0363-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/api/0362-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/api/0364-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0363-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/api/0364-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/api/0363-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/api/0365-WorldCreator-keepSpawnLoaded.patch b/patches/api/0364-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/api/0365-WorldCreator-keepSpawnLoaded.patch rename to patches/api/0364-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/api/0366-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0365-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/api/0366-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/api/0365-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/api/0367-Add-PlayerStopUsingItemEvent.patch b/patches/api/0366-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/api/0367-Add-PlayerStopUsingItemEvent.patch rename to patches/api/0366-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/api/0368-FallingBlock-auto-expire-setting.patch b/patches/api/0367-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/api/0368-FallingBlock-auto-expire-setting.patch rename to patches/api/0367-FallingBlock-auto-expire-setting.patch diff --git a/patches/api/0369-Keyed-Cat-Type.patch b/patches/api/0368-Keyed-Cat-Type.patch similarity index 100% rename from patches/api/0369-Keyed-Cat-Type.patch rename to patches/api/0368-Keyed-Cat-Type.patch diff --git a/patches/api/0370-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0369-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 100% rename from patches/api/0370-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/api/0369-Add-method-isTickingWorlds-to-Bukkit.patch diff --git a/patches/api/0371-Add-WardenAngerChangeEvent.patch b/patches/api/0370-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/api/0371-Add-WardenAngerChangeEvent.patch rename to patches/api/0370-Add-WardenAngerChangeEvent.patch diff --git a/patches/api/0372-Nameable-Banner-API.patch b/patches/api/0371-Nameable-Banner-API.patch similarity index 100% rename from patches/api/0372-Nameable-Banner-API.patch rename to patches/api/0371-Nameable-Banner-API.patch diff --git a/patches/api/0373-Add-Player-getFishHook.patch b/patches/api/0372-Add-Player-getFishHook.patch similarity index 100% rename from patches/api/0373-Add-Player-getFishHook.patch rename to patches/api/0372-Add-Player-getFishHook.patch diff --git a/patches/api/0374-More-Teleport-API.patch b/patches/api/0373-More-Teleport-API.patch similarity index 100% rename from patches/api/0374-More-Teleport-API.patch rename to patches/api/0373-More-Teleport-API.patch diff --git a/patches/api/0375-Add-EntityPortalReadyEvent.patch b/patches/api/0374-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/api/0375-Add-EntityPortalReadyEvent.patch rename to patches/api/0374-Add-EntityPortalReadyEvent.patch diff --git a/patches/api/0376-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0375-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/api/0376-Custom-Chat-Completion-Suggestions-API.patch rename to patches/api/0375-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/api/0377-Collision-API.patch b/patches/api/0376-Collision-API.patch similarity index 100% rename from patches/api/0377-Collision-API.patch rename to patches/api/0376-Collision-API.patch diff --git a/patches/api/0378-Block-Ticking-API.patch b/patches/api/0377-Block-Ticking-API.patch similarity index 100% rename from patches/api/0378-Block-Ticking-API.patch rename to patches/api/0377-Block-Ticking-API.patch diff --git a/patches/api/0379-Add-NamespacedKey-biome-methods.patch b/patches/api/0378-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/api/0379-Add-NamespacedKey-biome-methods.patch rename to patches/api/0378-Add-NamespacedKey-biome-methods.patch diff --git a/patches/api/0380-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/api/0379-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 100% rename from patches/api/0380-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/api/0379-Add-custom-destroyerIdentity-to-sendBlockDamage.patch diff --git a/patches/api/0381-Also-load-resources-from-LibraryLoader.patch b/patches/api/0380-Also-load-resources-from-LibraryLoader.patch similarity index 95% rename from patches/api/0381-Also-load-resources-from-LibraryLoader.patch rename to patches/api/0380-Also-load-resources-from-LibraryLoader.patch index bf34d7318c..6e88f5bd00 100644 --- a/patches/api/0381-Also-load-resources-from-LibraryLoader.patch +++ b/patches/api/0380-Also-load-resources-from-LibraryLoader.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Also load resources from LibraryLoader diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index a22b47d452cca95fdd5e468ef61a7f9347cc4b98..86771934c76dd63b219069b045dbb5511ee0f45d 100644 +index efcfef28b26622454a26b99cd52e0bafb69f6549..1758e8a89c85eea8c2161ddcb5b0e745151a1f5e 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -95,14 +95,35 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm diff --git a/patches/api/0382-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0381-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/api/0382-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/api/0381-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/api/0383-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0382-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/api/0383-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/api/0382-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/api/0384-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0383-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 100% rename from patches/api/0384-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0383-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch diff --git a/patches/api/0385-Add-getDrops-to-BlockState.patch b/patches/api/0384-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/api/0385-Add-getDrops-to-BlockState.patch rename to patches/api/0384-Add-getDrops-to-BlockState.patch diff --git a/patches/api/0386-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0385-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/api/0386-Add-PlayerInventorySlotChangeEvent.patch rename to patches/api/0385-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/api/0387-Elder-Guardian-appearance-API.patch b/patches/api/0386-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/api/0387-Elder-Guardian-appearance-API.patch rename to patches/api/0386-Elder-Guardian-appearance-API.patch diff --git a/patches/api/0388-Allow-changing-bed-s-occupied-property.patch b/patches/api/0387-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/api/0388-Allow-changing-bed-s-occupied-property.patch rename to patches/api/0387-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/api/0389-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0388-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/api/0389-Add-EquipmentSlot-convenience-methods.patch rename to patches/api/0388-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/api/0390-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0389-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/api/0390-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/api/0389-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/api/0391-Add-entity-knockback-API.patch b/patches/api/0390-Add-entity-knockback-API.patch similarity index 100% rename from patches/api/0391-Add-entity-knockback-API.patch rename to patches/api/0390-Add-entity-knockback-API.patch diff --git a/patches/api/0392-Added-EntityToggleSitEvent.patch b/patches/api/0391-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/api/0392-Added-EntityToggleSitEvent.patch rename to patches/api/0391-Added-EntityToggleSitEvent.patch diff --git a/patches/api/0393-Add-Moving-Piston-API.patch b/patches/api/0392-Add-Moving-Piston-API.patch similarity index 100% rename from patches/api/0393-Add-Moving-Piston-API.patch rename to patches/api/0392-Add-Moving-Piston-API.patch diff --git a/patches/api/0394-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0393-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/api/0394-Add-PrePlayerAttackEntityEvent.patch rename to patches/api/0393-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/api/0395-Add-Player-Warden-Warning-API.patch b/patches/api/0394-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/api/0395-Add-Player-Warden-Warning-API.patch rename to patches/api/0394-Add-Player-Warden-Warning-API.patch diff --git a/patches/api/0396-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0395-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/api/0396-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/api/0395-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/api/0397-Add-paper-dumplisteners-command.patch b/patches/api/0396-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/api/0397-Add-paper-dumplisteners-command.patch rename to patches/api/0396-Add-paper-dumplisteners-command.patch diff --git a/patches/api/0398-ItemStack-damage-API.patch b/patches/api/0397-ItemStack-damage-API.patch similarity index 100% rename from patches/api/0398-ItemStack-damage-API.patch rename to patches/api/0397-ItemStack-damage-API.patch diff --git a/patches/api/0399-Add-Tick-TemporalUnit.patch b/patches/api/0398-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/api/0399-Add-Tick-TemporalUnit.patch rename to patches/api/0398-Add-Tick-TemporalUnit.patch diff --git a/patches/api/0400-Friction-API.patch b/patches/api/0399-Friction-API.patch similarity index 100% rename from patches/api/0400-Friction-API.patch rename to patches/api/0399-Friction-API.patch diff --git a/patches/api/0401-Player-Entity-Tracking-Events.patch b/patches/api/0400-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/api/0401-Player-Entity-Tracking-Events.patch rename to patches/api/0400-Player-Entity-Tracking-Events.patch diff --git a/patches/api/0402-Add-missing-Fluid-type.patch b/patches/api/0401-Add-missing-Fluid-type.patch similarity index 100% rename from patches/api/0402-Add-missing-Fluid-type.patch rename to patches/api/0401-Add-missing-Fluid-type.patch diff --git a/patches/api/0403-Mark-experimental-api-as-such.patch b/patches/api/0402-Mark-experimental-api-as-such.patch similarity index 100% rename from patches/api/0403-Mark-experimental-api-as-such.patch rename to patches/api/0402-Mark-experimental-api-as-such.patch diff --git a/patches/api/0404-fix-Instruments.patch b/patches/api/0403-fix-Instruments.patch similarity index 100% rename from patches/api/0404-fix-Instruments.patch rename to patches/api/0403-fix-Instruments.patch diff --git a/patches/api/0405-Add-BlockLockCheckEvent.patch b/patches/api/0404-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/api/0405-Add-BlockLockCheckEvent.patch rename to patches/api/0404-Add-BlockLockCheckEvent.patch diff --git a/patches/api/0406-Add-Sneaking-API-for-Entities.patch b/patches/api/0405-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/api/0406-Add-Sneaking-API-for-Entities.patch rename to patches/api/0405-Add-Sneaking-API-for-Entities.patch diff --git a/patches/api/0407-Improve-PortalEvents.patch b/patches/api/0406-Improve-PortalEvents.patch similarity index 100% rename from patches/api/0407-Improve-PortalEvents.patch rename to patches/api/0406-Improve-PortalEvents.patch diff --git a/patches/api/0408-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/api/0407-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/api/0408-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/api/0407-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/api/0409-Flying-Fall-Damage-API.patch b/patches/api/0408-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/api/0409-Flying-Fall-Damage-API.patch rename to patches/api/0408-Flying-Fall-Damage-API.patch diff --git a/patches/api/0410-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/api/0409-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/api/0410-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/api/0409-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/api/0411-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0410-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch similarity index 100% rename from patches/api/0411-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch rename to patches/api/0410-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch diff --git a/patches/api/0412-Win-Screen-API.patch b/patches/api/0411-Win-Screen-API.patch similarity index 100% rename from patches/api/0412-Win-Screen-API.patch rename to patches/api/0411-Win-Screen-API.patch diff --git a/patches/api/0413-Add-Entity-Body-Yaw-API.patch b/patches/api/0412-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/api/0413-Add-Entity-Body-Yaw-API.patch rename to patches/api/0412-Add-Entity-Body-Yaw-API.patch diff --git a/patches/api/0414-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0413-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch similarity index 100% rename from patches/api/0414-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch rename to patches/api/0413-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch diff --git a/patches/api/0415-Add-EntityFertilizeEggEvent.patch b/patches/api/0414-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/api/0415-Add-EntityFertilizeEggEvent.patch rename to patches/api/0414-Add-EntityFertilizeEggEvent.patch diff --git a/patches/api/0416-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0415-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/api/0416-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/api/0415-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/api/0417-Fix-Jukeboxes.patch b/patches/api/0416-Fix-Jukeboxes.patch similarity index 100% rename from patches/api/0417-Fix-Jukeboxes.patch rename to patches/api/0416-Fix-Jukeboxes.patch diff --git a/patches/api/0418-Add-Shearable-API.patch b/patches/api/0417-Add-Shearable-API.patch similarity index 100% rename from patches/api/0418-Add-Shearable-API.patch rename to patches/api/0417-Add-Shearable-API.patch diff --git a/patches/api/0419-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0418-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/api/0419-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/api/0418-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0013-Paper-Plugins.patch b/patches/server/0013-Paper-Plugins.patch index 0a8841e3d6..85436abe35 100644 --- a/patches/server/0013-Paper-Plugins.patch +++ b/patches/server/0013-Paper-Plugins.patch @@ -5015,7 +5015,7 @@ index 0000000000000000000000000000000000000000..ed00c412f1703b38674bbd0d483fcb10 +} diff --git a/src/main/java/io/papermc/paper/plugin/provider/source/FileProviderSource.java b/src/main/java/io/papermc/paper/plugin/provider/source/FileProviderSource.java new file mode 100644 -index 0000000000000000000000000000000000000000..0077a0a82c04bae0d93ab5c9cf07364b7c947bb3 +index 0000000000000000000000000000000000000000..3b1215fcfa1b9de42d8f946c4e2b4572e8834f8d --- /dev/null +++ b/src/main/java/io/papermc/paper/plugin/provider/source/FileProviderSource.java @@ -0,0 +1,157 @@ @@ -5069,7 +5069,7 @@ index 0000000000000000000000000000000000000000..0077a0a82c04bae0d93ab5c9cf07364b + try { + context = this.checkUpdate(context); + -+ JarFile file = new JarFile(context.toFile()); ++ JarFile file = new JarFile(context.toFile(), true, JarFile.OPEN_READ, JarFile.runtimeVersion()); + PluginFileType type = PluginFileType.guessType(file); + if (type == null) { + throw new IllegalArgumentException(source + " is not a valid plugin file, cannot load a plugin from it!");