Paper/patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch

77 lines
4.2 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 20 May 2021 20:40:53 -0700
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
2022-03-01 06:43:03 +01:00
index ebe9b713905d33a4107fe32874a783e154bd0524..fee09e6ff72cf1da389d5811dd005642cd50a5b4 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
2022-03-01 06:43:03 +01:00
@@ -121,30 +121,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
2021-06-11 14:02:28 +02:00
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.APPLY_WATER_GET_ENTITIES_PREDICATE); // Paper
2021-06-11 14:02:28 +02:00
+ Map<LivingEntity, Double> affected = new HashMap<>(); // Paper
if (!list.isEmpty()) {
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;
+ }
+ // Paper end
2021-11-25 00:26:29 +01:00
double d0 = this.distanceToSqr((Entity) entityliving);
2021-06-11 14:02:28 +02:00
if (d0 < 16.0D && entityliving.isSensitiveToWater()) {
2021-11-25 00:26:29 +01:00
- entityliving.hurt(DamageSource.indirectMagic(this, this.getOwner()), 1.0F);
2021-06-11 14:02:28 +02:00
+ // Paper start
+ double intensity = 1.0D - Math.sqrt(d0) / 4.0D;
+ affected.put(entityliving.getBukkitLivingEntity(), intensity);
2021-11-25 00:26:29 +01:00
+ // entityliving.hurt(DamageSource.indirectMagic(this, this.getOwner()), 1.0F); // Paper - moved down
+ // Paper end
2021-06-11 14:02:28 +02:00
}
}
}
- 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
2021-06-11 14:02:28 +02:00
+ 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) {
+ axolotl.rehydrate();
+ } else {
+ entityliving.hurt(DamageSource.indirectMagic(this, this.getOwner()), 1.0F);
+ }
2021-06-11 14:02:28 +02:00
+ }
+ // Paper end
}
2021-06-11 14:02:28 +02:00
}
2022-03-01 06:43:03 +01:00
@@ -165,6 +182,7 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
2021-11-25 00:26:29 +01:00
double d0 = this.distanceToSqr((Entity) entityliving);
2021-06-11 14:02:28 +02:00
if (d0 < 16.0D) {
+ // Paper - diff on change, used when calling the splash event for water splash potions
double d1 = 1.0D - Math.sqrt(d0) / 4.0D;
if (entityliving == entity) {