From e495aba3ea4cea7bec08779d8a35d3edfd23356e Mon Sep 17 00:00:00 2001 From: "Alex \"mcmonkey\" Goodwin" Date: Sun, 14 Nov 2021 08:51:21 -0800 Subject: [PATCH] more event impls and fixes --- .../events/block/BlockBuiltScriptEvent.java | 2 -- .../entity/AreaEnterExitScriptEvent.java | 22 ++---------------- .../entity/DragonPhaseChangeScriptEvent.java | 17 +++----------- .../EntityAirLevelChangeScriptEvent.java | 15 +----------- .../events/entity/EntityBreedScriptEvent.java | 15 +----------- .../entity/EntityChangesBlockScriptEvent.java | 23 ++----------------- .../entity/EntityCombustsScriptEvent.java | 15 +----------- .../entity/EntityCreatePortalScriptEvent.java | 15 +----------- .../EntityExplosionPrimesScriptEvent.java | 15 +----------- .../events/player/PlayerJumpScriptEvent.java | 8 +------ .../player/PlayerKickedScriptEvent.java | 8 +------ .../player/ResourcePackStatusScriptEvent.java | 8 +------ .../server/InternalEventScriptEvent.java | 6 ++--- .../events/server/ListPingScriptEvent.java | 12 ++-------- .../server/ServerPrestartScriptEvent.java | 11 +-------- .../events/server/ServerStartScriptEvent.java | 11 +-------- .../events/server/TabCompleteScriptEvent.java | 11 +-------- .../LingeringPotionSplashScriptEvent.java | 4 +--- 18 files changed, 24 insertions(+), 194 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBuiltScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBuiltScriptEvent.java index 3d9f2b886a..763ee3db6b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBuiltScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBuiltScriptEvent.java @@ -16,8 +16,6 @@ public class BlockBuiltScriptEvent extends BukkitScriptEvent implements Listener // @Events // being built (on ) // - // @Regex ^on [^\s]+ being built$ - // // @Group Block // // @Location true diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/AreaEnterExitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/AreaEnterExitScriptEvent.java index dd1f65eac7..bdc4a12576 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/AreaEnterExitScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/AreaEnterExitScriptEvent.java @@ -26,11 +26,7 @@ public class AreaEnterExitScriptEvent extends BukkitScriptEvent implements Liste // <--[event] // @Events - // entity enters/exits cuboid/ellipsoid/polygon - // enters - // exits - // - // @Regex ^on [^\s]+ (enters|exits) [^\s]+$ + // enters|exits // // @Group Entity // @@ -53,6 +49,7 @@ public class AreaEnterExitScriptEvent extends BukkitScriptEvent implements Liste public AreaEnterExitScriptEvent() { instance = this; + registerCouldMatcher(" enters|exits "); } public static AreaEnterExitScriptEvent instance; @@ -62,21 +59,6 @@ public AreaEnterExitScriptEvent() { public boolean isEntering; public Location to; - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventArgLowerAt(1).equals("enters") && !path.eventArgLowerAt(1).equals("exits")) { - return false; - } - if (!couldMatchEntity(path.eventArgLowerAt(0))) { - return false; - } - String areaName = path.eventArgLowerAt(2); - if (!couldMatchArea(areaName) && !areaName.equals("notable")) { - return false; - } - return true; - } - @Override public boolean matches(ScriptPath path) { if (isEntering && !path.eventArgLowerAt(1).equals("enters")) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/DragonPhaseChangeScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/DragonPhaseChangeScriptEvent.java index 8313f18a10..a5ae2d9424 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/DragonPhaseChangeScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/DragonPhaseChangeScriptEvent.java @@ -13,11 +13,9 @@ public class DragonPhaseChangeScriptEvent extends BukkitScriptEvent implements L // <--[event] // @Events - // dragon changes phase + // ender_dragon changes phase // changes phase // - // @Regex ^on [^\s]+ changes phase$ - // // @Group Entity // // @Location true @@ -40,23 +38,14 @@ public class DragonPhaseChangeScriptEvent extends BukkitScriptEvent implements L public DragonPhaseChangeScriptEvent() { instance = this; + registerCouldMatcher(" changes phase"); + registerSwitches("from", "to"); } public static DragonPhaseChangeScriptEvent instance; public EntityTag entity; public EnderDragonChangePhaseEvent event; - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventLower.contains("changes phase")) { - return false; - } - if (!couldMatchEntity(path.eventArgLowerAt(0))) { - return false; - } - return true; - } - @Override public boolean matches(ScriptPath path) { String target = path.eventArgLowerAt(0); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityAirLevelChangeScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityAirLevelChangeScriptEvent.java index 016a7b8836..7ca813b814 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityAirLevelChangeScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityAirLevelChangeScriptEvent.java @@ -16,11 +16,8 @@ public class EntityAirLevelChangeScriptEvent extends BukkitScriptEvent implement // <--[event] // @Events - // entity changes air level // changes air level // - // @Regex ^on [^\s]+ changes air level$ - // // @Synonyms player loses oxygen,player drowns,player is drowning,oxygen depletion // // @Group Entity @@ -46,23 +43,13 @@ public class EntityAirLevelChangeScriptEvent extends BukkitScriptEvent implement public EntityAirLevelChangeScriptEvent() { instance = this; + registerCouldMatcher(" changes air level"); } public static EntityAirLevelChangeScriptEvent instance; public EntityTag entity; public EntityAirChangeEvent event; - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventLower.contains("changes air level")) { - return false; - } - if (!couldMatchEntity(path.eventArgLowerAt(0))) { - return false; - } - return true; - } - @Override public boolean matches(ScriptPath path) { String target = path.eventArgLowerAt(0); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java index fe88604b51..84b9d742d2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java @@ -15,11 +15,8 @@ public class EntityBreedScriptEvent extends BukkitScriptEvent implements Listene // <--[event] // @Events - // entity breeds // breeds // - // @Regex ^on [^\s]+ breeds$ - // // @Group Entity // // @Location true @@ -43,6 +40,7 @@ public class EntityBreedScriptEvent extends BukkitScriptEvent implements Listene public EntityBreedScriptEvent() { instance = this; + registerCouldMatcher(" breeds"); } public static EntityBreedScriptEvent instance; @@ -54,17 +52,6 @@ public EntityBreedScriptEvent() { private int experience; public EntityBreedEvent event; - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventArgLowerAt(1).equals("breeds")) { - return false; - } - if (!couldMatchEntity(path.eventArgLowerAt(0))) { - return false; - } - return true; - } - @Override public boolean matches(ScriptPath path) { if (!tryEntity(entity, path.eventArgLowerAt(0))) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityChangesBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityChangesBlockScriptEvent.java index 299fa3caa6..bc8a96c790 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityChangesBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityChangesBlockScriptEvent.java @@ -16,13 +16,7 @@ public class EntityChangesBlockScriptEvent extends BukkitScriptEvent implements // <--[event] // @Events - // entity changes block - // entity changes block (into ) - // entity changes (into ) - // changes block (into ) - // changes (into ) - // - // @Regex ^on [^\s]+ changes [^\s]+( into [^\s]+)?$ + // changes (into ) // // @Group Entity // @@ -44,6 +38,7 @@ public class EntityChangesBlockScriptEvent extends BukkitScriptEvent implements public EntityChangesBlockScriptEvent() { instance = this; + registerCouldMatcher(" changes (into )"); } public static EntityChangesBlockScriptEvent instance; @@ -53,20 +48,6 @@ public EntityChangesBlockScriptEvent() { public MaterialTag new_material; public EntityChangeBlockEvent event; - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventArgLowerAt(1).equals("changes")) { - return false; - } - if (!couldMatchEntity(path.eventArgLowerAt(0))) { - return false; - } - if (!couldMatchBlock(path.eventArgLowerAt(2))) { - return false; - } - return true; - } - @Override public boolean matches(ScriptPath path) { String entName = path.eventArgLowerAt(0); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCombustsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCombustsScriptEvent.java index 84164cd702..9aca070e43 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCombustsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCombustsScriptEvent.java @@ -19,11 +19,8 @@ public class EntityCombustsScriptEvent extends BukkitScriptEvent implements List // <--[event] // @Events - // entity combusts // combusts // - // @Regex ^on [^\s]+ combusts$ - // // @Group Entity // // @Location true @@ -49,23 +46,13 @@ public class EntityCombustsScriptEvent extends BukkitScriptEvent implements List public EntityCombustsScriptEvent() { instance = this; + registerCouldMatcher(" combusts"); } public static EntityCombustsScriptEvent instance; public EntityTag entity; public EntityCombustEvent event; - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventArgLowerAt(1).equals("combusts")) { - return false; - } - if (!couldMatchEntity(path.eventArgLowerAt(0))) { - return false; - } - return true; - } - @Override public boolean matches(ScriptPath path) { if (!tryEntity(entity, path.eventArgLowerAt(0))) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCreatePortalScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCreatePortalScriptEvent.java index b646c3d70b..9c590d69aa 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCreatePortalScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCreatePortalScriptEvent.java @@ -17,11 +17,8 @@ public class EntityCreatePortalScriptEvent extends BukkitScriptEvent implements // <--[event] // @Events - // entity creates portal // creates portal // - // @Regex ^on [^\s]+ creates portal$ - // // @Group Entity // // @Location true @@ -41,23 +38,13 @@ public class EntityCreatePortalScriptEvent extends BukkitScriptEvent implements public EntityCreatePortalScriptEvent() { instance = this; + registerCouldMatcher(" creates portal"); } public static EntityCreatePortalScriptEvent instance; public EntityTag entity; public EntityCreatePortalEvent event; - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventLower.contains("creates portal")) { - return false; - } - if (!couldMatchEntity(path.eventArgLowerAt(0))) { - return false; - } - return true; - } - @Override public boolean matches(ScriptPath path) { if (!tryEntity(entity, path.eventArgLowerAt(0))) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java index 9c4542a449..90b83d5902 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java @@ -14,11 +14,8 @@ public class EntityExplosionPrimesScriptEvent extends BukkitScriptEvent implemen // <--[event] // @Events - // entity explosion primes // explosion primes // - // @Regex ^on [^\s]+ explosion primes$ - // // @Group Entity // // @Location true @@ -35,23 +32,13 @@ public class EntityExplosionPrimesScriptEvent extends BukkitScriptEvent implemen public EntityExplosionPrimesScriptEvent() { instance = this; + registerCouldMatcher(" explosion primes"); } public static EntityExplosionPrimesScriptEvent instance; public EntityTag entity; public ExplosionPrimeEvent event; - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventLower.contains("explosion primes")) { - return false; - } - if (!couldMatchEntity(path.eventArgLowerAt(0))) { - return false; - } - return true; - } - @Override public boolean matches(ScriptPath path) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java index 38970a36e8..eacb2f50e2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java @@ -17,8 +17,6 @@ public class PlayerJumpScriptEvent extends BukkitScriptEvent implements Listener // @Events // player jumps // - // @Regex ^on player jumps$ - // // @Group Player // // @Location true @@ -36,6 +34,7 @@ public class PlayerJumpScriptEvent extends BukkitScriptEvent implements Listener public PlayerJumpScriptEvent() { instance = this; + registerCouldMatcher("player jumps"); } public static PlayerJumpScriptEvent instance; @@ -43,11 +42,6 @@ public PlayerJumpScriptEvent() { public LocationTag location; public PlayerTag player; - @Override - public boolean couldMatch(ScriptPath path) { - return path.eventLower.startsWith("player jumps"); - } - @Override public boolean matches(ScriptPath path) { if (!runInCheck(path, location)) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java index cbca37e0c9..ec4ea7f376 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerKickedScriptEvent.java @@ -20,8 +20,6 @@ public class PlayerKickedScriptEvent extends BukkitScriptEvent implements Listen // @Events // player kicked (for flying) // - // @Regex ^on player kicked( for flying)?$ - // // @Group Player // // @Cancellable true @@ -44,6 +42,7 @@ public class PlayerKickedScriptEvent extends BukkitScriptEvent implements Listen public PlayerKickedScriptEvent() { instance = this; + registerCouldMatcher("player kicked (for flying)"); } public static PlayerKickedScriptEvent instance; @@ -54,11 +53,6 @@ public boolean isFlying() { return NMSHandler.getPlayerHelper().getFlyKickCooldown(player.getPlayerEntity()) == 0; } - @Override - public boolean couldMatch(ScriptPath path) { - return path.eventLower.startsWith("player kicked"); - } - @Override public boolean matches(ScriptPath path) { if (path.eventArgLowerAt(3).equals("flying")) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/ResourcePackStatusScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/ResourcePackStatusScriptEvent.java index 53cb76b38a..a5278df386 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/ResourcePackStatusScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/ResourcePackStatusScriptEvent.java @@ -14,8 +14,6 @@ public class ResourcePackStatusScriptEvent extends BukkitScriptEvent { // @Events // resource pack status // - // @Regex ^on resource pack status$ - // // @Group Player // // @Triggers when a player accepts, denies, successfully loads, or fails to download a resource pack. @@ -31,6 +29,7 @@ public class ResourcePackStatusScriptEvent extends BukkitScriptEvent { public ResourcePackStatusScriptEvent() { instance = this; + registerCouldMatcher("resource pack status"); } public static ResourcePackStatusScriptEvent instance; @@ -38,11 +37,6 @@ public ResourcePackStatusScriptEvent() { public ElementTag status; public PlayerTag player; - @Override - public boolean couldMatch(ScriptPath path) { - return path.eventLower.startsWith("resource pack status"); - } - @Override public boolean matches(ScriptPath path) { if (!runGenericSwitchCheck(path, "status", status.asString())) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/server/InternalEventScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/server/InternalEventScriptEvent.java index b586efde42..4319f144a5 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/server/InternalEventScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/server/InternalEventScriptEvent.java @@ -22,8 +22,6 @@ public class InternalEventScriptEvent extends BukkitScriptEvent implements Liste // @Events // internal bukkit event // - // @Regex ^on internal bukkit event$ - // // @Switch event: (required) to specify the Bukkit event path to use (like "event:org.bukkit.event.block.BlockBreakEvent") // // @Warning This exists primarily for testing/debugging, and is almost never a good idea to include in a real script. @@ -42,13 +40,15 @@ public class InternalEventScriptEvent extends BukkitScriptEvent implements Liste public InternalEventScriptEvent() { instance = this; + registerCouldMatcher("internal bukkit event"); + registerSwitches("event"); } public static InternalEventScriptEvent instance; @Override public boolean couldMatch(ScriptPath path) { - if (!path.eventLower.startsWith("internal bukkit event")) { + if (!super.couldMatch(path)) { return false; } if (!path.switches.containsKey("event")) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/server/ListPingScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/server/ListPingScriptEvent.java index 327e278592..1e08f26b6e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/server/ListPingScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/server/ListPingScriptEvent.java @@ -26,11 +26,10 @@ public class ListPingScriptEvent extends BukkitScriptEvent implements Listener { // @Events // server list ping // - // @Regex ^on server list ping$ - // // @Group Server // // @Triggers when the server is pinged for a client's server list. + // // @Context // returns the MOTD that will show. // returns the number of max players that will show. @@ -52,20 +51,13 @@ public class ListPingScriptEvent extends BukkitScriptEvent implements Listener { public ListPingScriptEvent() { instance = this; + registerCouldMatcher("server list ping"); } public static ListPingScriptEvent instance; public ServerListPingEvent event; - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventLower.startsWith("server list ping")) { - return false; - } - return true; - } - @Override public String getName() { return "ServerListPing"; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/server/ServerPrestartScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/server/ServerPrestartScriptEvent.java index c03f314e42..85234217f3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/server/ServerPrestartScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/server/ServerPrestartScriptEvent.java @@ -10,8 +10,6 @@ public class ServerPrestartScriptEvent extends BukkitScriptEvent { // @Events // server prestart // - // @Regex ^on server prestart$ - // // @Group Server // // @Triggers before the server finishes starting... fired after some saves are loaded, but before other data is loaded. Use with extreme caution. @@ -22,18 +20,11 @@ public class ServerPrestartScriptEvent extends BukkitScriptEvent { public ServerPrestartScriptEvent() { instance = this; + registerCouldMatcher("server prestart"); } public static ServerPrestartScriptEvent instance; - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventLower.startsWith("server prestart")) { - return false; - } - return true; - } - @Override public String getName() { return "ServerPrestart"; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/server/ServerStartScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/server/ServerStartScriptEvent.java index a3869815a0..43856e95dc 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/server/ServerStartScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/server/ServerStartScriptEvent.java @@ -8,8 +8,6 @@ public class ServerStartScriptEvent extends BukkitScriptEvent { // @Events // server start // - // @Regex ^on server start$ - // // @Group Server // // @Triggers when the server starts. @@ -18,18 +16,11 @@ public class ServerStartScriptEvent extends BukkitScriptEvent { public ServerStartScriptEvent() { instance = this; + registerCouldMatcher("server start"); } public static ServerStartScriptEvent instance; - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventLower.startsWith("server start")) { - return false; - } - return true; - } - @Override public String getName() { return "ServerStart"; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/server/TabCompleteScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/server/TabCompleteScriptEvent.java index d9f44bae36..71c2e03b5a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/server/TabCompleteScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/server/TabCompleteScriptEvent.java @@ -19,8 +19,6 @@ public class TabCompleteScriptEvent extends BukkitScriptEvent implements Listene // @Events // tab complete // - // @Regex ^on tab complete$ - // // @Group Server // // @Cancellable true @@ -43,6 +41,7 @@ public class TabCompleteScriptEvent extends BukkitScriptEvent implements Listene public TabCompleteScriptEvent() { instance = this; + registerCouldMatcher("tab complete"); } public static TabCompleteScriptEvent instance; @@ -62,14 +61,6 @@ public String getCurrentArg() { return i > 0 ? event.getBuffer().substring(i + 1) : getCommand(); } - @Override - public boolean couldMatch(ScriptPath path) { - if (!path.eventLower.startsWith("tab complete")) { - return false; - } - return true; - } - @Override public String getName() { return "TabComplete"; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java index 7686697a39..27e0f301ea 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java @@ -19,8 +19,6 @@ public class LingeringPotionSplashScriptEvent extends BukkitScriptEvent implemen // lingering potion splash|splashes // lingering splash|splashes // - // @Regex ^on lingering [^\s]+ splash(es)?$ - // // @Group World // // @Location true @@ -40,7 +38,7 @@ public class LingeringPotionSplashScriptEvent extends BukkitScriptEvent implemen public LingeringPotionSplashScriptEvent() { instance = this; - registerCouldMatcher("lingering splashes"); + registerCouldMatcher("lingering splash|splashes"); } public static LingeringPotionSplashScriptEvent instance;