diff --git a/src/main/java/net/aufdemrand/denizen/events/player/ChatScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/ChatScriptEvent.java index 53869770ad..3f87b3d05a 100644 --- a/src/main/java/net/aufdemrand/denizen/events/player/ChatScriptEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/player/ChatScriptEvent.java @@ -2,12 +2,12 @@ import net.aufdemrand.denizen.BukkitScriptEntryData; import net.aufdemrand.denizen.Settings; +import net.aufdemrand.denizen.events.BukkitScriptEvent; import net.aufdemrand.denizen.objects.dEntity; import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.scripts.containers.core.FormatScriptContainer; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.aufdemrand.denizencore.events.ScriptEvent; import net.aufdemrand.denizencore.objects.Element; import net.aufdemrand.denizencore.objects.dList; import net.aufdemrand.denizencore.objects.dObject; @@ -26,14 +26,14 @@ import java.util.List; import java.util.Set; -public class ChatScriptEvent extends ScriptEvent implements Listener { +public class ChatScriptEvent extends BukkitScriptEvent implements Listener { // TODO: in area // <--[event] // @Events - // player chats + // player chats (in ) // - // @Regex ^on player chats$ + // @Regex ^on player chats+( in ((notable (cuboid|ellipsoid))|([^\s]+)))? // // @Cancellable true // @@ -76,7 +76,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptContainer scriptContainer, String s) { - return true; + return runInCheck(scriptContainer, s, CoreUtilities.toLowerCase(s), player.getLocation()); } @Override diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java index e052500676..c42aa2731b 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java @@ -1055,7 +1055,7 @@ else if (attribute.startsWith("uuid") && !isOnline()) // @attribute // @returns Duration // @description - // returns the millisecond time of when the player was last seen. + // returns the datestamp of when the player was last seen in duration. // Works with offline players. // --> if (attribute.startsWith("last_played")) {