Merge pull request #993 from JasperLorelai/main

Fix deprecation condition
TheComputerGeek2 · Mar 7, 2025 · f7a3369 · f7a3369
2 parents 16b249c + 34ccdc2
commit f7a3369
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/main/java/com/nisovin/magicspells/spells/targeted/DotSpell.java b/core/src/main/java/com/nisovin/magicspells/spells/targeted/DotSpell.java
@@ -67,7 +67,7 @@ public DotSpell(MagicConfig config, String spellName) {
 		activeDots = new HashMap<>();
 
 		MagicSpells.getDeprecationManager().addDeprecation(this, DAMAGE_TYPE_DEPRECATION_NOTICE,
-			!damage.isConstant() || damage.get() > 0
+			!damageType.isConstant() || damageType.get() != DamageCause.ENTITY_ATTACK
 		);
 	}
 

diff --git a/core/src/main/java/com/nisovin/magicspells/util/ValidTargetList.java b/core/src/main/java/com/nisovin/magicspells/util/ValidTargetList.java
@@ -192,7 +192,7 @@ public boolean canTarget(LivingEntity caster, Entity target, boolean targetPlaye
 		if (targetCasterPassenger && target instanceof LivingEntity && target.isInsideVehicle() && caster.equals(target.getVehicle())) return true;
 		if (targetCasterMount && target instanceof LivingEntity && caster.isInsideVehicle() && target.equals(caster.getVehicle())) return true;
 
-		if (targetEntityTarget && (caster instanceof Creature creature) && creature.getTarget() != null && ((Creature) caster).getTarget().equals(target)) return true;
+		if (targetEntityTarget && (caster instanceof Creature creature) && creature.getTarget() != null && creature.getTarget().equals(target)) return true;
 		if (types.contains(target.getType())) return true;
 		return false;
 	}