Merge pull request #810 from gundom0802/main

Added lastdamagecause.attacker and changed signature in getTargetName to Entity
TheComputerGeek2 · Dec 14, 2023 · 8db69b7 · 8db69b7
2 parents f798834 + c83210a
commit 8db69b7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/core/src/main/java/com/nisovin/magicspells/MagicSpells.java b/core/src/main/java/com/nisovin/magicspells/MagicSpells.java
@@ -27,6 +27,7 @@
 
 import org.bukkit.*;
 import org.bukkit.event.Event;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.entity.EntityType;
@@ -1704,9 +1705,11 @@ public static boolean requireReplacement(String message) {
 		return matcher.find();
 	}
 
-	public static String getTargetName(LivingEntity target) {
+	public static String getTargetName(Entity target) {
 		if (target instanceof Player) return target.getName();
 
+		if (target.customName() != null) return Util.getStrictStringFromComponent(target.customName());
+
 		EntityType type = target.getType();
 		String name = plugin.entityNames.get(type);
 		if (name != null) return name;

diff --git a/core/src/main/java/com/nisovin/magicspells/util/data/DataEntity.java b/core/src/main/java/com/nisovin/magicspells/util/data/DataEntity.java
@@ -7,9 +7,11 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.SpawnCategory;
 import org.bukkit.command.CommandSender;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
 
 import com.nisovin.magicspells.util.Util;
-import org.bukkit.event.entity.EntityDamageEvent;
+import com.nisovin.magicspells.MagicSpells;
 
 public class DataEntity {
 
@@ -41,6 +43,10 @@ public class DataEntity {
 			EntityDamageEvent event = entity.getLastDamageCause();
 			return event == null ? "" : event.getDamage() + "";
 		});
+		dataElements.put("lastdamagecause.attacker", entity -> {
+			if (!(entity.getLastDamageCause() instanceof EntityDamageByEntityEvent event)) return "";
+			return MagicSpells.getTargetName(event.getDamager());
+		});
 		dataElements.put("velocity", entity -> entity.getVelocity().toString());
 		dataElements.put("velocity.x", entity -> entity.getVelocity().getX() + "");
 		dataElements.put("velocity.y", entity -> entity.getVelocity().getY() + "");