geforkt von Mirrors/Paper
96d5e6ca48
Currently includes generated key holder classes for types used in the Registry Modification API
151 Zeilen
5.4 KiB
Diff
151 Zeilen
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 bc6ba6c4c07cacfc6ab7a2a72b12dfba110ba911..2e58b716fdb21026d2ee838e81559601344c8a00 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java
|
|
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable;
|
|
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
|
|
|
|
@Deprecated
|
|
public PotionSplashEvent(@NotNull final ThrownPotion potion, @NotNull final Map<LivingEntity, Double> affectedEntities) {
|