From a50e2736a7c6fb68613175d82d55cfc3ad0ff9b8 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sun, 5 Dec 2021 17:56:55 -0800
Subject: [PATCH] Include axolotls in affected entities for water splash
 potions (#7024)

Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
---
 ...SplashEvent-for-water-splash-potions.patch | 46 ++++++++++++++-----
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/patches/server/0683-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0683-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 3c51815a89..77e8e4be3d 100644
--- a/patches/server/0683-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/server/0683-Fix-PotionSplashEvent-for-water-splash-potions.patch
@@ -6,18 +6,31 @@ 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 517a0f6bf847c5bf01851ae326d1b12332c2672c..1adcc0321b5528a4a173027be67139a9e9be5770 100644
+index 517a0f6bf847c5bf01851ae326d1b12332c2672c..aca9d1c2cf92ee47c646de060ae8e8f4eb7b3ddd 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
-@@ -125,6 +125,7 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
+@@ -122,30 +122,47 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
+         }
+     }
+ 
++    private static final Predicate<net.minecraft.world.entity.LivingEntity> APPLY_WATER_GET_ENTITIES_PREDICATE = ThrownPotion.WATER_SENSITIVE.or(Axolotl.class::isInstance); // Paper
      private void applyWater() {
          AABB axisalignedbb = this.getBoundingBox().inflate(4.0D, 2.0D, 4.0D);
-         List<net.minecraft.world.entity.LivingEntity> list = this.level.getEntitiesOfClass(net.minecraft.world.entity.LivingEntity.class, axisalignedbb, ThrownPotion.WATER_SENSITIVE);
+-        List<net.minecraft.world.entity.LivingEntity> list = this.level.getEntitiesOfClass(net.minecraft.world.entity.LivingEntity.class, axisalignedbb, ThrownPotion.WATER_SENSITIVE);
++        List<net.minecraft.world.entity.LivingEntity> list = this.level.getEntitiesOfClass(net.minecraft.world.entity.LivingEntity.class, axisalignedbb, ThrownPotion.APPLY_WATER_GET_ENTITIES_PREDICATE); // Paper
 +        Map<LivingEntity, Double> affected = new HashMap<>(); // Paper
  
          if (!list.isEmpty()) {
              Iterator iterator = list.iterator();
-@@ -134,11 +135,23 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
+ 
+             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;
++                }
++                // Paper end
                  double d0 = this.distanceToSqr((Entity) entityliving);
  
                  if (d0 < 16.0D && entityliving.isSensitiveToWater()) {
@@ -26,23 +39,34 @@ index 517a0f6bf847c5bf01851ae326d1b12332c2672c..1adcc0321b5528a4a173027be67139a9
 +                    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
                  }
              }
          }
  
+-        List<Axolotl> list1 = this.level.getEntitiesOfClass(Axolotl.class, axisalignedbb);
+-        Iterator iterator1 = list1.iterator();
+-
+-        while (iterator1.hasNext()) {
+-            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();
-+                entityliving.hurt(DamageSource.indirectMagic(entityliving, this.getOwner()), 1.0F);
++                if (entityliving instanceof Axolotl axolotl && event.getIntensity(affectedEntity) > 0) {
++                    axolotl.rehydrate();
++                } else {
++                    entityliving.hurt(DamageSource.indirectMagic(this, this.getOwner()), 1.0F);
++                }
 +            }
-+        }
-+        // Paper end
-+
-         List<Axolotl> list1 = this.level.getEntitiesOfClass(Axolotl.class, axisalignedbb);
-         Iterator iterator1 = list1.iterator();
++            // Paper end
+         }
  
-@@ -166,6 +179,7 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
+     }
+@@ -166,6 +183,7 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
                      double d0 = this.distanceToSqr((Entity) entityliving);
  
                      if (d0 < 16.0D) {