improve gpclaimenterevent

DenizenScript · Mar 21, 2019 · b81a972 · b81a972
1 parent b7f8103
commit b81a972
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/...ain/java/com/denizenscript/depenizen/bukkit/events/griefprevention/GPClaimEnterEvent.java b/...ain/java/com/denizenscript/depenizen/bukkit/events/griefprevention/GPClaimEnterEvent.java
@@ -5,8 +5,8 @@
 import me.ryanhamshire.GriefPrevention.GriefPrevention;
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.events.BukkitScriptEvent;
-import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dLocation;
+import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptEntryData;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
@@ -62,14 +62,17 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) {
     }
 
     @Override
-    public boolean matches(ScriptContainer scriptContainer, String s) {
-        String lower = CoreUtilities.toLowerCase(s);
-        String claim_test = lower.substring(lower.lastIndexOf(' ') + 1);
-        String direction = lower.substring("gp player ".length(), lower.lastIndexOf(' ')).trim();
+    public boolean matches(ScriptPath path) {
+        String direction = path.eventArgAt(2);
+        String claim_test = path.eventArgLowerAt(3);
 
-        return (claim_test.equals("gpclaim") && ((direction.equals("enters") && new_claim != null) || (direction.equals("exits") && old_claim != null)))
-                || (direction.equals("enters") && new_claim != null && claim_test.equals(CoreUtilities.toLowerCase(new_claim.simple())))
-                || (direction.equals("exits") && old_claim != null && claim_test.equals(CoreUtilities.toLowerCase(old_claim.simple())));
+        if (direction.equals("enters") && new_claim != null) {
+            return claim_test.equals("gpclaim") || claim_test.equals(CoreUtilities.toLowerCase(new_claim.simple()));
+        }
+        else if (direction.equals("exits") && old_claim != null) {
+            return claim_test.equals("gpclaim") || claim_test.equals(CoreUtilities.toLowerCase(old_claim.simple()));
+        }
+        return false;
     }
 
     @Override
@@ -85,7 +88,7 @@ public boolean applyDetermination(ScriptContainer container, String determinatio
     @Override
     public ScriptEntryData getScriptEntryData() {
         // TODO: Store the player?
-        return new BukkitScriptEntryData(event != null ? dEntity.getPlayerFrom(event.getPlayer()) : null, null);
+        return new BukkitScriptEntryData(event != null ? new dPlayer(event.getPlayer()) : null, null);
     }
 
     @Override