diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopExpiresScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopExpiresScriptEvent.java index 34eb689d9..159265fa5 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopExpiresScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/areashop/AreaShopExpiresScriptEvent.java @@ -47,11 +47,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { String shopName = path.eventArgLowerAt(2).replace("areashop@", ""); - if (shopName.equals("shop")) { - return true; + if (!shopName.equals("shop") && !areaShop.equals(AreaShopTag.valueOf(shopName))) { + return false; } - AreaShopTag shop = AreaShopTag.valueOf(shopName); - return shop != null && shop.equals(areaShop); + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java index a1407bcc7..9546f2c5c 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerCompletesSkyBlockChallengeScriptEvent.java @@ -53,7 +53,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerEntersSkyBlockScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerEntersSkyBlockScriptEvent.java index 83c832562..d28fb35f1 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerEntersSkyBlockScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerEntersSkyBlockScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerExitsSkyBlockScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerExitsSkyBlockScriptEvent.java index d2b04bfa5..3cadeef71 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerExitsSkyBlockScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/PlayerExitsSkyBlockScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockCreatedScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockCreatedScriptEvent.java index e93d5e252..c2cbf3674 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockCreatedScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockCreatedScriptEvent.java @@ -49,7 +49,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockResetScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockResetScriptEvent.java index 317de82e6..8aee8d26e 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockResetScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/askyblock/SkyBlockResetScriptEvent.java @@ -46,7 +46,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerJoinsScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerJoinsScriptEvent.java index f90e9614c..99587707a 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerJoinsScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerJoinsScriptEvent.java @@ -46,7 +46,7 @@ public boolean couldMatch(ScriptPath path) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerQuitsScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerQuitsScriptEvent.java index c3376b2da..fabd1b585 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerQuitsScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerQuitsScriptEvent.java @@ -46,7 +46,7 @@ public boolean couldMatch(ScriptPath path) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerServerSwitchScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerServerSwitchScriptEvent.java index dcf7e8bb7..e759eab46 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerServerSwitchScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeePlayerServerSwitchScriptEvent.java @@ -53,7 +53,7 @@ public boolean matches(ScriptPath path) { if (!serverName.equals("server") && !serverName.equalsIgnoreCase(newServer)) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerCommandScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerCommandScriptEvent.java index 633eab1b6..bc5fc1261 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerCommandScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerCommandScriptEvent.java @@ -62,7 +62,7 @@ public boolean matches(ScriptPath path) { if (!path.eventArgLowerAt(2).equals("command") && !path.eventArgLowerAt(2).equals(commandName())) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java index 1de111ba3..e3f01be29 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeProxyServerListPingScriptEvent.java @@ -64,7 +64,7 @@ public boolean couldMatch(ScriptPath path) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerConnectScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerConnectScriptEvent.java index 591c0bfdd..c6c176409 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerConnectScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerConnectScriptEvent.java @@ -38,7 +38,7 @@ public boolean couldMatch(ScriptPath path) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerDisconnectScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerDisconnectScriptEvent.java index e4b93f354..ac5ed5864 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerDisconnectScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/bungee/BungeeServerDisconnectScriptEvent.java @@ -38,7 +38,7 @@ public boolean couldMatch(ScriptPath path) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerAFKStatusScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerAFKStatusScriptEvent.java index 2980ee266..d5b350a0d 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerAFKStatusScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerAFKStatusScriptEvent.java @@ -56,7 +56,7 @@ else if (path.eventArgLowerAt(1).equals("returns") && event.getValue()) { else if (!path.eventArgLowerAt(1).equals("afk")) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerBalanceChangeScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerBalanceChangeScriptEvent.java index 4c9136a27..826a54246 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerBalanceChangeScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerBalanceChangeScriptEvent.java @@ -48,7 +48,7 @@ public boolean matches(ScriptPath path) { if (!runInCheck(path, event.getPlayer().getLocation())) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerGodModeStatusScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerGodModeStatusScriptEvent.java index 436d53829..4a2866bb6 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerGodModeStatusScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerGodModeStatusScriptEvent.java @@ -55,7 +55,7 @@ public boolean matches(ScriptPath path) { if (!status.equals("status")) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerJailStatusScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerJailStatusScriptEvent.java index 207fad52b..e56ffaa9b 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerJailStatusScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerJailStatusScriptEvent.java @@ -58,7 +58,7 @@ public boolean matches(ScriptPath path) { if (!status.equals("status")) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerMuteStatusScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerMuteStatusScriptEvent.java index 8aee56f43..81056a171 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerMuteStatusScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/essentials/PlayerMuteStatusScriptEvent.java @@ -58,7 +58,7 @@ public boolean matches(ScriptPath path) { if (!status.equals("status")) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/griefprevention/GPClaimEnterEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/griefprevention/GPClaimEnterEvent.java index fbd6c52b7..ef32d5196 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/griefprevention/GPClaimEnterEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/griefprevention/GPClaimEnterEvent.java @@ -66,11 +66,18 @@ public boolean matches(ScriptPath path) { String direction = path.eventArgAt(2); String claim_test = path.eventArgLowerAt(3); + // TODO: Wtf if (direction.equals("enters") && new_claim != null) { - return claim_test.equals("gpclaim") || claim_test.equals(CoreUtilities.toLowerCase(new_claim.simple())); + if (!(claim_test.equals("gpclaim") || claim_test.equals(CoreUtilities.toLowerCase(new_claim.simple())))) { + return false; + } + return super.matches(path); } else if (direction.equals("exits") && old_claim != null) { - return claim_test.equals("gpclaim") || claim_test.equals(CoreUtilities.toLowerCase(old_claim.simple())); + if (!(claim_test.equals("gpclaim") || claim_test.equals(CoreUtilities.toLowerCase(old_claim.simple())))) { + return false; + } + return super.matches(path); } return false; } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityDisguisesScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityDisguisesScriptEvent.java index b3a9df0c2..b8a94eab6 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityDisguisesScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityDisguisesScriptEvent.java @@ -55,12 +55,11 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { public boolean matches(ScriptPath path) { String disguiseName = path.eventArgLowerAt(2); - if (disguiseName.equals("disguise")) { - return true; + if (!disguiseName.equals("disguise") && !disguise.equals(LibsDisguiseTag.valueOf(disguiseName))) { + return false; } - LibsDisguiseTag dDisguise = LibsDisguiseTag.valueOf(disguiseName); - return dDisguise != null && dDisguise.equals(disguise); + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityUndisguisesScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityUndisguisesScriptEvent.java index 5eb7700ce..6be73581e 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityUndisguisesScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/libsdisguises/EntityUndisguisesScriptEvent.java @@ -54,13 +54,11 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { String disguiseName = path.eventArgLowerAt(2); - - if (disguiseName.equals("disguise")) { - return true; + if (!disguiseName.equals("disguise") && !disguise.equals(LibsDisguiseTag.valueOf(disguiseName))) { + return false; } - LibsDisguiseTag dDisguise = LibsDisguiseTag.valueOf(disguiseName); - return dDisguise != null && dDisguise.equals(disguise); + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/ManaChangeScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/ManaChangeScriptEvent.java index bbe51cd39..5d8d9a69a 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/ManaChangeScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/ManaChangeScriptEvent.java @@ -57,8 +57,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - String lower = path.eventArgLowerAt(3); - return lower.startsWith("magicspells player mana change"); + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastScriptEvent.java index ad2ce9285..532a208c1 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastScriptEvent.java @@ -79,7 +79,7 @@ public boolean matches(ScriptPath path) { if (spellName.equals("spell") || spellName.equalsIgnoreCase(spell.asString())) { return true; } - return false; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastedScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastedScriptEvent.java index 27d11d2da..cfafbbe84 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastedScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellCastedScriptEvent.java @@ -51,8 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - String lower = path.eventArgLowerAt(3); - return lower.startsWith("magicspells player completes spell"); + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellLearnScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellLearnScriptEvent.java index 24e77fba4..644266593 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellLearnScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/magicspells/SpellLearnScriptEvent.java @@ -51,8 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - String lower = path.eventArgLowerAt(3); - return lower.startsWith("magicspells player learns spell"); + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerAbilityActivateScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerAbilityActivateScriptEvent.java index 33a07db14..29ec9eef9 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerAbilityActivateScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerAbilityActivateScriptEvent.java @@ -70,7 +70,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerAbilityDeactivateScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerAbilityDeactivateScriptEvent.java index 10f379614..defbb4f27 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerAbilityDeactivateScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerAbilityDeactivateScriptEvent.java @@ -68,7 +68,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java index 16ff4dd34..c4aefd9b4 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerGainsXPScriptEvent.java @@ -65,7 +65,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java index 6cdab0719..d71b9124e 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelChangeScriptEvent.java @@ -64,7 +64,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java index 24629a150..23fcd7f61 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelDownScriptEvent.java @@ -68,7 +68,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java index c19bec48d..0c8c2cd2f 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mcmmo/mcMMOPlayerLevelUpScriptEvent.java @@ -69,7 +69,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaEndsScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaEndsScriptEvent.java index 201512867..f08237808 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaEndsScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaEndsScriptEvent.java @@ -51,7 +51,7 @@ public boolean matches(ScriptPath path) { if (!arenaname.equals("arena") && (a == null || !CoreUtilities.toLowerCase(a.getArena().arenaName()).equals(arenaname))) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaStartsScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaStartsScriptEvent.java index 77daa53fa..878191bcc 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaStartsScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaStartsScriptEvent.java @@ -50,7 +50,7 @@ public boolean matches(ScriptPath path) { if (!arenaname.equals("arena") && (a == null || !CoreUtilities.toLowerCase(a.getArena().arenaName()).equals(arenaname))) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaWaveChangesScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaWaveChangesScriptEvent.java index 8d3df9be7..dee75b670 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaWaveChangesScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaWaveChangesScriptEvent.java @@ -52,8 +52,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { public boolean matches(ScriptPath path) { String arenaname = path.eventArgLowerAt(2).replace("mobarena@", ""); MobArenaArenaTag a = MobArenaArenaTag.valueOf(arenaname); - return (arenaname.equals("arena") || (a != null && a.getArena() == event.getArena())) - && event.getWave() != null; + if (!((arenaname.equals("arena") || (a != null && a.getArena() == event.getArena())) && event.getWave() != null)) { + return false; + } + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java index 18ca8487e..a55967298 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/mythicmobs/MythicMobsDeathEvent.java @@ -96,7 +96,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/noteblockapi/NoteBlockAPISongEndsScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/noteblockapi/NoteBlockAPISongEndsScriptEvent.java index ecc916914..d6770c52e 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/noteblockapi/NoteBlockAPISongEndsScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/noteblockapi/NoteBlockAPISongEndsScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptPath path) { if (!path.eventArgLowerAt(2).equals("ends") && !path.eventArgLowerAt(3).equals("ends")) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerClaimPlotScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerClaimPlotScriptEvent.java index 00551a9c6..58dd9c4f1 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerClaimPlotScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerClaimPlotScriptEvent.java @@ -54,14 +54,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { String plotName = path.eventArgLowerAt(3); - if (plotName.equals("plotsquaredplot")) { - return true; - } - PlotSquaredPlotTag dplot = PlotSquaredPlotTag.valueOf(plotName); - if (dplot == null || !dplot.equals(plot)) { + if (!plotName.equals("plotsquaredplot") && !plot.equals(PlotSquaredPlotTag.valueOf(plotName))) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerEntersPlotScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerEntersPlotScriptEvent.java index df53ce03c..327449fe5 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerEntersPlotScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerEntersPlotScriptEvent.java @@ -49,11 +49,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { String plotName = path.eventArgLowerAt(3); - if (plotName.equals("plotsquaredplot")) { - return true; + if (!plotName.equals("plotsquaredplot") && !plot.equals(PlotSquaredPlotTag.valueOf(plotName))) { + return false; } - PlotSquaredPlotTag dplot = PlotSquaredPlotTag.valueOf(plotName); - return dplot != null && dplot.equals(plot); + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerLeavePlotScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerLeavePlotScriptEvent.java index 14ef68362..2e55569a5 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerLeavePlotScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlayerLeavePlotScriptEvent.java @@ -51,11 +51,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { String plotName = path.eventArgLowerAt(3); - if (plotName.equals("plotsquaredplot")) { - return true; + if (!plotName.equals("plotsquaredplot") && !plot.equals(PlotSquaredPlotTag.valueOf(plotName))) { + return false; } - PlotSquaredPlotTag dplot = PlotSquaredPlotTag.valueOf(plotName); - return dplot != null && dplot.equals(plot); + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlotClearScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlotClearScriptEvent.java index 34146f17d..955ce3096 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlotClearScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/plotsquared/PlotClearScriptEvent.java @@ -50,11 +50,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { String plotName = path.eventArgLowerAt(3); - if (plotName.equals("plotsquaredplot")) { - return true; + if (!plotName.equals("plotsquaredplot") && !plot.equals(PlotSquaredPlotTag.valueOf(plotName))) { + return false; } - PlotSquaredPlotTag dplot = PlotSquaredPlotTag.valueOf(plotName); - return dplot != null && dplot.equals(plot); + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PVPArenaStartsScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PVPArenaStartsScriptEvent.java index 75a49b0ae..d0f2c7ee5 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PVPArenaStartsScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PVPArenaStartsScriptEvent.java @@ -49,7 +49,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerExitsPVPArenaScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerExitsPVPArenaScriptEvent.java index a8839f474..41d9cbe17 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerExitsPVPArenaScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerExitsPVPArenaScriptEvent.java @@ -44,7 +44,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerJoinsPVPArenaScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerJoinsPVPArenaScriptEvent.java index faf5d8586..6c1c57851 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerJoinsPVPArenaScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerJoinsPVPArenaScriptEvent.java @@ -46,7 +46,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerLeavesPVPArenaScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerLeavesPVPArenaScriptEvent.java index f4b4e2f08..63918fcfd 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerLeavesPVPArenaScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/pvparena/PlayerLeavesPVPArenaScriptEvent.java @@ -44,7 +44,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerCompletesQuestScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerCompletesQuestScriptEvent.java index 034b53656..54838082b 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerCompletesQuestScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerCompletesQuestScriptEvent.java @@ -50,7 +50,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerFailsQuestScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerFailsQuestScriptEvent.java index 62e1fd3ac..be7132692 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerFailsQuestScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerFailsQuestScriptEvent.java @@ -50,7 +50,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerQuestStageChangeScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerQuestStageChangeScriptEvent.java index 3f203b8ed..f81fa6145 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerQuestStageChangeScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerQuestStageChangeScriptEvent.java @@ -50,7 +50,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerStartsQuestScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerStartsQuestScriptEvent.java index bac32f99e..db43e2e70 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerStartsQuestScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/quests/PlayerStartsQuestScriptEvent.java @@ -49,8 +49,7 @@ public boolean matches(ScriptPath path) { if (!questName.equals("quest") && !questName.equals(CoreUtilities.toLowerCase(event.getQuest().getId()))) { return false; } - - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/residence/PlayerEntersResidenceScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/residence/PlayerEntersResidenceScriptEvent.java index 3381944ba..5c90591ca 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/residence/PlayerEntersResidenceScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/residence/PlayerEntersResidenceScriptEvent.java @@ -46,15 +46,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { String name = path.eventArgLowerAt(3); - ResidenceTag eventResidence = event.getTo() != null ? new ResidenceTag(event.getTo()) : null; - if (name.equals("residence") && eventResidence != null) { - return true; + if (!name.equals("residence") && !residence.equals(ResidenceTag.valueOf(name))) { + return false; } - ResidenceTag givenResidence = ResidenceTag.valueOf(name); - if (eventResidence != null && givenResidence != null && eventResidence.equals(givenResidence)) { - return true; - } - return false; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/residence/PlayerExitsResidenceScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/residence/PlayerExitsResidenceScriptEvent.java index 073d03dc7..d4994c1a3 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/residence/PlayerExitsResidenceScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/residence/PlayerExitsResidenceScriptEvent.java @@ -46,15 +46,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { String name = path.eventArgLowerAt(3); - ResidenceTag eventResidence = event.getFrom() != null ? new ResidenceTag(event.getFrom()) : null; - if (name.equals("residence") && eventResidence != null) { - return true; + if (!name.equals("residence") && !residence.equals(ResidenceTag.valueOf(name))) { + return false; } - ResidenceTag givenResidence = ResidenceTag.valueOf(name); - if (eventResidence != null && givenResidence != null && eventResidence.equals(givenResidence)) { - return true; - } - return false; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/sentinel/SentinelAttackScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/sentinel/SentinelAttackScriptEvent.java index c93cb3b85..0dfe464f5 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/sentinel/SentinelAttackScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/sentinel/SentinelAttackScriptEvent.java @@ -49,7 +49,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/shopkeepers/ShopKeeperTradeScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/shopkeepers/ShopKeeperTradeScriptEvent.java index 0ff980c8a..5c22674e5 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/shopkeepers/ShopKeeperTradeScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/shopkeepers/ShopKeeperTradeScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerDowngradesSkillScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerDowngradesSkillScriptEvent.java index a37cf86a5..2bbef27e6 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerDowngradesSkillScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerDowngradesSkillScriptEvent.java @@ -64,7 +64,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerLevelsUpScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerLevelsUpScriptEvent.java index 27bc4c8c8..4d0c5de82 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerLevelsUpScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerLevelsUpScriptEvent.java @@ -59,7 +59,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerUnlocksSkillScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerUnlocksSkillScriptEvent.java index 8f36dea83..6516609c7 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerUnlocksSkillScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerUnlocksSkillScriptEvent.java @@ -60,7 +60,7 @@ public boolean matches(ScriptPath path) { return false; } - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerUpgradesSkillScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerUpgradesSkillScriptEvent.java index c04e88069..38fc6aa4e 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerUpgradesSkillScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/skillapi/SkillAPIPlayerUpgradesSkillScriptEvent.java @@ -63,8 +63,7 @@ public boolean matches(ScriptPath path) { if (!runInCheck(path, player.getLocation())) { return false; } - - return true; + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/towny/PlayerEntersTownScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/towny/PlayerEntersTownScriptEvent.java index a22b6cbda..235285edc 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/towny/PlayerEntersTownScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/towny/PlayerEntersTownScriptEvent.java @@ -47,12 +47,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { String name = path.eventArgAt(3); - TownTag eventTown = TownTag.fromWorldCoord(event.getTo()); - if (name.equals("town") && eventTown != null) { - return true; + if (!name.equals("town") && !town.equals(TownTag.valueOf(name))) { + return false; } - TownTag givenTown = TownTag.valueOf(name); - return eventTown != null && givenTown != null && eventTown.equals(givenTown); + return super.matches(path); } @Override diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/towny/PlayerExitsTownScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/towny/PlayerExitsTownScriptEvent.java index 8813e48ae..1862595fe 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/towny/PlayerExitsTownScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/towny/PlayerExitsTownScriptEvent.java @@ -47,12 +47,10 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { String name = path.eventArgLowerAt(3); - TownTag eventTown = TownTag.fromWorldCoord(event.getFrom()); - if (name.equals("town") && eventTown != null) { - return true; + if (!name.equals("town") && !town.equals(TownTag.valueOf(name))) { + return false; } - TownTag givenTown = TownTag.valueOf(name); - return eventTown != null && givenTown != null && eventTown.equals(givenTown); + return super.matches(path); } @Override @@ -84,6 +82,9 @@ public void onTownyPlayerExitsTown(PlayerLeaveTownEvent event) { return; } town = TownTag.fromWorldCoord(event.getFrom()); + if (town == null) { + return; + } this.event = event; fire(event); } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/events/votifier/VotifierVoteScriptEvent.java b/src/main/java/com/denizenscript/depenizen/bukkit/events/votifier/VotifierVoteScriptEvent.java index c2063bbfe..0b6d2cbb0 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/events/votifier/VotifierVoteScriptEvent.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/events/votifier/VotifierVoteScriptEvent.java @@ -47,7 +47,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { @Override public boolean matches(ScriptPath path) { - return true; + return super.matches(path); } @Override