Fix NPE on Sponge from null sender unique id (#481)

1 files changed, 6 insertions, 10 deletions

diff --git a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeCommandSender.java b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeCommandSender.java
index beae734..2762a88 100644
--- a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeCommandSender.java
+++ b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeCommandSender.java
@@ -83,15 +83,11 @@ public class SpongeCommandSender extends AbstractCommandSender<Subject> {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        SpongeCommandSender that = (SpongeCommandSender) o;
-        return this.getUniqueId().equals(that.getUniqueId());
-    }
-
-    @Override
-    public int hashCode() {
-        return getUniqueId().hashCode();
+    protected Object getObjectForComparison() {
+        UUID uniqueId = getUniqueId();
+        if (uniqueId != null) {
+            return uniqueId;
+        }
+        return getName();
     }
 }