Fix potions thrown by a dispenser not applying effects when pve flag …

…is 'false'
Craftstuebchen · May 12, 2024 · d5dbcce · d5dbcce
1 parent 446a429
commit d5dbcce
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java
@@ -51,6 +51,7 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
+import org.bukkit.entity.ThrownPotion;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.projectiles.BlockProjectileSource;
 import org.bukkit.projectiles.ProjectileSource;
@@ -335,9 +336,17 @@ public static boolean entityDamage(Entity damager, Entity victim, EntityDamageEv
                 }
             }
             return true;
-        } else if (dplot != null && (!dplot.equals(vplot) || Objects
-                .equals(dplot.getOwnerAbs(), vplot.getOwnerAbs()))) {
-            return vplot != null && vplot.getFlag(PveFlag.class);
+        } else {
+            if (damager instanceof ThrownPotion thrownPotion && thrownPotion.getShooter() instanceof BlockProjectileSource && Objects.equals(
+                    dplot,
+                    vplot
+            )) {
+                return true;
+            }
+
+            if (dplot != null && (!dplot.equals(vplot) || Objects.equals(dplot.getOwnerAbs(), vplot.getOwnerAbs()))) {
+                return vplot != null && vplot.getFlag(PveFlag.class);
+            }
         }
         //disable the firework damage. too much of a headache to support at the moment.
         if (vplot != null) {