CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Don't heal dead entities with health potions
This commit is contained in:
RedDevel2
2024-05-01 23:16:17 +02:00
committed by GitHub
parent 6b6fa21d8d 13a3378872
commit a7815e5b7b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/PotionListener.java
View File

@@ -101,14 +101,14 @@ public class PotionListener implements Listener {
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 class PotionListener implements Listener {
ent.addPotionEffect(potEffect, false);
};
for (LivingEntity ent : e.getAffectedEntities()) {
impact.accept(ent);
if (!ent.isDead()) impact.accept(ent);
}
});
}