Damage & Heal displays - blacklist ArmorStand

DecentSoftware-eu · Dec 19, 2022 · 420682b · 420682b
1 parent 032ee49
commit 420682b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/eu/decentsoftware/holograms/plugin/features/DamageDisplayFeature.java b/src/main/java/eu/decentsoftware/holograms/plugin/features/DamageDisplayFeature.java
@@ -9,6 +9,7 @@
 import lombok.NonNull;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -95,7 +96,7 @@ public void onDamage(EntityDamageEvent e) {
 
 		Entity entity = e.getEntity();
 
-		if (!(entity instanceof LivingEntity)) {
+		if (!(entity instanceof LivingEntity) || entity instanceof ArmorStand) {
 			return;
 		}
 
@@ -137,7 +138,7 @@ private boolean isCritical(@NonNull Player player) {
 		}
 		try {
 			// Slow Falling is not in all versions
-			if (player.hasPotionEffect(PotionEffectType.SLOW_FALLING)) {
+			if (player.hasPotionEffect(PotionEffectType.getByName("SLOW_FALLING"))) {
 				return false;
 			}
 		} catch (Exception ignored) {

diff --git a/src/main/java/eu/decentsoftware/holograms/plugin/features/HealingDisplayFeature.java b/src/main/java/eu/decentsoftware/holograms/plugin/features/HealingDisplayFeature.java
@@ -7,6 +7,7 @@
 import eu.decentsoftware.holograms.api.utils.config.FileConfig;
 import eu.decentsoftware.holograms.api.utils.location.LocationUtils;
 import org.bukkit.Location;
+import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -86,7 +87,7 @@ public void onRegain(EntityRegainHealthEvent e) {
 
 		Entity entity = e.getEntity();
 
-		if (!(entity instanceof LivingEntity)) {
+		if (!(entity instanceof LivingEntity) || entity instanceof ArmorStand) {
 			return;
 		}