Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 12:35:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert projectile hit on splash (#3162)

Browse Source 
* Revert projectile hit on splash

* Notes about potions splashing after hit cancelled
This commit is contained in:
Traks 2021-07-15 18:43:05 +02:00 committed by GitHub
parent fe65a0c548
commit 2e64ac6d25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
View File

@ -62,6 +62,13 @@ public class ProjectileEventListener implements Listener {
this.plotAreaManager = plotAreaManager; this.plotAreaManager = plotAreaManager;
} }
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onLingeringPotionSplash(LingeringPotionSplashEvent event) {
// Cancelling projectile hit events still results in area effect clouds.
// We need to cancel the splash events to get rid of those.
onProjectileHit(event);
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPotionSplash(PotionSplashEvent event) { public void onPotionSplash(PotionSplashEvent event) {
ThrownPotion damager = event.getPotion(); ThrownPotion damager = event.getPotion();
@ -78,6 +85,11 @@ public class ProjectileEventListener implements Listener {
} }
if (count > 0 && count == event.getAffectedEntities().size()) { if (count > 0 && count == event.getAffectedEntities().size()) {
event.setCancelled(true); event.setCancelled(true);
} else {
// Cancelling projectile hit events still results in potions
// splashing in the world. We need to cancel the splash events to
// avoid that.
onProjectileHit(event);
} }
} }