Simplify dEntity.matchesEntity

DenizenScript · Jul 9, 2015 · 55ee8d3 · 55ee8d3
1 parent c62c1ff
commit 55ee8d3
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -1250,14 +1250,10 @@ public boolean matchesEntity(String ent) {
         if (entity != null && getEntityScript() != null) {
             return ent.equalsIgnoreCase(getEntityScript());
         }
-        dEntity e = dEntity.valueOf(ent, new BukkitTagContext(null, null, false, null, false, null));
-        if (e == null) {
-            return false;
-        }
-        if (entity == null) {
-            return e.entity == null && entity_type == e.entity_type;
+        if (uuid != null && uuid.toString().equals(ent)) {
+            return true;
         }
-        return e.entity != null && getUUID().equals(e.getUUID());
+        return false;
     }
 
     @Override