mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 20:21:51 +01:00
efd47e3a68
* Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices ecfa559a PR-849: Add InventoryView#setTitle 653d7edb SPIGOT-519: Add TNTPrimeEvent 22fccc09 PR-846: Add method to get chunk load level a070a52c PR-844: Add methods to convert Vector to and from JOML vectors cc7111fe PR-276: Add accessors to Wither's invulnerability ticks 777d24e9 SPIGOT-7209: Accessors and events for player's exp cooldown ccb2d01b SPIGOT-6308: Deprecate the location name property of map items cd04a31b PR-780: Add PlayerSpawnChangeEvent 7d1f5b64 SPIGOT-6780: Improve documentation for World#spawnFallingBlock 5696668a SPIGOT-6885: Add test and easier to debug code for reference in yaml configuration comments 2e13cff7 PR-589: Expand the FishHook API 2c7d3da5 PR-279: Minor edits to various Javadocs CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices a7cfc778f PR-1176: Add InventoryView#setTitle 563d42226 SPIGOT-519: Add TNTPrimeEvent ccbc6abca Add test for Chunk.LoadLevel mirroring 2926e0513 PR-1171: Add method to get chunk load level 63cad7f84 PR-375: Add accessors to Wither's invulnerability ticks bfd8b1ac8 SPIGOT-7209: Accessors and events for player's exp cooldown f92a41c39 PR-1181: Consolidate Location conversion code 10f866759 SPIGOT-6308: Deprecate the location name property of map items 82f7b658a PR-1095: Add PlayerSpawnChangeEvent b421af7e4 PR-808: Expand the FishHook API 598ad7b3f Increase outdated build delay Spigot Changes: d1bd3bd2 Rebuild patches e4265cc8 SPIGOT-7297: Entity Tracking Range option for Display entities * Work around javac bug * Call PlayerSpawnChangeEvent * Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices Spigot Changes: 7da74dae Rebuild patches
150 lines
5.4 KiB
Diff
150 lines
5.4 KiB
Diff
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<LivingEntity> rehydrate;
|
|
+ private final @NotNull Set<LivingEntity> extinguish;
|
|
+
|
|
+ public WaterBottleSplashEvent(
|
|
+ final @NotNull ThrownPotion potion,
|
|
+ final @NotNull Map<LivingEntity, Double> affectedEntities,
|
|
+ final @NotNull Set<LivingEntity> rehydrate,
|
|
+ final @NotNull Set<LivingEntity> 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<LivingEntity> 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.
|
|
+ * <p>
|
|
+ * 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<LivingEntity> 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<LivingEntity> getToExtinguish() {
|
|
+ return this.extinguish;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return a confusing collection, don't use it
|
|
+ * @deprecated Use {@link #getToDamage()}
|
|
+ */
|
|
+ @Deprecated
|
|
+ @Override
|
|
+ public @NotNull Collection<LivingEntity> 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<LivingEntity, Double> affectedEntities;
|
|
+ protected final Map<LivingEntity, Double> affectedEntities; // Paper
|
|
|
|
public PotionSplashEvent(@NotNull final ThrownPotion potion, @NotNull final Map<LivingEntity, Double> affectedEntities) {
|
|
super(potion);
|