1 files changed, 9 insertions, 1 deletions
diff --git a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeServerCommandSender.java b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeServerCommandSender.java
index a2162ee..36ac1ca 100644
--- a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeServerCommandSender.java
+++ b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeServerCommandSender.java
@@ -70,6 +70,14 @@ public class NeoForgeServerCommandSender extends AbstractCommandSender<CommandSo
 
     @Override
     protected Object getObjectForComparison() {
-        return this.delegate.getEntity();
+        UUID uniqueId = getUniqueId();
+        if (uniqueId != null) {
+            return uniqueId;
+        }
+        Entity entity = this.delegate.getEntity();
+        if (entity != null) {
+            return entity;
+        }
+        return getName();
     }
 }