mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 15:30:19 +01:00
bd38e0318a
Updated Upstream (Bukkit/CraftBukkit) 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: f02baa38 PR-988: Add World#getIntersectingChunks(BoundingBox) 9321d665 Move getItemInUse up to LivingEntity 819eef73 PR-959: Add access to current item's remaining ticks c4fdadb0 SPIGOT-7601: Add AbstractArrow#getItem be8261ca Add support for Java 22 26119676 PR-979: Add more translation keys 66753362 PR-985: Correct book maximum pages and characters per page documentation c8be92fa PR-980: Improve getArmorContents() documentation f1120ee2 PR-983: Expose riptide velocity to PlayerRiptideEvent CraftBukkit Changes: dfaa89bbe PR-1369: Add World#getIntersectingChunks(BoundingBox) 51bbab2b9 Move getItemInUse up to LivingEntity 668e09602 PR-1331: Add access to current item's remaining ticks a639406d1 SPIGOT-7601: Add AbstractArrow#getItem 0398930fc SPIGOT-7602: Allow opening in-world horse and related inventories ffd15611c SPIGOT-7608: Allow empty lists to morph to any PDT list 2188dcfa9 Add support for Java 22 45d6a609f SPIGOT-7604: Revert "SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime" 06d915943 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime ca3bc3707 PR-1361: Add more translation keys 366c3ca80 SPIGOT-7600: EntityChangeBlockEvent is not fired for frog eggs 06d0f9ba8 SPIGOT-7593: Fix sapling growth physics / client-side updates 45c2608e4 PR-1366: Expose riptide velocity to PlayerRiptideEvent 29b6bb79b SPIGOT-7587: Remove fixes for now-resolved MC-142590 and MC-109346
192 lines
11 KiB
Diff
192 lines
11 KiB
Diff
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 potions splash events
|
|
|
|
Fix PotionSplashEvent for water splash potions
|
|
Fixes SPIGOT-6221: https://hub.spigotmc.org/jira/projects/SPIGOT/issues/SPIGOT-6221
|
|
Fix splash events cancellation that still show particles/sound
|
|
|
|
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 6e921bf7101224d6b8261ab8d87724080c4095d7..0204257ca0245830534592922e400a362c347715 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
|
|
@@ -106,56 +106,77 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
|
|
Potion potionregistry = PotionUtils.getPotion(itemstack);
|
|
List<MobEffectInstance> list = PotionUtils.getMobEffects(itemstack);
|
|
boolean flag = potionregistry == Potions.WATER && list.isEmpty();
|
|
+ boolean showParticles = true; // Paper - Fix potions splash events
|
|
|
|
if (flag) {
|
|
- this.applyWater();
|
|
+ showParticles = this.applyWater(hitResult); // Paper - Fix potions splash events
|
|
} else if (true || !list.isEmpty()) { // CraftBukkit - Call event even if no effects to apply
|
|
if (this.isLingering()) {
|
|
- this.makeAreaOfEffectCloud(itemstack, potionregistry, hitResult); // CraftBukkit - Pass MovingObjectPosition
|
|
+ showParticles = this.makeAreaOfEffectCloud(itemstack, potionregistry, hitResult); // CraftBukkit - Pass MovingObjectPosition // Paper
|
|
} else {
|
|
- this.applySplash(list, hitResult.getType() == HitResult.Type.ENTITY ? ((EntityHitResult) hitResult).getEntity() : null, hitResult); // CraftBukkit - Pass MovingObjectPosition
|
|
+ showParticles = this.applySplash(list, hitResult.getType() == HitResult.Type.ENTITY ? ((EntityHitResult) hitResult).getEntity() : null, hitResult); // CraftBukkit - Pass MovingObjectPosition // Paper
|
|
}
|
|
}
|
|
|
|
+ if (showParticles) { // Paper - Fix potions splash events
|
|
int i = potionregistry.hasInstantEffects() ? 2007 : 2002;
|
|
|
|
this.level().levelEvent(i, this.blockPosition(), PotionUtils.getColor(itemstack));
|
|
+ } // Paper - Fix potions splash events
|
|
this.discard(EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
|
|
}
|
|
}
|
|
|
|
- private void applyWater() {
|
|
+ private static final Predicate<net.minecraft.world.entity.LivingEntity> APPLY_WATER_GET_ENTITIES_PREDICATE = ThrownPotion.WATER_SENSITIVE_OR_ON_FIRE.or(Axolotl.class::isInstance); // Paper - Fix potions splash events
|
|
+ private boolean applyWater(@Nullable HitResult hitResult) { // Paper - Fix potions splash events
|
|
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_OR_ON_FIRE);
|
|
+ // Paper start - Fix potions splash events
|
|
+ List<net.minecraft.world.entity.LivingEntity> list = this.level().getEntitiesOfClass(net.minecraft.world.entity.LivingEntity.class, axisalignedbb, ThrownPotion.APPLY_WATER_GET_ENTITIES_PREDICATE);
|
|
+ Map<LivingEntity, Double> affected = new HashMap<>();
|
|
+ java.util.Set<LivingEntity> rehydrate = new java.util.HashSet<>();
|
|
+ java.util.Set<LivingEntity> 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();
|
|
+ if (entityliving instanceof Axolotl axolotl) {
|
|
+ rehydrate.add(((org.bukkit.entity.Axolotl) axolotl.getBukkitEntity()));
|
|
+ }
|
|
double d0 = this.distanceToSqr((Entity) entityliving);
|
|
|
|
if (d0 < 16.0D) {
|
|
if (entityliving.isSensitiveToWater()) {
|
|
- entityliving.hurt(this.damageSources().indirectMagic(this, this.getOwner()), 1.0F);
|
|
+ affected.put(entityliving.getBukkitLivingEntity(), 1.0);
|
|
}
|
|
|
|
if (entityliving.isOnFire() && entityliving.isAlive()) {
|
|
- entityliving.extinguishFire();
|
|
+ extinguish.add(entityliving.getBukkitLivingEntity());
|
|
}
|
|
}
|
|
}
|
|
|
|
- List<Axolotl> list1 = this.level().getEntitiesOfClass(Axolotl.class, axisalignedbb);
|
|
- Iterator iterator1 = list1.iterator();
|
|
-
|
|
- while (iterator1.hasNext()) {
|
|
- Axolotl axolotl = (Axolotl) iterator1.next();
|
|
-
|
|
- axolotl.rehydrate();
|
|
+ io.papermc.paper.event.entity.WaterBottleSplashEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callWaterBottleSplashEvent(
|
|
+ this, hitResult, affected, rehydrate, extinguish
|
|
+ );
|
|
+ if (!event.isCancelled()) {
|
|
+ for (LivingEntity affectedEntity : event.getToDamage()) {
|
|
+ ((CraftLivingEntity) affectedEntity).getHandle().hurt(this.damageSources().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();
|
|
+ }
|
|
+ }
|
|
+ // Paper end - Fix potions splash events
|
|
}
|
|
+ return !event.isCancelled(); // Paper - Fix potions splash events
|
|
|
|
}
|
|
|
|
- private void applySplash(List<MobEffectInstance> list, @Nullable Entity entity, HitResult position) { // CraftBukkit - Pass MovingObjectPosition
|
|
+ private boolean applySplash(List<MobEffectInstance> list, @Nullable Entity entity, HitResult position) { // CraftBukkit - Pass MovingObjectPosition // Paper - Fix potions splash events
|
|
AABB axisalignedbb = this.getBoundingBox().inflate(4.0D, 2.0D, 4.0D);
|
|
List<net.minecraft.world.entity.LivingEntity> list1 = this.level().getEntitiesOfClass(net.minecraft.world.entity.LivingEntity.class, axisalignedbb);
|
|
Map<LivingEntity, Double> affected = new HashMap<LivingEntity, Double>(); // CraftBukkit
|
|
@@ -173,6 +194,7 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
|
|
if (d0 < 16.0D) {
|
|
double d1;
|
|
|
|
+ // Paper - diff on change, used when calling the splash event for water splash potions
|
|
if (entityliving == entity) {
|
|
d1 = 1.0D;
|
|
} else {
|
|
@@ -227,10 +249,11 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
|
|
}
|
|
}
|
|
}
|
|
+ return !event.isCancelled(); // Paper - Fix potions splash events
|
|
|
|
}
|
|
|
|
- private void makeAreaOfEffectCloud(ItemStack itemstack, Potion potionregistry, HitResult position) { // CraftBukkit - Pass MovingObjectPosition
|
|
+ private boolean makeAreaOfEffectCloud(ItemStack itemstack, Potion potionregistry, HitResult position) { // CraftBukkit - Pass MovingObjectPosition // Paper - return boolean
|
|
AreaEffectCloud entityareaeffectcloud = new AreaEffectCloud(this.level(), this.getX(), this.getY(), this.getZ());
|
|
Entity entity = this.getOwner();
|
|
|
|
@@ -245,10 +268,12 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
|
|
entityareaeffectcloud.setPotion(potionregistry);
|
|
Iterator iterator = PotionUtils.getCustomEffects(itemstack).iterator();
|
|
|
|
+ boolean noEffects = potionregistry.getEffects().isEmpty(); // Paper - Fix potions splash events
|
|
while (iterator.hasNext()) {
|
|
MobEffectInstance mobeffect = (MobEffectInstance) iterator.next();
|
|
|
|
entityareaeffectcloud.addEffect(new MobEffectInstance(mobeffect));
|
|
+ noEffects = false; // Paper - Fix potions splash events
|
|
}
|
|
|
|
CompoundTag nbttagcompound = itemstack.getTag();
|
|
@@ -259,12 +284,13 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
|
|
|
|
// CraftBukkit start
|
|
org.bukkit.event.entity.LingeringPotionSplashEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callLingeringPotionSplashEvent(this, position, entityareaeffectcloud);
|
|
- if (!(event.isCancelled() || entityareaeffectcloud.isRemoved())) {
|
|
+ if (!(event.isCancelled() || entityareaeffectcloud.isRemoved() || (noEffects && entityareaeffectcloud.effects.isEmpty() && entityareaeffectcloud.getPotion().getEffects().isEmpty()))) { // Paper - don't spawn area effect cloud if the effects were empty and not changed during the event handling
|
|
this.level().addFreshEntity(entityareaeffectcloud);
|
|
} else {
|
|
entityareaeffectcloud.discard(null); // CraftBukkit - add Bukkit remove cause
|
|
}
|
|
// CraftBukkit end
|
|
+ return !event.isCancelled(); // Paper - Fix potions splash events
|
|
}
|
|
|
|
public boolean isLingering() {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index 5d4fe10d4e3a5d7a9430dbd5b3c850db482f5862..74df21363c96dbf82337550ae2d8525e82eaface 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -876,6 +876,32 @@ public class CraftEventFactory {
|
|
return event;
|
|
}
|
|
|
|
+ // Paper start - Fix potions splash events
|
|
+ public static io.papermc.paper.event.entity.WaterBottleSplashEvent callWaterBottleSplashEvent(net.minecraft.world.entity.projectile.ThrownPotion potion, @Nullable HitResult hitResult, Map<LivingEntity, Double> affectedEntities, java.util.Set<LivingEntity> rehydrate, java.util.Set<LivingEntity> extinguish) {
|
|
+ ThrownPotion thrownPotion = (ThrownPotion) potion.getBukkitEntity();
|
|
+
|
|
+ Block hitBlock = null;
|
|
+ BlockFace hitFace = null;
|
|
+ org.bukkit.entity.Entity hitEntity = null;
|
|
+
|
|
+ if (hitResult != null) {
|
|
+ if (hitResult.getType() == HitResult.Type.BLOCK) {
|
|
+ BlockHitResult blockHitResult = (BlockHitResult) hitResult;
|
|
+ hitBlock = CraftBlock.at(potion.level(), blockHitResult.getBlockPos());
|
|
+ hitFace = CraftBlock.notchToBlockFace(blockHitResult.getDirection());
|
|
+ } else if (hitResult.getType() == HitResult.Type.ENTITY) {
|
|
+ hitEntity = ((EntityHitResult) hitResult).getEntity().getBukkitEntity();
|
|
+ }
|
|
+ }
|
|
+
|
|
+ io.papermc.paper.event.entity.WaterBottleSplashEvent event = new io.papermc.paper.event.entity.WaterBottleSplashEvent(
|
|
+ thrownPotion, hitEntity, hitBlock, hitFace, affectedEntities, rehydrate, extinguish
|
|
+ );
|
|
+ event.callEvent();
|
|
+ return event;
|
|
+ }
|
|
+ // Paper end - Fix potions splash events
|
|
+
|
|
/**
|
|
* BlockFadeEvent
|
|
*/
|