From f97bb11e4b6a0d2b66a803d2468bec654d644a98 Mon Sep 17 00:00:00 2001 From: Jason <11360596+jpenilla@users.noreply.github.com> Date: Thu, 8 Dec 2022 17:33:22 -0700 Subject: [PATCH] Account for splash water bottles now extinguishing entities (#8622) * Account for splash water bottles now extinguishing entities * improvements and javadocs * reorder patches * rename event to WaterBottleSplashEvent Co-authored-by: Jake Potrebic --- .../api/0310-Add-WaterBottleSplashEvent.patch | 150 ++++++++++++++++++ ... => 0311-Add-more-LimitedRegion-API.patch} | 0 ...=> 0312-Missing-Entity-Behavior-API.patch} | 2 +- ...ch => 0313-Adds-PlayerArmSwingEvent.patch} | 0 ...dd-PlayerSignCommandPreprocessEvent.patch} | 0 ...array-elements-in-command-arguments.patch} | 0 ...inger-API.patch => 0316-Stinger-API.patch} | 0 ...-to-contain-the-source-jars-in-stac.patch} | 0 ...tch => 0318-Add-PlayerSetSpawnEvent.patch} | 0 ...=> 0319-Added-EntityDamageItemEvent.patch} | 0 ...Make-EntityUnleashEvent-cancellable.patch} | 0 ...arget-without-changing-other-things.patch} | 0 ...ch => 0322-Add-BlockBreakBlockEvent.patch} | 0 ...pers-for-left-right-click-to-Action.patch} | 0 ...revent-NBT-copy-in-smithing-recipes.patch} | 0 ...patch => 0325-More-CommandBlock-API.patch} | 0 ...0326-Fix-plugin-provides-load-order.patch} | 0 ...-missing-team-sidebar-display-slots.patch} | 0 ...0328-add-back-EntityPortalExitEvent.patch} | 0 ...-find-targets-for-lightning-strikes.patch} | 0 ... 0330-Get-entity-default-attributes.patch} | 0 ...d-API.patch => 0331-Left-handed-API.patch} | 0 ...ch => 0332-Add-more-advancement-API.patch} | 0 ...333-Add-ItemFactory-getSpawnEgg-API.patch} | 0 ...tch => 0334-Add-critical-damage-API.patch} | 0 ...0335-Fix-issues-with-mob-conversion.patch} | 0 ...ollidable-methods-to-various-places.patch} | 0 ...-ram-API.patch => 0337-Goat-ram-API.patch} | 0 ...dd-API-for-resetting-a-single-score.patch} | 0 ...9-Add-Raw-Byte-Entity-Serialization.patch} | 2 +- ...0340-Add-PlayerItemFrameChangeEvent.patch} | 0 ...> 0341-Add-player-health-update-API.patch} | 0 ...low-delegation-to-vanilla-chunk-gen.patch} | 0 ...patch => 0343-Add-more-Campfire-API.patch} | 0 ...ehicleCollisionEvent-HandlerList-up.patch} | 0 ... => 0345-Improve-scoreboard-entries.patch} | 0 ...ch => 0346-Entity-powdered-snow-API.patch} | 0 ...0347-Add-API-for-item-entity-health.patch} | 0 ...-canSmelt-methods-to-FurnaceInvento.patch} | 0 ...le-API.patch => 0349-Bucketable-API.patch} | 0 ...-for-default-config-comment-parsing.patch} | 0 ...anilla-BiomeProvider-from-WorldInfo.patch} | 0 ...load-to-PersistentDataContainer-has.patch} | 0 ...3-Multiple-Entries-with-Scoreboards.patch} | 0 ...ostname-to-AsyncPlayerPreLoginEvent.patch} | 0 ...n-strange-EventHandler-return-types.patch} | 0 ...atch => 0356-Multi-Block-Change-API.patch} | 0 ...ent.patch => 0357-Fix-NotePlayEvent.patch} | 0 ....patch => 0358-Freeze-Tick-Lock-API.patch} | 2 +- ...lphin-API.patch => 0359-Dolphin-API.patch} | 0 ...h => 0360-More-PotionEffectType-API.patch} | 0 ...command-sender-which-forwards-feedb.patch} | 0 ...h => 0362-Implement-regenerateChunk.patch} | 0 ...-t-load-plugins-prefixed-with-a-dot.patch} | 0 ...gs.patch => 0364-Add-GameEvent-tags.patch} | 0 ...tch => 0365-Furnace-RecipesUsed-API.patch} | 0 ...gurable-sculk-sensor-listener-range.patch} | 0 ...d-missing-block-data-mins-and-maxes.patch} | 0 ...s.patch => 0368-Custom-Potion-Mixes.patch} | 0 ...Expose-furnace-minecart-push-values.patch} | 0 ...I.patch => 0370-More-Projectile-API.patch} | 2 +- ...ch => 0371-Add-getComputedBiome-API.patch} | 0 ...h => 0372-Add-enchantWithLevels-API.patch} | 0 ... 0373-Add-TameableDeathMessageEvent.patch} | 0 ...hange-the-podium-of-the-EnderDragon.patch} | 0 ...ing-amount-to-PlayerItemDamageEvent.patch} | 0 ...0376-Update-Folder-Uses-Plugin-Name.patch} | 0 ...> 0377-WorldCreator-keepSpawnLoaded.patch} | 0 ...Event-and-CollarColorable-interface.patch} | 0 ...> 0379-Add-PlayerStopUsingItemEvent.patch} | 0 ...80-FallingBlock-auto-expire-setting.patch} | 0 ...t-Type.patch => 0381-Keyed-Cat-Type.patch} | 0 ...dd-method-isTickingWorlds-to-Bukkit.patch} | 4 +- ... => 0383-Add-WardenAngerChangeEvent.patch} | 0 ...I.patch => 0384-Nameable-Banner-API.patch} | 0 ...atch => 0385-Add-Player-getFishHook.patch} | 0 ...API.patch => 0386-More-Teleport-API.patch} | 2 +- ... => 0387-Add-EntityPortalReadyEvent.patch} | 0 ...tom-Chat-Completion-Suggestions-API.patch} | 0 ...ion-API.patch => 0389-Collision-API.patch} | 0 ...API.patch => 0390-Block-Ticking-API.patch} | 0 ...391-Add-NamespacedKey-biome-methods.patch} | 2 +- ...estroyerIdentity-to-sendBlockDamage.patch} | 0 ...o-load-resources-from-LibraryLoader.patch} | 0 ...serialization-deserialization-for-P.patch} | 0 ...rameter-to-ProjectileSource-launchP.patch} | 0 ...limit-in-YamlConfigOptions-and-incr.patch} | 0 ...ty-to-print-stacktrace-on-bad-plugi.patch} | 0 ...lockState-and-isPreferredTool-to-Bl.patch} | 0 ...-Add-PlayerInventorySlotChangeEvent.patch} | 0 ... 0400-Elder-Guardian-appearance-API.patch} | 0 ...ow-changing-bed-s-occupied-property.patch} | 0 ...d-EquipmentSlot-convenience-methods.patch} | 0 ...swingHand-EquipmentSlot-convenience.patch} | 0 ...ch => 0404-Add-entity-knockback-API.patch} | 0 ... => 0405-Added-EntityToggleSitEvent.patch} | 0 ...patch => 0406-Add-Moving-Piston-API.patch} | 0 ...0407-Add-PrePlayerAttackEntityEvent.patch} | 0 ... 0408-Add-Player-Warden-Warning-API.patch} | 0 ...a-friendly-methods-to-update-trades.patch} | 0 ...410-Add-paper-dumplisteners-command.patch} | 0 ....patch => 0411-ItemStack-damage-API.patch} | 0 ...patch => 0412-Add-Tick-TemporalUnit.patch} | 0 ...tion-API.patch => 0413-Friction-API.patch} | 0 ... 0414-Player-Entity-Tracking-Events.patch} | 0 ...atch => 0415-Add-missing-Fluid-type.patch} | 0 ...lans.patch => 0416-Future-API-Plans.patch} | 0 ...SplashEvent-for-water-splash-potions.patch | 46 +++--- 108 files changed, 182 insertions(+), 30 deletions(-) create mode 100644 patches/api/0310-Add-WaterBottleSplashEvent.patch rename patches/api/{0310-Add-more-LimitedRegion-API.patch => 0311-Add-more-LimitedRegion-API.patch} (100%) rename patches/api/{0311-Missing-Entity-Behavior-API.patch => 0312-Missing-Entity-Behavior-API.patch} (99%) rename patches/api/{0312-Adds-PlayerArmSwingEvent.patch => 0313-Adds-PlayerArmSwingEvent.patch} (100%) rename patches/api/{0313-Add-PlayerSignCommandPreprocessEvent.patch => 0314-Add-PlayerSignCommandPreprocessEvent.patch} (100%) rename patches/api/{0314-fix-empty-array-elements-in-command-arguments.patch => 0315-fix-empty-array-elements-in-command-arguments.patch} (100%) rename patches/api/{0315-Stinger-API.patch => 0316-Stinger-API.patch} (100%) rename patches/api/{0316-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0317-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%) rename patches/api/{0317-Add-PlayerSetSpawnEvent.patch => 0318-Add-PlayerSetSpawnEvent.patch} (100%) rename patches/api/{0318-Added-EntityDamageItemEvent.patch => 0319-Added-EntityDamageItemEvent.patch} (100%) rename patches/api/{0319-Make-EntityUnleashEvent-cancellable.patch => 0320-Make-EntityUnleashEvent-cancellable.patch} (100%) rename patches/api/{0320-Change-EnderEye-target-without-changing-other-things.patch => 0321-Change-EnderEye-target-without-changing-other-things.patch} (100%) rename patches/api/{0321-Add-BlockBreakBlockEvent.patch => 0322-Add-BlockBreakBlockEvent.patch} (100%) rename patches/api/{0322-Add-helpers-for-left-right-click-to-Action.patch => 0323-Add-helpers-for-left-right-click-to-Action.patch} (100%) rename patches/api/{0323-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0324-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%) rename patches/api/{0324-More-CommandBlock-API.patch => 0325-More-CommandBlock-API.patch} (100%) rename patches/api/{0325-Fix-plugin-provides-load-order.patch => 0326-Fix-plugin-provides-load-order.patch} (100%) rename patches/api/{0326-Add-missing-team-sidebar-display-slots.patch => 0327-Add-missing-team-sidebar-display-slots.patch} (100%) rename patches/api/{0327-add-back-EntityPortalExitEvent.patch => 0328-add-back-EntityPortalExitEvent.patch} (100%) rename patches/api/{0328-Add-methods-to-find-targets-for-lightning-strikes.patch => 0329-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%) rename patches/api/{0329-Get-entity-default-attributes.patch => 0330-Get-entity-default-attributes.patch} (100%) rename patches/api/{0330-Left-handed-API.patch => 0331-Left-handed-API.patch} (100%) rename patches/api/{0331-Add-more-advancement-API.patch => 0332-Add-more-advancement-API.patch} (100%) rename patches/api/{0332-Add-ItemFactory-getSpawnEgg-API.patch => 0333-Add-ItemFactory-getSpawnEgg-API.patch} (100%) rename patches/api/{0333-Add-critical-damage-API.patch => 0334-Add-critical-damage-API.patch} (100%) rename patches/api/{0334-Fix-issues-with-mob-conversion.patch => 0335-Fix-issues-with-mob-conversion.patch} (100%) rename patches/api/{0335-Add-isCollidable-methods-to-various-places.patch => 0336-Add-isCollidable-methods-to-various-places.patch} (100%) rename patches/api/{0336-Goat-ram-API.patch => 0337-Goat-ram-API.patch} (100%) rename patches/api/{0337-Add-API-for-resetting-a-single-score.patch => 0338-Add-API-for-resetting-a-single-score.patch} (100%) rename patches/api/{0338-Add-Raw-Byte-Entity-Serialization.patch => 0339-Add-Raw-Byte-Entity-Serialization.patch} (96%) rename patches/api/{0339-Add-PlayerItemFrameChangeEvent.patch => 0340-Add-PlayerItemFrameChangeEvent.patch} (100%) rename patches/api/{0340-Add-player-health-update-API.patch => 0341-Add-player-health-update-API.patch} (100%) rename patches/api/{0341-Allow-delegation-to-vanilla-chunk-gen.patch => 0342-Allow-delegation-to-vanilla-chunk-gen.patch} (100%) rename patches/api/{0342-Add-more-Campfire-API.patch => 0343-Add-more-Campfire-API.patch} (100%) rename patches/api/{0343-Move-VehicleCollisionEvent-HandlerList-up.patch => 0344-Move-VehicleCollisionEvent-HandlerList-up.patch} (100%) rename patches/api/{0344-Improve-scoreboard-entries.patch => 0345-Improve-scoreboard-entries.patch} (100%) rename patches/api/{0345-Entity-powdered-snow-API.patch => 0346-Entity-powdered-snow-API.patch} (100%) rename patches/api/{0346-Add-API-for-item-entity-health.patch => 0347-Add-API-for-item-entity-health.patch} (100%) rename patches/api/{0347-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0348-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%) rename patches/api/{0348-Bucketable-API.patch => 0349-Bucketable-API.patch} (100%) rename patches/api/{0349-System-prop-for-default-config-comment-parsing.patch => 0350-System-prop-for-default-config-comment-parsing.patch} (100%) rename patches/api/{0350-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0351-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%) rename patches/api/{0351-Add-new-overload-to-PersistentDataContainer-has.patch => 0352-Add-new-overload-to-PersistentDataContainer-has.patch} (100%) rename patches/api/{0352-Multiple-Entries-with-Scoreboards.patch => 0353-Multiple-Entries-with-Scoreboards.patch} (100%) rename patches/api/{0353-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0354-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%) rename patches/api/{0354-Warn-on-strange-EventHandler-return-types.patch => 0355-Warn-on-strange-EventHandler-return-types.patch} (100%) rename patches/api/{0355-Multi-Block-Change-API.patch => 0356-Multi-Block-Change-API.patch} (100%) rename patches/api/{0356-Fix-NotePlayEvent.patch => 0357-Fix-NotePlayEvent.patch} (100%) rename patches/api/{0357-Freeze-Tick-Lock-API.patch => 0358-Freeze-Tick-Lock-API.patch} (92%) rename patches/api/{0358-Dolphin-API.patch => 0359-Dolphin-API.patch} (100%) rename patches/api/{0359-More-PotionEffectType-API.patch => 0360-More-PotionEffectType-API.patch} (100%) rename patches/api/{0360-API-for-creating-command-sender-which-forwards-feedb.patch => 0361-API-for-creating-command-sender-which-forwards-feedb.patch} (100%) rename patches/api/{0361-Implement-regenerateChunk.patch => 0362-Implement-regenerateChunk.patch} (100%) rename patches/api/{0362-Don-t-load-plugins-prefixed-with-a-dot.patch => 0363-Don-t-load-plugins-prefixed-with-a-dot.patch} (100%) rename patches/api/{0363-Add-GameEvent-tags.patch => 0364-Add-GameEvent-tags.patch} (100%) rename patches/api/{0364-Furnace-RecipesUsed-API.patch => 0365-Furnace-RecipesUsed-API.patch} (100%) rename patches/api/{0365-Configurable-sculk-sensor-listener-range.patch => 0366-Configurable-sculk-sensor-listener-range.patch} (100%) rename patches/api/{0366-Add-missing-block-data-mins-and-maxes.patch => 0367-Add-missing-block-data-mins-and-maxes.patch} (100%) rename patches/api/{0367-Custom-Potion-Mixes.patch => 0368-Custom-Potion-Mixes.patch} (100%) rename patches/api/{0368-Expose-furnace-minecart-push-values.patch => 0369-Expose-furnace-minecart-push-values.patch} (100%) rename patches/api/{0369-More-Projectile-API.patch => 0370-More-Projectile-API.patch} (99%) rename patches/api/{0370-Add-getComputedBiome-API.patch => 0371-Add-getComputedBiome-API.patch} (100%) rename patches/api/{0371-Add-enchantWithLevels-API.patch => 0372-Add-enchantWithLevels-API.patch} (100%) rename patches/api/{0372-Add-TameableDeathMessageEvent.patch => 0373-Add-TameableDeathMessageEvent.patch} (100%) rename patches/api/{0373-Allow-to-change-the-podium-of-the-EnderDragon.patch => 0374-Allow-to-change-the-podium-of-the-EnderDragon.patch} (100%) rename patches/api/{0374-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0375-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%) rename patches/api/{0375-Update-Folder-Uses-Plugin-Name.patch => 0376-Update-Folder-Uses-Plugin-Name.patch} (100%) rename patches/api/{0376-WorldCreator-keepSpawnLoaded.patch => 0377-WorldCreator-keepSpawnLoaded.patch} (100%) rename patches/api/{0377-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0378-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%) rename patches/api/{0378-Add-PlayerStopUsingItemEvent.patch => 0379-Add-PlayerStopUsingItemEvent.patch} (100%) rename patches/api/{0379-FallingBlock-auto-expire-setting.patch => 0380-FallingBlock-auto-expire-setting.patch} (100%) rename patches/api/{0380-Keyed-Cat-Type.patch => 0381-Keyed-Cat-Type.patch} (100%) rename patches/api/{0381-Add-method-isTickingWorlds-to-Bukkit.patch => 0382-Add-method-isTickingWorlds-to-Bukkit.patch} (96%) rename patches/api/{0382-Add-WardenAngerChangeEvent.patch => 0383-Add-WardenAngerChangeEvent.patch} (100%) rename patches/api/{0383-Nameable-Banner-API.patch => 0384-Nameable-Banner-API.patch} (100%) rename patches/api/{0384-Add-Player-getFishHook.patch => 0385-Add-Player-getFishHook.patch} (100%) rename patches/api/{0385-More-Teleport-API.patch => 0386-More-Teleport-API.patch} (99%) rename patches/api/{0386-Add-EntityPortalReadyEvent.patch => 0387-Add-EntityPortalReadyEvent.patch} (100%) rename patches/api/{0387-Custom-Chat-Completion-Suggestions-API.patch => 0388-Custom-Chat-Completion-Suggestions-API.patch} (100%) rename patches/api/{0388-Collision-API.patch => 0389-Collision-API.patch} (100%) rename patches/api/{0389-Block-Ticking-API.patch => 0390-Block-Ticking-API.patch} (100%) rename patches/api/{0390-Add-NamespacedKey-biome-methods.patch => 0391-Add-NamespacedKey-biome-methods.patch} (95%) rename patches/api/{0391-Add-custom-destroyerIdentity-to-sendBlockDamage.patch => 0392-Add-custom-destroyerIdentity-to-sendBlockDamage.patch} (100%) rename patches/api/{0392-Also-load-resources-from-LibraryLoader.patch => 0393-Also-load-resources-from-LibraryLoader.patch} (100%) rename patches/api/{0393-Added-byte-array-serialization-deserialization-for-P.patch => 0394-Added-byte-array-serialization-deserialization-for-P.patch} (100%) rename patches/api/{0394-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0395-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%) rename patches/api/{0395-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch => 0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch} (100%) rename patches/api/{0396-Add-system-property-to-print-stacktrace-on-bad-plugi.patch => 0397-Add-system-property-to-print-stacktrace-on-bad-plugi.patch} (100%) rename patches/api/{0397-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch => 0398-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch} (100%) rename patches/api/{0398-Add-PlayerInventorySlotChangeEvent.patch => 0399-Add-PlayerInventorySlotChangeEvent.patch} (100%) rename patches/api/{0399-Elder-Guardian-appearance-API.patch => 0400-Elder-Guardian-appearance-API.patch} (100%) rename patches/api/{0400-Allow-changing-bed-s-occupied-property.patch => 0401-Allow-changing-bed-s-occupied-property.patch} (100%) rename patches/api/{0401-Add-EquipmentSlot-convenience-methods.patch => 0402-Add-EquipmentSlot-convenience-methods.patch} (100%) rename patches/api/{0402-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch => 0403-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch} (100%) rename patches/api/{0403-Add-entity-knockback-API.patch => 0404-Add-entity-knockback-API.patch} (100%) rename patches/api/{0404-Added-EntityToggleSitEvent.patch => 0405-Added-EntityToggleSitEvent.patch} (100%) rename patches/api/{0405-Add-Moving-Piston-API.patch => 0406-Add-Moving-Piston-API.patch} (100%) rename patches/api/{0406-Add-PrePlayerAttackEntityEvent.patch => 0407-Add-PrePlayerAttackEntityEvent.patch} (100%) rename patches/api/{0407-Add-Player-Warden-Warning-API.patch => 0408-Add-Player-Warden-Warning-API.patch} (100%) rename patches/api/{0408-More-vanilla-friendly-methods-to-update-trades.patch => 0409-More-vanilla-friendly-methods-to-update-trades.patch} (100%) rename patches/api/{0409-Add-paper-dumplisteners-command.patch => 0410-Add-paper-dumplisteners-command.patch} (100%) rename patches/api/{0410-ItemStack-damage-API.patch => 0411-ItemStack-damage-API.patch} (100%) rename patches/api/{0411-Add-Tick-TemporalUnit.patch => 0412-Add-Tick-TemporalUnit.patch} (100%) rename patches/api/{0412-Friction-API.patch => 0413-Friction-API.patch} (100%) rename patches/api/{0413-Player-Entity-Tracking-Events.patch => 0414-Player-Entity-Tracking-Events.patch} (100%) rename patches/api/{0414-Add-missing-Fluid-type.patch => 0415-Add-missing-Fluid-type.patch} (100%) rename patches/api/{0415-Future-API-Plans.patch => 0416-Future-API-Plans.patch} (100%) diff --git a/patches/api/0310-Add-WaterBottleSplashEvent.patch b/patches/api/0310-Add-WaterBottleSplashEvent.patch new file mode 100644 index 0000000000..198b488051 --- /dev/null +++ b/patches/api/0310-Add-WaterBottleSplashEvent.patch @@ -0,0 +1,150 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> +Date: Thu, 8 Dec 2022 10:12:23 -0700 +Subject: [PATCH] Add WaterBottleSplashEvent + + +diff --git a/src/main/java/io/papermc/paper/event/entity/WaterBottleSplashEvent.java b/src/main/java/io/papermc/paper/event/entity/WaterBottleSplashEvent.java +new file mode 100644 +index 0000000000000000000000000000000000000000..4c4c645a1597b5afb62f78dc1cfae62c5fe60fcf +--- /dev/null ++++ b/src/main/java/io/papermc/paper/event/entity/WaterBottleSplashEvent.java +@@ -0,0 +1,125 @@ ++package io.papermc.paper.event.entity; ++ ++import java.util.Collection; ++import java.util.Map; ++import java.util.Set; ++import java.util.stream.Collectors; ++import org.bukkit.entity.LivingEntity; ++import org.bukkit.entity.ThrownPotion; ++import org.bukkit.event.entity.PotionSplashEvent; ++import org.jetbrains.annotations.NotNull; ++import org.jetbrains.annotations.Unmodifiable; ++ ++/** ++ * Called when a splash water potion "splashes" and affects ++ * different entities in different ways. ++ */ ++public class WaterBottleSplashEvent extends PotionSplashEvent { ++ private final @NotNull Set rehydrate; ++ private final @NotNull Set extinguish; ++ ++ public WaterBottleSplashEvent( ++ final @NotNull ThrownPotion potion, ++ final @NotNull Map affectedEntities, ++ final @NotNull Set rehydrate, ++ final @NotNull Set extinguish ++ ) { ++ super(potion, affectedEntities); ++ this.rehydrate = rehydrate; ++ this.extinguish = extinguish; ++ } ++ ++ /** ++ * Gets an immutable collection of entities that ++ * will take damage as a result of this event. Use ++ * other methods on this class to modify which entities ++ * take damage. ++ * ++ * @return an immutable collection of entities ++ * @see #doNotDamageAsWaterSensitive(LivingEntity) ++ * @see #damageAsWaterSensitive(LivingEntity) ++ */ ++ @NotNull ++ public @Unmodifiable Collection getToDamage() { ++ return this.affectedEntities.entrySet().stream().filter(entry -> entry.getValue() > 0).map(Map.Entry::getKey).collect(Collectors.toUnmodifiableSet()); ++ } ++ ++ /** ++ * Removes this entity from the group that ++ * will be damaged. ++ * ++ * @param entity entity to remove ++ */ ++ public void doNotDamageAsWaterSensitive(final @NotNull LivingEntity entity) { ++ this.affectedEntities.remove(entity); ++ } ++ ++ /** ++ * Adds this entity to the group that ++ * will be damaged ++ * ++ * @param entity entity to add ++ */ ++ public void damageAsWaterSensitive(final @NotNull LivingEntity entity) { ++ this.affectedEntities.put(entity, 1.0); ++ } ++ ++ /** ++ * Get a mutable collection of entities ++ * that will be rehydrated by this. ++ *

++ * As of 1.19.3 this only will contain Axolotls as they ++ * are the only entity type that can be rehydrated, but ++ * it may change in the future. ++ * ++ * @return the entities ++ */ ++ @NotNull ++ public Collection getToRehydrate() { ++ return this.rehydrate; ++ } ++ ++ /** ++ * Get a mutable collection of entities that will ++ * be extinguished as a result of this event. ++ * ++ * @return entities to be extinguished ++ */ ++ @NotNull ++ public Collection getToExtinguish() { ++ return this.extinguish; ++ } ++ ++ /** ++ * @return a confusing collection, don't use it ++ * @deprecated Use {@link #getToDamage()} ++ */ ++ @Deprecated ++ @Override ++ public @NotNull Collection getAffectedEntities() { ++ return super.getAffectedEntities(); ++ } ++ ++ /** ++ * Doesn't make sense for this event as intensity doesn't vary. ++ * @return a confusing value ++ * @deprecated check if {@link #getToDamage()} contains an entity ++ */ ++ @Deprecated ++ @Override ++ public double getIntensity(final @NotNull LivingEntity entity) { ++ return super.getIntensity(entity); ++ } ++ ++ /** ++ * Doesn't make sense for this event as intensity doesn't vary. ++ * @deprecated use {@link #damageAsWaterSensitive(LivingEntity)} ++ * or {@link #doNotDamageAsWaterSensitive(LivingEntity)} to change which entities are ++ * damaged ++ */ ++ @Deprecated ++ @Override ++ public void setIntensity(final @NotNull LivingEntity entity, final double intensity) { ++ super.setIntensity(entity, intensity); ++ } ++} +diff --git a/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java b/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java +index 80f31a267ef4be88718811484e91a6097106e8d2..97d94aba0a8e86e055abd836dd868b8fe8a486bd 100644 +--- a/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java ++++ b/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java +@@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull; + public class PotionSplashEvent extends ProjectileHitEvent implements Cancellable { + private static final HandlerList handlers = new HandlerList(); + private boolean cancelled; +- private final Map affectedEntities; ++ protected final Map affectedEntities; // Paper + + public PotionSplashEvent(@NotNull final ThrownPotion potion, @NotNull final Map affectedEntities) { + super(potion); diff --git a/patches/api/0310-Add-more-LimitedRegion-API.patch b/patches/api/0311-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0310-Add-more-LimitedRegion-API.patch rename to patches/api/0311-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0311-Missing-Entity-Behavior-API.patch b/patches/api/0312-Missing-Entity-Behavior-API.patch similarity index 99% rename from patches/api/0311-Missing-Entity-Behavior-API.patch rename to patches/api/0312-Missing-Entity-Behavior-API.patch index 25d53c543f..02b26f2ab3 100644 --- a/patches/api/0311-Missing-Entity-Behavior-API.patch +++ b/patches/api/0312-Missing-Entity-Behavior-API.patch @@ -8,7 +8,7 @@ Co-authored-by: Jake Potrebic Co-authored-by: William Blake Galbreath diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index 8fd399f791b45eb7fc62693ca954eea0c68e2881..2e9006700782924aa8f79e48194200cb1f13110f 100644 +index dddbb661265aa23f88d93d0681f418f40a872351..998f629852e1103767e005405d1f39c2251ecd28 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -23,7 +23,7 @@ public interface VanillaGoal extends Goal { diff --git a/patches/api/0312-Adds-PlayerArmSwingEvent.patch b/patches/api/0313-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0312-Adds-PlayerArmSwingEvent.patch rename to patches/api/0313-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0313-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0314-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0313-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0314-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0314-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0315-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0314-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0315-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0315-Stinger-API.patch b/patches/api/0316-Stinger-API.patch similarity index 100% rename from patches/api/0315-Stinger-API.patch rename to patches/api/0316-Stinger-API.patch diff --git a/patches/api/0316-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0317-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/api/0316-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0317-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/api/0317-Add-PlayerSetSpawnEvent.patch b/patches/api/0318-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0317-Add-PlayerSetSpawnEvent.patch rename to patches/api/0318-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0318-Added-EntityDamageItemEvent.patch b/patches/api/0319-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0318-Added-EntityDamageItemEvent.patch rename to patches/api/0319-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0319-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0320-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0319-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0320-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0320-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0321-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0320-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0321-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0321-Add-BlockBreakBlockEvent.patch b/patches/api/0322-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0321-Add-BlockBreakBlockEvent.patch rename to patches/api/0322-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0322-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0323-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0322-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0323-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0323-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0324-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/api/0323-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/api/0324-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/api/0324-More-CommandBlock-API.patch b/patches/api/0325-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0324-More-CommandBlock-API.patch rename to patches/api/0325-More-CommandBlock-API.patch diff --git a/patches/api/0325-Fix-plugin-provides-load-order.patch b/patches/api/0326-Fix-plugin-provides-load-order.patch similarity index 100% rename from patches/api/0325-Fix-plugin-provides-load-order.patch rename to patches/api/0326-Fix-plugin-provides-load-order.patch diff --git a/patches/api/0326-Add-missing-team-sidebar-display-slots.patch b/patches/api/0327-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0326-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0327-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0327-add-back-EntityPortalExitEvent.patch b/patches/api/0328-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0327-add-back-EntityPortalExitEvent.patch rename to patches/api/0328-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0328-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0329-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/api/0328-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0329-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/api/0329-Get-entity-default-attributes.patch b/patches/api/0330-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0329-Get-entity-default-attributes.patch rename to patches/api/0330-Get-entity-default-attributes.patch diff --git a/patches/api/0330-Left-handed-API.patch b/patches/api/0331-Left-handed-API.patch similarity index 100% rename from patches/api/0330-Left-handed-API.patch rename to patches/api/0331-Left-handed-API.patch diff --git a/patches/api/0331-Add-more-advancement-API.patch b/patches/api/0332-Add-more-advancement-API.patch similarity index 100% rename from patches/api/0331-Add-more-advancement-API.patch rename to patches/api/0332-Add-more-advancement-API.patch diff --git a/patches/api/0332-Add-ItemFactory-getSpawnEgg-API.patch b/patches/api/0333-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/api/0332-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/api/0333-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/api/0333-Add-critical-damage-API.patch b/patches/api/0334-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0333-Add-critical-damage-API.patch rename to patches/api/0334-Add-critical-damage-API.patch diff --git a/patches/api/0334-Fix-issues-with-mob-conversion.patch b/patches/api/0335-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0334-Fix-issues-with-mob-conversion.patch rename to patches/api/0335-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0335-Add-isCollidable-methods-to-various-places.patch b/patches/api/0336-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0335-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0336-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0336-Goat-ram-API.patch b/patches/api/0337-Goat-ram-API.patch similarity index 100% rename from patches/api/0336-Goat-ram-API.patch rename to patches/api/0337-Goat-ram-API.patch diff --git a/patches/api/0337-Add-API-for-resetting-a-single-score.patch b/patches/api/0338-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0337-Add-API-for-resetting-a-single-score.patch rename to patches/api/0338-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0338-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch similarity index 96% rename from patches/api/0338-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch index 39b0cacd88..27fcb0fc86 100644 --- a/patches/api/0338-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/api/0339-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 057a4f1a374fcc240998c6ac3fe52d22389458c3..70103054057abfec37a99f30075123f9daa4e4ce 100644 +index 9fd64aa7f2487b07fe0a6873bd57a0ed483499a3..aa252abe42c184914d6b50ad1f94ba7ada22d7df 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -113,6 +113,14 @@ public interface UnsafeValues { diff --git a/patches/api/0339-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0340-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0339-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0340-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0340-Add-player-health-update-API.patch b/patches/api/0341-Add-player-health-update-API.patch similarity index 100% rename from patches/api/0340-Add-player-health-update-API.patch rename to patches/api/0341-Add-player-health-update-API.patch diff --git a/patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0342-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0342-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0342-Add-more-Campfire-API.patch b/patches/api/0343-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0342-Add-more-Campfire-API.patch rename to patches/api/0343-Add-more-Campfire-API.patch diff --git a/patches/api/0343-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0344-Move-VehicleCollisionEvent-HandlerList-up.patch similarity index 100% rename from patches/api/0343-Move-VehicleCollisionEvent-HandlerList-up.patch rename to patches/api/0344-Move-VehicleCollisionEvent-HandlerList-up.patch diff --git a/patches/api/0344-Improve-scoreboard-entries.patch b/patches/api/0345-Improve-scoreboard-entries.patch similarity index 100% rename from patches/api/0344-Improve-scoreboard-entries.patch rename to patches/api/0345-Improve-scoreboard-entries.patch diff --git a/patches/api/0345-Entity-powdered-snow-API.patch b/patches/api/0346-Entity-powdered-snow-API.patch similarity index 100% rename from patches/api/0345-Entity-powdered-snow-API.patch rename to patches/api/0346-Entity-powdered-snow-API.patch diff --git a/patches/api/0346-Add-API-for-item-entity-health.patch b/patches/api/0347-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0346-Add-API-for-item-entity-health.patch rename to patches/api/0347-Add-API-for-item-entity-health.patch diff --git a/patches/api/0347-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0348-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0347-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0348-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0348-Bucketable-API.patch b/patches/api/0349-Bucketable-API.patch similarity index 100% rename from patches/api/0348-Bucketable-API.patch rename to patches/api/0349-Bucketable-API.patch diff --git a/patches/api/0349-System-prop-for-default-config-comment-parsing.patch b/patches/api/0350-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0349-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0350-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0350-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0351-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0350-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0351-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0351-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0352-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/api/0351-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/api/0352-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/api/0352-Multiple-Entries-with-Scoreboards.patch b/patches/api/0353-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0352-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0353-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0353-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0354-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0353-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0354-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0354-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0355-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0354-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0355-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0355-Multi-Block-Change-API.patch b/patches/api/0356-Multi-Block-Change-API.patch similarity index 100% rename from patches/api/0355-Multi-Block-Change-API.patch rename to patches/api/0356-Multi-Block-Change-API.patch diff --git a/patches/api/0356-Fix-NotePlayEvent.patch b/patches/api/0357-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0356-Fix-NotePlayEvent.patch rename to patches/api/0357-Fix-NotePlayEvent.patch diff --git a/patches/api/0357-Freeze-Tick-Lock-API.patch b/patches/api/0358-Freeze-Tick-Lock-API.patch similarity index 92% rename from patches/api/0357-Freeze-Tick-Lock-API.patch rename to patches/api/0358-Freeze-Tick-Lock-API.patch index 01344fbab1..cb1a3463a1 100644 --- a/patches/api/0357-Freeze-Tick-Lock-API.patch +++ b/patches/api/0358-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 9d6af05deead57a2df9663d76d89ccd8b8aab6d5..f9ca4b90f92f57288654d7006613531b139dcddc 100644 +index 62abbe2149bfb6cb4a38027899863a535e19e94c..b878509ff536f2d728c800a0ae6cd36802570b31 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -279,6 +279,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0358-Dolphin-API.patch b/patches/api/0359-Dolphin-API.patch similarity index 100% rename from patches/api/0358-Dolphin-API.patch rename to patches/api/0359-Dolphin-API.patch diff --git a/patches/api/0359-More-PotionEffectType-API.patch b/patches/api/0360-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0359-More-PotionEffectType-API.patch rename to patches/api/0360-More-PotionEffectType-API.patch diff --git a/patches/api/0360-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0361-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/api/0360-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0361-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/api/0361-Implement-regenerateChunk.patch b/patches/api/0362-Implement-regenerateChunk.patch similarity index 100% rename from patches/api/0361-Implement-regenerateChunk.patch rename to patches/api/0362-Implement-regenerateChunk.patch diff --git a/patches/api/0362-Don-t-load-plugins-prefixed-with-a-dot.patch b/patches/api/0363-Don-t-load-plugins-prefixed-with-a-dot.patch similarity index 100% rename from patches/api/0362-Don-t-load-plugins-prefixed-with-a-dot.patch rename to patches/api/0363-Don-t-load-plugins-prefixed-with-a-dot.patch diff --git a/patches/api/0363-Add-GameEvent-tags.patch b/patches/api/0364-Add-GameEvent-tags.patch similarity index 100% rename from patches/api/0363-Add-GameEvent-tags.patch rename to patches/api/0364-Add-GameEvent-tags.patch diff --git a/patches/api/0364-Furnace-RecipesUsed-API.patch b/patches/api/0365-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0364-Furnace-RecipesUsed-API.patch rename to patches/api/0365-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0365-Configurable-sculk-sensor-listener-range.patch b/patches/api/0366-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0365-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0366-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0366-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0367-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0366-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0367-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0367-Custom-Potion-Mixes.patch b/patches/api/0368-Custom-Potion-Mixes.patch similarity index 100% rename from patches/api/0367-Custom-Potion-Mixes.patch rename to patches/api/0368-Custom-Potion-Mixes.patch diff --git a/patches/api/0368-Expose-furnace-minecart-push-values.patch b/patches/api/0369-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0368-Expose-furnace-minecart-push-values.patch rename to patches/api/0369-Expose-furnace-minecart-push-values.patch diff --git a/patches/api/0369-More-Projectile-API.patch b/patches/api/0370-More-Projectile-API.patch similarity index 99% rename from patches/api/0369-More-Projectile-API.patch rename to patches/api/0370-More-Projectile-API.patch index 34bb8f8c87..f3b615b3c2 100644 --- a/patches/api/0369-More-Projectile-API.patch +++ b/patches/api/0370-More-Projectile-API.patch @@ -47,7 +47,7 @@ index 225a24898acd25038ea2a8448f9f3b57643d3026..d173010d51d05928c35bb4bf5fbc08ce * Sets this arrow to "noclip" status. * diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java -index 0d31aa0b22cf1e849572294e2cfe38b48c9210af..571712e17551f24b369044b8215b722f7183ae7d 100644 +index 0d31aa0b22cf1e849572294e2cfe38b48c9210af..217d348ad0bbef720b25d3b507a55ca8105b7731 100644 --- a/src/main/java/org/bukkit/entity/Firework.java +++ b/src/main/java/org/bukkit/entity/Firework.java @@ -16,6 +16,8 @@ public interface Firework extends Projectile { diff --git a/patches/api/0370-Add-getComputedBiome-API.patch b/patches/api/0371-Add-getComputedBiome-API.patch similarity index 100% rename from patches/api/0370-Add-getComputedBiome-API.patch rename to patches/api/0371-Add-getComputedBiome-API.patch diff --git a/patches/api/0371-Add-enchantWithLevels-API.patch b/patches/api/0372-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/api/0371-Add-enchantWithLevels-API.patch rename to patches/api/0372-Add-enchantWithLevels-API.patch diff --git a/patches/api/0372-Add-TameableDeathMessageEvent.patch b/patches/api/0373-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/api/0372-Add-TameableDeathMessageEvent.patch rename to patches/api/0373-Add-TameableDeathMessageEvent.patch diff --git a/patches/api/0373-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0374-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/api/0373-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/api/0374-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/api/0374-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0375-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/api/0374-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/api/0375-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/api/0375-Update-Folder-Uses-Plugin-Name.patch b/patches/api/0376-Update-Folder-Uses-Plugin-Name.patch similarity index 100% rename from patches/api/0375-Update-Folder-Uses-Plugin-Name.patch rename to patches/api/0376-Update-Folder-Uses-Plugin-Name.patch diff --git a/patches/api/0376-WorldCreator-keepSpawnLoaded.patch b/patches/api/0377-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/api/0376-WorldCreator-keepSpawnLoaded.patch rename to patches/api/0377-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/api/0377-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0378-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/api/0377-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/api/0378-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/api/0378-Add-PlayerStopUsingItemEvent.patch b/patches/api/0379-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/api/0378-Add-PlayerStopUsingItemEvent.patch rename to patches/api/0379-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/api/0379-FallingBlock-auto-expire-setting.patch b/patches/api/0380-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/api/0379-FallingBlock-auto-expire-setting.patch rename to patches/api/0380-FallingBlock-auto-expire-setting.patch diff --git a/patches/api/0380-Keyed-Cat-Type.patch b/patches/api/0381-Keyed-Cat-Type.patch similarity index 100% rename from patches/api/0380-Keyed-Cat-Type.patch rename to patches/api/0381-Keyed-Cat-Type.patch diff --git a/patches/api/0381-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0382-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 96% rename from patches/api/0381-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/api/0382-Add-method-isTickingWorlds-to-Bukkit.patch index 10c607bbbc..e3849626e4 100644 --- a/patches/api/0381-Add-method-isTickingWorlds-to-Bukkit.patch +++ b/patches/api/0382-Add-method-isTickingWorlds-to-Bukkit.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method isTickingWorlds() to Bukkit. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 840aaf9e8fc828b5a7ea02252038c6524680f2e0..232c08c9a588d957d90f198ce479e57615c6e650 100644 +index 41ea6212b52359927bd5c944c886ef32322b9a08..ac9b690fcccb60b587e5345f12f1383afd0a73a1 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -753,12 +753,26 @@ public final class Bukkit { @@ -56,7 +56,7 @@ index 840aaf9e8fc828b5a7ea02252038c6524680f2e0..232c08c9a588d957d90f198ce479e576 * @param world the world to unload * @param save whether to save the chunks before unloading diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index da5cab4246bd253fcc4e4d9574bdae1867ebb5ab..e43fef0152468944d8a33036344a43e95fe58476 100644 +index fe50eb0820b99ce5ad8fb8c53ced08709aa4caef..2204336d8800311b65e894739ab1b27273e7c6f2 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -622,34 +622,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0382-Add-WardenAngerChangeEvent.patch b/patches/api/0383-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/api/0382-Add-WardenAngerChangeEvent.patch rename to patches/api/0383-Add-WardenAngerChangeEvent.patch diff --git a/patches/api/0383-Nameable-Banner-API.patch b/patches/api/0384-Nameable-Banner-API.patch similarity index 100% rename from patches/api/0383-Nameable-Banner-API.patch rename to patches/api/0384-Nameable-Banner-API.patch diff --git a/patches/api/0384-Add-Player-getFishHook.patch b/patches/api/0385-Add-Player-getFishHook.patch similarity index 100% rename from patches/api/0384-Add-Player-getFishHook.patch rename to patches/api/0385-Add-Player-getFishHook.patch diff --git a/patches/api/0385-More-Teleport-API.patch b/patches/api/0386-More-Teleport-API.patch similarity index 99% rename from patches/api/0385-More-Teleport-API.patch rename to patches/api/0386-More-Teleport-API.patch index 24f17beb8d..e447969418 100644 --- a/patches/api/0385-More-Teleport-API.patch +++ b/patches/api/0386-More-Teleport-API.patch @@ -76,7 +76,7 @@ index 0000000000000000000000000000000000000000..0426ee8bd71142b6f933a479c0f2e5ef + +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index f9ca4b90f92f57288654d7006613531b139dcddc..8dd6c7bae8b5ce13e3b4d5847bb204dac5072da6 100644 +index b878509ff536f2d728c800a0ae6cd36802570b31..9bfe62185acb2a208268a2db3aa81dad9e0eed5e 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -122,10 +122,77 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0386-Add-EntityPortalReadyEvent.patch b/patches/api/0387-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/api/0386-Add-EntityPortalReadyEvent.patch rename to patches/api/0387-Add-EntityPortalReadyEvent.patch diff --git a/patches/api/0387-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0388-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/api/0387-Custom-Chat-Completion-Suggestions-API.patch rename to patches/api/0388-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/api/0388-Collision-API.patch b/patches/api/0389-Collision-API.patch similarity index 100% rename from patches/api/0388-Collision-API.patch rename to patches/api/0389-Collision-API.patch diff --git a/patches/api/0389-Block-Ticking-API.patch b/patches/api/0390-Block-Ticking-API.patch similarity index 100% rename from patches/api/0389-Block-Ticking-API.patch rename to patches/api/0390-Block-Ticking-API.patch diff --git a/patches/api/0390-Add-NamespacedKey-biome-methods.patch b/patches/api/0391-Add-NamespacedKey-biome-methods.patch similarity index 95% rename from patches/api/0390-Add-NamespacedKey-biome-methods.patch rename to patches/api/0391-Add-NamespacedKey-biome-methods.patch index 234c3cea63..89d36528f2 100644 --- a/patches/api/0390-Add-NamespacedKey-biome-methods.patch +++ b/patches/api/0391-Add-NamespacedKey-biome-methods.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add NamespacedKey biome methods Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com> diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 70103054057abfec37a99f30075123f9daa4e4ce..9b6600853df559eb941eb85b33c71f98b8df4675 100644 +index aa252abe42c184914d6b50ad1f94ba7ada22d7df..854be548e5a645e7312e6e9390d5255f8b1d61e6 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -243,5 +243,32 @@ public interface UnsafeValues { diff --git a/patches/api/0391-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/api/0392-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 100% rename from patches/api/0391-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/api/0392-Add-custom-destroyerIdentity-to-sendBlockDamage.patch diff --git a/patches/api/0392-Also-load-resources-from-LibraryLoader.patch b/patches/api/0393-Also-load-resources-from-LibraryLoader.patch similarity index 100% rename from patches/api/0392-Also-load-resources-from-LibraryLoader.patch rename to patches/api/0393-Also-load-resources-from-LibraryLoader.patch diff --git a/patches/api/0393-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0394-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/api/0393-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/api/0394-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/api/0394-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0395-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/api/0394-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/api/0395-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/api/0395-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 100% rename from patches/api/0395-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0396-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch diff --git a/patches/api/0396-Add-system-property-to-print-stacktrace-on-bad-plugi.patch b/patches/api/0397-Add-system-property-to-print-stacktrace-on-bad-plugi.patch similarity index 100% rename from patches/api/0396-Add-system-property-to-print-stacktrace-on-bad-plugi.patch rename to patches/api/0397-Add-system-property-to-print-stacktrace-on-bad-plugi.patch diff --git a/patches/api/0397-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/api/0398-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch similarity index 100% rename from patches/api/0397-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch rename to patches/api/0398-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch diff --git a/patches/api/0398-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0399-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/api/0398-Add-PlayerInventorySlotChangeEvent.patch rename to patches/api/0399-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/api/0399-Elder-Guardian-appearance-API.patch b/patches/api/0400-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/api/0399-Elder-Guardian-appearance-API.patch rename to patches/api/0400-Elder-Guardian-appearance-API.patch diff --git a/patches/api/0400-Allow-changing-bed-s-occupied-property.patch b/patches/api/0401-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/api/0400-Allow-changing-bed-s-occupied-property.patch rename to patches/api/0401-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/api/0401-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0402-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/api/0401-Add-EquipmentSlot-convenience-methods.patch rename to patches/api/0402-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/api/0402-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0403-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/api/0402-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/api/0403-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/api/0403-Add-entity-knockback-API.patch b/patches/api/0404-Add-entity-knockback-API.patch similarity index 100% rename from patches/api/0403-Add-entity-knockback-API.patch rename to patches/api/0404-Add-entity-knockback-API.patch diff --git a/patches/api/0404-Added-EntityToggleSitEvent.patch b/patches/api/0405-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/api/0404-Added-EntityToggleSitEvent.patch rename to patches/api/0405-Added-EntityToggleSitEvent.patch diff --git a/patches/api/0405-Add-Moving-Piston-API.patch b/patches/api/0406-Add-Moving-Piston-API.patch similarity index 100% rename from patches/api/0405-Add-Moving-Piston-API.patch rename to patches/api/0406-Add-Moving-Piston-API.patch diff --git a/patches/api/0406-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0407-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/api/0406-Add-PrePlayerAttackEntityEvent.patch rename to patches/api/0407-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/api/0407-Add-Player-Warden-Warning-API.patch b/patches/api/0408-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/api/0407-Add-Player-Warden-Warning-API.patch rename to patches/api/0408-Add-Player-Warden-Warning-API.patch diff --git a/patches/api/0408-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0409-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/api/0408-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/api/0409-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/api/0409-Add-paper-dumplisteners-command.patch b/patches/api/0410-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/api/0409-Add-paper-dumplisteners-command.patch rename to patches/api/0410-Add-paper-dumplisteners-command.patch diff --git a/patches/api/0410-ItemStack-damage-API.patch b/patches/api/0411-ItemStack-damage-API.patch similarity index 100% rename from patches/api/0410-ItemStack-damage-API.patch rename to patches/api/0411-ItemStack-damage-API.patch diff --git a/patches/api/0411-Add-Tick-TemporalUnit.patch b/patches/api/0412-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/api/0411-Add-Tick-TemporalUnit.patch rename to patches/api/0412-Add-Tick-TemporalUnit.patch diff --git a/patches/api/0412-Friction-API.patch b/patches/api/0413-Friction-API.patch similarity index 100% rename from patches/api/0412-Friction-API.patch rename to patches/api/0413-Friction-API.patch diff --git a/patches/api/0413-Player-Entity-Tracking-Events.patch b/patches/api/0414-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/api/0413-Player-Entity-Tracking-Events.patch rename to patches/api/0414-Player-Entity-Tracking-Events.patch diff --git a/patches/api/0414-Add-missing-Fluid-type.patch b/patches/api/0415-Add-missing-Fluid-type.patch similarity index 100% rename from patches/api/0414-Add-missing-Fluid-type.patch rename to patches/api/0415-Add-missing-Fluid-type.patch diff --git a/patches/api/0415-Future-API-Plans.patch b/patches/api/0416-Future-API-Plans.patch similarity index 100% rename from patches/api/0415-Future-API-Plans.patch rename to patches/api/0416-Future-API-Plans.patch diff --git a/patches/server/0647-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0647-Fix-PotionSplashEvent-for-water-splash-potions.patch index ace0228f41..91e4d34e4e 100644 --- a/patches/server/0647-Fix-PotionSplashEvent-for-water-splash-potions.patch +++ b/patches/server/0647-Fix-PotionSplashEvent-for-water-splash-potions.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Fix PotionSplashEvent for water splash potions Fixes SPIGOT-6221: https://hub.spigotmc.org/jira/projects/SPIGOT/issues/SPIGOT-6221 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java -index b5e2c391ebcca05db5c960792fcb14991aec4fe2..b1abab9396cf1dc867e9b8df8f2479f75d07fa01 100644 +index b5e2c391ebcca05db5c960792fcb14991aec4fe2..533aad71202f67206ff4da916b9a8574345aeba3 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java -@@ -123,18 +123,30 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie +@@ -123,33 +123,50 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie } } @@ -17,32 +17,30 @@ index b5e2c391ebcca05db5c960792fcb14991aec4fe2..b1abab9396cf1dc867e9b8df8f2479f7 private void applyWater() { AABB axisalignedbb = this.getBoundingBox().inflate(4.0D, 2.0D, 4.0D); - List list = this.level.getEntitiesOfClass(net.minecraft.world.entity.LivingEntity.class, axisalignedbb, ThrownPotion.WATER_SENSITIVE_OR_ON_FIRE); -+ List list = this.level.getEntitiesOfClass(net.minecraft.world.entity.LivingEntity.class, axisalignedbb, ThrownPotion.APPLY_WATER_GET_ENTITIES_PREDICATE); // Paper -+ Map affected = new HashMap<>(); // Paper ++ // Paper start ++ List list = this.level.getEntitiesOfClass(net.minecraft.world.entity.LivingEntity.class, axisalignedbb, ThrownPotion.APPLY_WATER_GET_ENTITIES_PREDICATE); ++ Map affected = new HashMap<>(); ++ java.util.Set rehydrate = new java.util.HashSet<>(); ++ java.util.Set extinguish = new java.util.HashSet<>(); Iterator iterator = list.iterator(); while (iterator.hasNext()) { net.minecraft.world.entity.LivingEntity entityliving = (net.minecraft.world.entity.LivingEntity) iterator.next(); -+ // Paper start - Change into single getEntities for axolotls & water sensitive + if (entityliving instanceof Axolotl axolotl) { -+ affected.put(axolotl.getBukkitLivingEntity(), 1.0); -+ continue; ++ rehydrate.add(((org.bukkit.entity.Axolotl) axolotl.getBukkitEntity())); + } -+ // Paper end double d0 = this.distanceToSqr((Entity) entityliving); if (d0 < 16.0D) { if (entityliving.isSensitiveToWater()) { - entityliving.hurt(DamageSource.indirectMagic(this, this.getOwner()), 1.0F); -+ // Paper start -+ double intensity = 1.0D - Math.sqrt(d0) / 4.0D; -+ affected.put(entityliving.getBukkitLivingEntity(), intensity); -+ // entityliving.hurt(DamageSource.indirectMagic(this, this.getOwner()), 1.0F); // Paper - moved down -+ // Paper end ++ affected.put(entityliving.getBukkitLivingEntity(), 1.0); } if (entityliving.isOnFire() && entityliving.isAlive()) { -@@ -143,13 +155,18 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie +- entityliving.extinguishFire(); ++ extinguish.add(entityliving.getBukkitLivingEntity()); + } } } @@ -53,15 +51,19 @@ index b5e2c391ebcca05db5c960792fcb14991aec4fe2..b1abab9396cf1dc867e9b8df8f2479f7 - Axolotl axolotl = (Axolotl) iterator1.next(); - - axolotl.rehydrate(); -+ // Paper start -+ org.bukkit.event.entity.PotionSplashEvent event = CraftEventFactory.callPotionSplashEvent(this, affected); -+ if (!event.isCancelled()) { -+ for (LivingEntity affectedEntity : event.getAffectedEntities()) { -+ net.minecraft.world.entity.LivingEntity entityliving = ((CraftLivingEntity) affectedEntity).getHandle(); -+ if (entityliving instanceof Axolotl axolotl && event.getIntensity(affectedEntity) > 0) { ++ io.papermc.paper.event.entity.WaterBottleSplashEvent event = new io.papermc.paper.event.entity.WaterBottleSplashEvent( ++ (org.bukkit.entity.ThrownPotion) this.getBukkitEntity(), affected, rehydrate, extinguish ++ ); ++ if (event.callEvent()) { ++ for (LivingEntity affectedEntity : event.getToDamage()) { ++ ((CraftLivingEntity) affectedEntity).getHandle().hurt(DamageSource.indirectMagic(this, this.getOwner()), 1.0F); ++ } ++ for (LivingEntity toExtinguish : event.getToExtinguish()) { ++ ((CraftLivingEntity) toExtinguish).getHandle().extinguishFire(); ++ } ++ for (LivingEntity toRehydrate : event.getToRehydrate()) { ++ if (((CraftLivingEntity) toRehydrate).getHandle() instanceof Axolotl axolotl) { + axolotl.rehydrate(); -+ } else { -+ entityliving.hurt(DamageSource.indirectMagic(this, this.getOwner()), 1.0F); + } + } + // Paper end