misc: 对本体也有效！

NiFeather · Jan 29, 2025 · e7d8b6b · e7d8b6b
1 parent 43e0f48
commit e7d8b6b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/xyz/nifeather/morph/events/mirror/impl/ByRangeExecutor.java b/src/main/java/xyz/nifeather/morph/events/mirror/impl/ByRangeExecutor.java
@@ -23,16 +23,20 @@ public ByRangeExecutor(ExecutorHub executorHub)
     {
         var targetName = getTargetControlFor(source);
         if (targetName == null)
-            return null;
+            targetName = source.getName();
 
         var range = executorHub.getControlDistance();
 
+        String finalTargetName = targetName;
         var nmsPlayer = NmsRecord.ofPlayer(source).level()
                 .getNearestPlayer(source.getX(), source.getY(), source.getZ(),
                 range, entity ->
                 {
                     var bukkitInstance = entity.getBukkitEntity();
 
+                    if (bukkitInstance == source)
+                        return false;
+
                     if (!(bukkitInstance instanceof Player player))
                         return false;
 
@@ -41,10 +45,10 @@ public ByRangeExecutor(ExecutorHub executorHub)
 
                     var theirState = morphManager().getDisguiseStateFor(bukkitInstance);
 
-                    if (theirState != null && theirState.getDisguiseIdentifier().equals("player:" + targetName))
+                    if (theirState != null && theirState.getDisguiseIdentifier().equals("player:" + finalTargetName))
                         return true;
                     else
-                        return bukkitInstance.getName().equals(targetName) && theirState == null;
+                        return bukkitInstance.getName().equals(finalTargetName) && theirState == null;
                 });
 
         return nmsPlayer == null ? null : (Player) nmsPlayer.getBukkitEntity();