Fix some minor event-related things

DenizenScript · Feb 12, 2015 · 9a64f48 · 9a64f48
1 parent 9a14353
commit 9a64f48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/scriptevents/EntityTeleportScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/scriptevents/EntityTeleportScriptEvent.java
@@ -3,7 +3,6 @@
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.objects.dLocation;
-import net.aufdemrand.denizen.objects.dNPC;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizencore.events.ScriptEvent;
@@ -12,12 +11,10 @@
 import net.aufdemrand.denizencore.scripts.ScriptEntryData;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.event.vehicle.VehicleMoveEvent;
 
 import java.util.HashMap;
 
@@ -75,8 +72,8 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
         String ename = entity.getEntityType().getLowercaseName();
         String ename2 = entity.identifySimple().substring(2);
         String ename3 = entity.identifySimpleType();
-        return lower.startsWith(ename + " teleports")
-                || lower.startsWith("entity teleports")
+        return lower.startsWith("entity teleports")
+                || lower.startsWith(ename + " teleports")
                 || lower.startsWith(ename2 + " teleports")
                 || lower.startsWith(ename3 + " teleports");
     }

diff --git a/src/main/java/net/aufdemrand/denizen/events/scriptevents/VehicleMoveScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/scriptevents/VehicleMoveScriptEvent.java
@@ -7,7 +7,6 @@
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
 import org.bukkit.Bukkit;
-import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.vehicle.VehicleMoveEvent;
@@ -48,7 +47,7 @@ public VehicleMoveScriptEvent() {
     @Override
     public boolean couldMatch(ScriptContainer scriptContainer, String s) {
         String lower = s.toLowerCase();
-        return (lower.matches("[^\\s]+ moves.*"));
+        return (lower.matches("[^\\s]+ moves"));
     }
 
     @Override
@@ -57,8 +56,8 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
         String ename = vehicle.getEntityType().getLowercaseName();
         String ename2 = vehicle.identifySimple().substring(2);
         String ename3 = vehicle.identifySimpleType();
-        return lower.startsWith(ename + " moves")
-                || lower.startsWith("vehicle moves")
+        return lower.startsWith("vehicle moves")
+                || lower.startsWith(ename + " moves")
                 || lower.startsWith(ename2 + " moves")
                 || lower.startsWith(ename3 + " moves");
     }