Merge pull request #347 from MrJeremyFisher/pot-glitch-fix

Don't heal dead entities with health potions
CivMC · May 1, 2024 · c172178 · c172178
2 parents fbc5552 + a6db779
commit c172178
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/PotionListener.java b/plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/PotionListener.java
@@ -101,14 +101,14 @@ public void healthPotSplash(PotionSplashEvent e) {
 
 			modifiedHealth += intensity * multiplier * (healingEffect.getAmplifier() + 1)
 					* healthPerPotionLevel;
-			entity.setHealth(Math.min(maxHealth, modifiedHealth));
+			if (!entity.isDead()) entity.setHealth(Math.min(maxHealth, modifiedHealth));
 		}
 	}
 
 	@EventHandler
 	public void itemConsume(PlayerItemConsumeEvent e) {
 		PotionModification potMod = getModification(e.getItem());
-		if (potMod == null) {
+		if (potMod == null || e.getPlayer().isDead()) {
 			return;
 		}
 		PotionMeta potMeta = (PotionMeta) e.getItem().getItemMeta();
@@ -141,7 +141,7 @@ public void potionSplash(PotionSplashEvent e) {
 						ent.addPotionEffect(potEffect, false);
 					};
 			for (LivingEntity ent : e.getAffectedEntities()) {
-				impact.accept(ent);
+				if (!ent.isDead()) impact.accept(ent);
 			}
 		});
 	}