From ce292b8aa802c935e8440687364ffec54b342607 Mon Sep 17 00:00:00 2001 From: mcmonkey Date: Fri, 18 Jan 2019 04:19:32 -0800 Subject: [PATCH] first-pass: fix old matches lines --- .../aufdemrand/denizen/events/block/BlockBuiltScriptEvent.java | 2 +- .../aufdemrand/denizen/events/block/BlockBurnsScriptEvent.java | 2 +- .../denizen/events/block/BlockDispensesScriptEvent.java | 2 +- .../aufdemrand/denizen/events/block/BlockFadesScriptEvent.java | 2 +- .../aufdemrand/denizen/events/block/BlockFallsScriptEvent.java | 2 +- .../aufdemrand/denizen/events/block/BlockFormsScriptEvent.java | 2 +- .../aufdemrand/denizen/events/block/BlockGrowsScriptEvent.java | 2 +- .../denizen/events/block/BlockIgnitesScriptEvent.java | 2 +- .../denizen/events/block/BlockPhysicsScriptEvent.java | 2 +- .../denizen/events/block/BlockSpreadsScriptEvent.java | 2 +- .../denizen/events/entity/CreeperPoweredScriptEvent.java | 2 +- .../denizen/events/entity/EntityBreaksHangingScriptEvent.java | 2 +- .../denizen/events/entity/EntityBreedScriptEvent.java | 2 +- .../denizen/events/entity/EntityChangesBlockScriptEvent.java | 2 +- .../denizen/events/entity/EntityCombustsScriptEvent.java | 2 +- .../denizen/events/entity/EntityCreatePortalScriptEvent.java | 2 +- .../denizen/events/entity/EntityDamagedScriptEvent.java | 2 +- .../denizen/events/entity/EntityDeathScriptEvent.java | 2 +- .../denizen/events/entity/EntityDespawnScriptEvent.java | 2 +- .../denizen/events/entity/EntityEntersPortalScriptEvent.java | 2 +- .../denizen/events/entity/EntityEntersVehicleScriptEvent.java | 2 +- .../denizen/events/entity/EntityExitsPortalScriptEvent.java | 2 +- .../denizen/events/entity/EntityExitsVehicleScriptEvent.java | 2 +- .../denizen/events/entity/EntityExplodesScriptEvent.java | 2 +- .../denizen/events/entity/EntityExplosionPrimesScriptEvent.java | 2 +- .../denizen/events/entity/EntityFoodLevelChangeScriptEvent.java | 2 +- .../denizen/events/entity/EntityFormsBlockScriptEvent.java | 2 +- .../denizen/events/entity/EntityGlideScriptEvent.java | 2 +- .../denizen/events/entity/EntityHealsScriptEvent.java | 2 +- .../denizen/events/entity/EntityInteractScriptEvent.java | 2 +- .../denizen/events/entity/EntityKilledScriptEvent.java | 2 +- .../denizen/events/entity/EntityResurrectScriptEvent.java | 2 +- .../aufdemrand/denizen/events/entity/EntityShootsBowEvent.java | 2 +- .../denizen/events/entity/EntitySpawnScriptEvent.java | 2 +- .../denizen/events/entity/EntitySpawnerSpawnScriptEvent.java | 2 +- .../denizen/events/entity/EntityTamesScriptEvent.java | 2 +- .../denizen/events/entity/EntityTargetsScriptEvent.java | 2 +- .../denizen/events/entity/EntityTeleportScriptEvent.java | 2 +- .../denizen/events/entity/EntityUnleashedScriptEvent.java | 2 +- .../denizen/events/entity/FireworkBurstsScriptEvent.java | 2 +- .../denizen/events/entity/HangingBreaksScriptEvent.java | 2 +- .../aufdemrand/denizen/events/entity/HorseJumpsScriptEvent.java | 2 +- .../denizen/events/entity/ItemDespawnsScriptEvent.java | 2 +- .../denizen/events/entity/ItemEnchantedScriptEvent.java | 2 +- .../aufdemrand/denizen/events/entity/ItemMergesScriptEvent.java | 2 +- .../aufdemrand/denizen/events/entity/ItemSpawnsScriptEvent.java | 2 +- .../denizen/events/entity/ProjectileHitsScriptEvent.java | 2 +- .../denizen/events/entity/ProjectileLaunchedScriptEvent.java | 2 +- .../aufdemrand/denizen/events/entity/SheepDyedScriptEvent.java | 2 +- .../denizen/events/entity/SheepRegrowsScriptEvent.java | 2 +- .../denizen/events/entity/SlimeSplitsScriptEvent.java | 2 +- .../denizen/events/entity/VehicleCollidesBlockScriptEvent.java | 2 +- .../denizen/events/entity/VehicleCollidesEntityScriptEvent.java | 2 +- .../denizen/events/entity/VehicleCreatedScriptEvent.java | 2 +- .../denizen/events/entity/VehicleDamagedScriptEvent.java | 2 +- .../denizen/events/entity/VehicleDestroyedScriptEvent.java | 2 +- .../denizen/events/entity/VehicleMoveScriptEvent.java | 2 +- .../denizen/events/player/BiomeEnterExitScriptEvent.java | 2 +- .../denizen/events/player/ItemRecipeFormedScriptEvent.java | 2 +- .../aufdemrand/denizen/events/player/ItemScrollScriptEvent.java | 2 +- .../aufdemrand/denizen/events/player/ListPingScriptEvent.java | 2 +- .../denizen/events/player/PlayerAnimatesScriptEvent.java | 2 +- .../denizen/events/player/PlayerBreaksBlockScriptEvent.java | 2 +- .../denizen/events/player/PlayerBreaksItemScriptEvent.java | 2 +- .../denizen/events/player/PlayerChangesGamemodeScriptEvent.java | 2 +- .../denizen/events/player/PlayerChangesSignScriptEvent.java | 2 +- .../denizen/events/player/PlayerChangesWorldScriptEvent.java | 2 +- .../denizen/events/player/PlayerChangesXPScriptEvent.java | 2 +- .../denizen/events/player/PlayerClicksBlockScriptEvent.java | 2 +- .../denizen/events/player/PlayerClosesInvScriptEvent.java | 2 +- .../events/player/PlayerCompletesAdvancementScriptEvent.java | 2 +- .../denizen/events/player/PlayerConsumesScriptEvent.java | 2 +- .../denizen/events/player/PlayerCraftsItemScriptEvent.java | 2 +- .../denizen/events/player/PlayerDamagesBlockScriptEvent.java | 2 +- .../denizen/events/player/PlayerDragsInInvScriptEvent.java | 2 +- .../denizen/events/player/PlayerDropsItemScriptEvent.java | 2 +- .../denizen/events/player/PlayerEditsBookScriptEvent.java | 2 +- .../denizen/events/player/PlayerEmptiesBucketScriptEvent.java | 2 +- .../denizen/events/player/PlayerEntersBedScriptEvent.java | 2 +- .../denizen/events/player/PlayerEquipsArmorScriptEvent.java | 2 +- .../denizen/events/player/PlayerFillsBucketScriptEvent.java | 2 +- .../denizen/events/player/PlayerFishesScriptEvent.java | 2 +- .../denizen/events/player/PlayerFlyingScriptEvent.java | 2 +- .../denizen/events/player/PlayerItemTakesDamageScriptEvent.java | 2 +- .../denizen/events/player/PlayerJoinsScriptEvent.java | 2 +- .../aufdemrand/denizen/events/player/PlayerJumpScriptEvent.java | 2 +- .../denizen/events/player/PlayerKickedScriptEvent.java | 2 +- .../denizen/events/player/PlayerLeashesEntityScriptEvent.java | 2 +- .../denizen/events/player/PlayerLeavesBedScriptEvent.java | 2 +- .../denizen/events/player/PlayerLevelsUpScriptEvent.java | 2 +- .../denizen/events/player/PlayerMendsItemScriptEvent.java | 2 +- .../denizen/events/player/PlayerOpensInvScriptEvent.java | 2 +- .../denizen/events/player/PlayerPicksUpScriptEvent.java | 2 +- .../denizen/events/player/PlayerPlacesBlockScriptEvent.java | 2 +- .../denizen/events/player/PlayerPlacesHangingScriptEvent.java | 2 +- .../events/player/PlayerPreparesAnvilCraftScriptEvent.java | 2 +- .../denizen/events/player/PlayerQuitsScriptEvent.java | 2 +- .../events/player/PlayerReceivesCommandsScriptEvent.java | 2 +- .../denizen/events/player/PlayerReceivesMessageScriptEvent.java | 2 +- .../denizen/events/player/PlayerRespawnsScriptEvent.java | 2 +- .../events/player/PlayerRightClicksAtEntityScriptEvent.java | 2 +- .../events/player/PlayerRightClicksEntityScriptEvent.java | 2 +- .../denizen/events/player/PlayerRiptideScriptEvent.java | 2 +- .../denizen/events/player/PlayerShearsScriptEvent.java | 2 +- .../denizen/events/player/PlayerSneakScriptEvent.java | 2 +- .../denizen/events/player/PlayerSprintScriptEvent.java | 2 +- .../denizen/events/player/PlayerStandsOnScriptEvent.java | 2 +- .../events/player/PlayerStatisticIncrementsScriptEvent.java | 2 +- .../denizen/events/player/PlayerSteersEntityScriptEvent.java | 2 +- .../denizen/events/player/PlayerStepsOnScriptEvent.java | 2 +- .../denizen/events/player/PlayerSwapsItemsScriptEvent.java | 2 +- .../events/player/PlayerTakesFromFurnaceScriptEvent.java | 2 +- .../denizen/events/player/PlayerThrowsEggScriptEvent.java | 2 +- .../denizen/events/player/PlayerUsesPortalScriptEvent.java | 2 +- .../aufdemrand/denizen/events/player/PlayerWalkScriptEvent.java | 2 +- .../denizen/events/player/PlayerWalksOverScriptEvent.java | 2 +- .../denizen/events/player/ResourcePackStatusScriptEvent.java | 2 +- .../aufdemrand/denizen/events/world/ChunkLoadScriptEvent.java | 2 +- .../aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java | 2 +- .../denizen/events/world/FurnaceBurnsItemScriptEvent.java | 2 +- .../denizen/events/world/FurnaceSmeltsItemScriptEvent.java | 2 +- .../denizen/events/world/InventoryPicksUpItemScriptEvent.java | 2 +- .../aufdemrand/denizen/events/world/ItemMoveScriptEvent.java | 2 +- .../aufdemrand/denizen/events/world/LeafDecaysScriptEvent.java | 2 +- .../denizen/events/world/LingeringPotionSplashScriptEvent.java | 2 +- .../denizen/events/world/LiquidSpreadScriptEvent.java | 2 +- .../denizen/events/world/PistonExtendsScriptEvent.java | 2 +- .../denizen/events/world/PistonRetractsScriptEvent.java | 2 +- .../denizen/events/world/PortalCreateScriptEvent.java | 2 +- .../denizen/events/world/PotionSplashScriptEvent.java | 2 +- .../aufdemrand/denizen/events/world/SpawnChangeScriptEvent.java | 2 +- .../denizen/events/world/StructureGrowsScriptEvent.java | 2 +- .../denizen/events/world/WeatherChangesScriptEvent.java | 2 +- 133 files changed, 133 insertions(+), 133 deletions(-) diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockBuiltScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockBuiltScriptEvent.java index e61c1d5806..c085da813d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockBuiltScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockBuiltScriptEvent.java @@ -52,7 +52,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockBurnsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockBurnsScriptEvent.java index 829ffdd367..ec066788ea 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockBurnsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockBurnsScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockDispensesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockDispensesScriptEvent.java index 68093b1078..d1f1beaae2 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockDispensesScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockDispensesScriptEvent.java @@ -62,7 +62,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; if (!runInCheck(scriptContainer, s, lower, location)) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFadesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFadesScriptEvent.java index ca8ab80de7..86a814388e 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFadesScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFadesScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; if (!runInCheck(scriptContainer, s, lower, location)) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFallsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFallsScriptEvent.java index c000c861dd..548d8376b3 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFallsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFallsScriptEvent.java @@ -51,7 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; if (!runInCheck(scriptContainer, s, lower, location)) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFormsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFormsScriptEvent.java index a99d3ada23..433842e534 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFormsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockFormsScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; if (!runInCheck(scriptContainer, s, lower, location)) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockGrowsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockGrowsScriptEvent.java index 66e27e0118..2651b46251 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockGrowsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockGrowsScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String mat = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockIgnitesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockIgnitesScriptEvent.java index dc4637d3c5..0cf2c115f7 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockIgnitesScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockIgnitesScriptEvent.java @@ -56,7 +56,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; if (!runInCheck(scriptContainer, s, lower, location)) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockPhysicsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockPhysicsScriptEvent.java index 74a7ae3fcf..104910b64b 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockPhysicsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockPhysicsScriptEvent.java @@ -54,7 +54,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockSpreadsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockSpreadsScriptEvent.java index d7e7c907f0..291f0528f3 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockSpreadsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/block/BlockSpreadsScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/CreeperPoweredScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/CreeperPoweredScriptEvent.java index 7b91337377..45821cfd3d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/CreeperPoweredScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/CreeperPoweredScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java index d2420004c8..5bf574ce55 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java @@ -65,7 +65,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String entName = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreedScriptEvent.java index 5b9ed281af..6b83f19e1a 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreedScriptEvent.java @@ -64,7 +64,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java index 4fe3f8a3af..42b49a4e1f 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java @@ -63,7 +63,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String entName = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityCombustsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityCombustsScriptEvent.java index 7ba77e3c2d..5c87e0c1c0 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityCombustsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityCombustsScriptEvent.java @@ -63,7 +63,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java index c8e730ffb6..8575fc6a29 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java index 92f720d62c..c33c1d9a0d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java @@ -89,7 +89,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String cmd = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDeathScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDeathScriptEvent.java index 9bd1609b38..fe90e8a6bd 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDeathScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDeathScriptEvent.java @@ -93,7 +93,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String target = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDespawnScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDespawnScriptEvent.java index f89605567c..4e7b22b448 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDespawnScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityDespawnScriptEvent.java @@ -47,7 +47,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String target = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersPortalScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersPortalScriptEvent.java index a4ba27b46e..d270de4de2 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersPortalScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersPortalScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String target = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersVehicleScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersVehicleScriptEvent.java index 95e123616e..c9787089ac 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersVehicleScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityEntersVehicleScriptEvent.java @@ -56,7 +56,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsPortalScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsPortalScriptEvent.java index 70ff85e244..0316a6727e 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsPortalScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsPortalScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String target = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsVehicleScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsVehicleScriptEvent.java index f05a973527..8f31637278 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsVehicleScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExitsVehicleScriptEvent.java @@ -53,7 +53,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplodesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplodesScriptEvent.java index 42a35f81d6..e8a28e4050 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplodesScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplodesScriptEvent.java @@ -62,7 +62,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String target = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplosionPrimesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplosionPrimesScriptEvent.java index 9cd3e1565c..b26deb3671 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplosionPrimesScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityExplosionPrimesScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java index 78f1103693..3281f4d955 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java @@ -56,7 +56,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String target = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java index e6b0fadb1f..e1337f79e5 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java @@ -55,7 +55,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityGlideScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityGlideScriptEvent.java index f1b6257fa5..981d54e16e 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityGlideScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityGlideScriptEvent.java @@ -52,7 +52,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityHealsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityHealsScriptEvent.java index 587990eb44..8d91f27ee3 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityHealsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityHealsScriptEvent.java @@ -59,7 +59,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java index 7473252433..ff6290bf2a 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java @@ -56,7 +56,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java index f7ee68395f..2033e4c33a 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityKilledScriptEvent.java @@ -82,7 +82,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String cmd = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityResurrectScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityResurrectScriptEvent.java index b8cb2afcf2..d926df0e0d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityResurrectScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityResurrectScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityShootsBowEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityShootsBowEvent.java index cd1862f55d..a50d1fa968 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityShootsBowEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityShootsBowEvent.java @@ -70,7 +70,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String attacker = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java index 91b9404436..92194c2ad6 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java @@ -62,7 +62,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnerSpawnScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnerSpawnScriptEvent.java index e0654f3558..3c3985d727 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnerSpawnScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnerSpawnScriptEvent.java @@ -51,7 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTamesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTamesScriptEvent.java index abfefa6b32..d7d5f30445 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTamesScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTamesScriptEvent.java @@ -54,7 +54,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String cmd = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java index 5ef809de6f..d9df767095 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java @@ -61,7 +61,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java index 96ab6498cd..04d468e95b 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityTeleportScriptEvent.java @@ -66,7 +66,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityUnleashedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityUnleashedScriptEvent.java index 76c43a5eec..9af110dfb3 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityUnleashedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/EntityUnleashedScriptEvent.java @@ -51,7 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/FireworkBurstsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/FireworkBurstsScriptEvent.java index a194723094..87405ba231 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/FireworkBurstsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/FireworkBurstsScriptEvent.java @@ -49,7 +49,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; if (!runInCheck(scriptContainer, s, lower, entity.getLocation())) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java index 7e93d5bc27..ea9684020d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java @@ -60,7 +60,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String hangCheck = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/HorseJumpsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/HorseJumpsScriptEvent.java index 31e5456eac..8f14d5d1d4 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/HorseJumpsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/HorseJumpsScriptEvent.java @@ -57,7 +57,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String arg1 = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemDespawnsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemDespawnsScriptEvent.java index 0f1b6ab79b..b48256c5dc 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemDespawnsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemDespawnsScriptEvent.java @@ -53,7 +53,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String item_test = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemEnchantedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemEnchantedScriptEvent.java index 77cfa4eb48..43ca7e3463 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemEnchantedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemEnchantedScriptEvent.java @@ -70,7 +70,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String itemTest = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemMergesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemMergesScriptEvent.java index b764743d53..8ded01bc65 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemMergesScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemMergesScriptEvent.java @@ -57,7 +57,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String item_test = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemSpawnsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemSpawnsScriptEvent.java index 8aedaf123f..f262c9ab42 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemSpawnsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ItemSpawnsScriptEvent.java @@ -58,7 +58,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String item_test = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileHitsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileHitsScriptEvent.java index badf3f0589..7f74dc551b 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileHitsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileHitsScriptEvent.java @@ -74,7 +74,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String cmd = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileLaunchedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileLaunchedScriptEvent.java index 4a957333eb..71491623d0 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileLaunchedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/ProjectileLaunchedScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String projTest = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SheepDyedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SheepDyedScriptEvent.java index df7d9e8c9b..fe0df2a4ee 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SheepDyedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SheepDyedScriptEvent.java @@ -57,7 +57,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String cmd = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SheepRegrowsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SheepRegrowsScriptEvent.java index 4824a9f8d1..40c4ca9d1c 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SheepRegrowsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SheepRegrowsScriptEvent.java @@ -45,7 +45,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SlimeSplitsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SlimeSplitsScriptEvent.java index 07ba90534b..10a64f12ee 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SlimeSplitsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/SlimeSplitsScriptEvent.java @@ -51,7 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String counts = CoreUtilities.getXthArg(3, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesBlockScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesBlockScriptEvent.java index d196b608a3..fdf837b237 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesBlockScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesBlockScriptEvent.java @@ -51,7 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesEntityScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesEntityScriptEvent.java index bfb357c6b2..bbc2c6d184 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesEntityScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCollidesEntityScriptEvent.java @@ -63,7 +63,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; if (!tryEntity(vehicle, CoreUtilities.getXthArg(0, lower))) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCreatedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCreatedScriptEvent.java index 4798094c7e..f031ac4aeb 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCreatedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleCreatedScriptEvent.java @@ -45,7 +45,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDamagedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDamagedScriptEvent.java index 50498e6e89..12fcb5dee2 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDamagedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDamagedScriptEvent.java @@ -72,7 +72,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String cmd = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDestroyedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDestroyedScriptEvent.java index dec0a4dfc2..96918e32a7 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDestroyedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleDestroyedScriptEvent.java @@ -57,7 +57,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String cmd = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleMoveScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleMoveScriptEvent.java index 448f3363eb..b02ecf3727 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleMoveScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/entity/VehicleMoveScriptEvent.java @@ -49,7 +49,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/BiomeEnterExitScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/BiomeEnterExitScriptEvent.java index 7e276503cc..fd553400e3 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/BiomeEnterExitScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/BiomeEnterExitScriptEvent.java @@ -62,7 +62,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String biome_test = lower.substring(lower.lastIndexOf(' ') + 1); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemRecipeFormedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemRecipeFormedScriptEvent.java index 1800d43a9f..1a08856152 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemRecipeFormedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemRecipeFormedScriptEvent.java @@ -65,7 +65,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String eItem = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemScrollScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemScrollScriptEvent.java index 8702ef2ced..398a14214d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemScrollScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemScrollScriptEvent.java @@ -53,7 +53,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { return true; } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ListPingScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ListPingScriptEvent.java index b801f87995..e911ff376c 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ListPingScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ListPingScriptEvent.java @@ -53,7 +53,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { return true; } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerAnimatesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerAnimatesScriptEvent.java index 56ba966290..586b5d9b30 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerAnimatesScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerAnimatesScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; if (dEntity.isNPC(event.getPlayer())) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java index 36842aa913..f0c82ba345 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java @@ -66,7 +66,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String mat = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksItemScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksItemScriptEvent.java index 82ca0b9729..f2b2585c81 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksItemScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksItemScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String iCheck = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesGamemodeScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesGamemodeScriptEvent.java index 2b0fbee0b3..ffaa2b9fba 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesGamemodeScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesGamemodeScriptEvent.java @@ -46,7 +46,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String mode = CoreUtilities.getXthArg(4, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesSignScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesSignScriptEvent.java index 27121ac65a..69b3f6dc14 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesSignScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesSignScriptEvent.java @@ -66,7 +66,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesWorldScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesWorldScriptEvent.java index 165c2c6b6f..8d34f4b7c1 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesWorldScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesWorldScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesXPScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesXPScriptEvent.java index 7709b6af61..7755d54608 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesXPScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesXPScriptEvent.java @@ -52,7 +52,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; if (!runInCheck(scriptContainer, s, lower, player.getLocation())) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClicksBlockScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClicksBlockScriptEvent.java index 5e36537e48..370ac2227e 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClicksBlockScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClicksBlockScriptEvent.java @@ -130,7 +130,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { private static final List withHelpList = Arrays.asList("with", "using", "in"); @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; int index = CoreUtilities.split(lower, ' ').indexOf("clicks") + 1; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClosesInvScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClosesInvScriptEvent.java index d7f7203816..1e55a979ed 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClosesInvScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerClosesInvScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String entName = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerCompletesAdvancementScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerCompletesAdvancementScriptEvent.java index 1ed2572a81..2e4900f5df 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerCompletesAdvancementScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerCompletesAdvancementScriptEvent.java @@ -46,7 +46,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { return true; } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerConsumesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerConsumesScriptEvent.java index 561ed25a9e..1430ac2e39 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerConsumesScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerConsumesScriptEvent.java @@ -51,7 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String iCheck = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerCraftsItemScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerCraftsItemScriptEvent.java index 82bc1f81b3..5a6712c5ef 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerCraftsItemScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerCraftsItemScriptEvent.java @@ -62,7 +62,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String eItem = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java index a9231c1fc7..161dc5685f 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java @@ -57,7 +57,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDragsInInvScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDragsInInvScriptEvent.java index 8b74795605..4066828204 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDragsInInvScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDragsInInvScriptEvent.java @@ -65,7 +65,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDropsItemScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDropsItemScriptEvent.java index 13f741601b..9f7a16a741 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDropsItemScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDropsItemScriptEvent.java @@ -53,7 +53,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEditsBookScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEditsBookScriptEvent.java index 70d84ed258..bfd02e1560 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEditsBookScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEditsBookScriptEvent.java @@ -58,7 +58,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String action = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEmptiesBucketScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEmptiesBucketScriptEvent.java index 7f79d43f9d..c00eb8be03 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEmptiesBucketScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEmptiesBucketScriptEvent.java @@ -58,7 +58,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String iTest = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEntersBedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEntersBedScriptEvent.java index 04b9529198..9baebf3eda 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEntersBedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEntersBedScriptEvent.java @@ -46,7 +46,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; return runInCheck(scriptContainer, s, lower, location); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEquipsArmorScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEquipsArmorScriptEvent.java index 912e552008..c15ff724dd 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEquipsArmorScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerEquipsArmorScriptEvent.java @@ -64,7 +64,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String type = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFillsBucketScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFillsBucketScriptEvent.java index 73ca9a52f3..125c8a3048 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFillsBucketScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFillsBucketScriptEvent.java @@ -57,7 +57,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String iTest = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFishesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFishesScriptEvent.java index cb2dbc2c37..a9a00859c4 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFishesScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFishesScriptEvent.java @@ -57,7 +57,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String fish = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFlyingScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFlyingScriptEvent.java index 5a31d70db2..f1f98c9daf 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFlyingScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerFlyingScriptEvent.java @@ -49,7 +49,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String cmd = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerItemTakesDamageScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerItemTakesDamageScriptEvent.java index 39451f826a..9c274ef57b 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerItemTakesDamageScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerItemTakesDamageScriptEvent.java @@ -60,7 +60,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerJoinsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerJoinsScriptEvent.java index af50668bcd..9655b4646d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerJoinsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerJoinsScriptEvent.java @@ -49,7 +49,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { return true; } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerJumpScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerJumpScriptEvent.java index 1d9a292944..63930eec39 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerJumpScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerJumpScriptEvent.java @@ -44,7 +44,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; if (!runInCheck(scriptContainer, s, lower, event.getFrom())) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerKickedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerKickedScriptEvent.java index 8bbd21b04e..892e4ecef4 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerKickedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerKickedScriptEvent.java @@ -52,7 +52,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { return true; } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLeashesEntityScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLeashesEntityScriptEvent.java index e26733eb2c..1aeda97158 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLeashesEntityScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLeashesEntityScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLeavesBedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLeavesBedScriptEvent.java index f4fd71df6c..0af461b582 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLeavesBedScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLeavesBedScriptEvent.java @@ -46,7 +46,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; return runInCheck(scriptContainer, s, lower, location); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLevelsUpScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLevelsUpScriptEvent.java index 330ad19495..bf731c9738 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLevelsUpScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerLevelsUpScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; List data = CoreUtilities.split(lower, ' '); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerMendsItemScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerMendsItemScriptEvent.java index ced24d10a1..e602943f13 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerMendsItemScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerMendsItemScriptEvent.java @@ -58,7 +58,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerOpensInvScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerOpensInvScriptEvent.java index ee7e19aeac..8ab169d2ec 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerOpensInvScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerOpensInvScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String inv = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPicksUpScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPicksUpScriptEvent.java index 1c020e5c96..88f2466c8d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPicksUpScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPicksUpScriptEvent.java @@ -69,7 +69,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String iTest = CoreUtilities.xthArgEquals(1, lower, "picks") ? diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesBlockScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesBlockScriptEvent.java index 0a9720dca6..3485bdb54d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesBlockScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesBlockScriptEvent.java @@ -56,7 +56,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesHangingScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesHangingScriptEvent.java index 7029cb6228..4af52903f2 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesHangingScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesHangingScriptEvent.java @@ -56,7 +56,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String hangCheck = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPreparesAnvilCraftScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPreparesAnvilCraftScriptEvent.java index 86fcea69a7..1aa693ba90 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPreparesAnvilCraftScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerPreparesAnvilCraftScriptEvent.java @@ -64,7 +64,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String eItem = CoreUtilities.getXthArg(4, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerQuitsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerQuitsScriptEvent.java index 1b10c0326c..a74e27895b 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerQuitsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerQuitsScriptEvent.java @@ -49,7 +49,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { return true; } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerReceivesCommandsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerReceivesCommandsScriptEvent.java index a8b99aee9c..b241c5666e 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerReceivesCommandsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerReceivesCommandsScriptEvent.java @@ -49,7 +49,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { return true; } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerReceivesMessageScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerReceivesMessageScriptEvent.java index 2126c555bc..a66a3a9668 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerReceivesMessageScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerReceivesMessageScriptEvent.java @@ -55,7 +55,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { return true; } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRespawnsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRespawnsScriptEvent.java index b979e27f27..f665d428c5 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRespawnsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRespawnsScriptEvent.java @@ -47,7 +47,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String loc = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksAtEntityScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksAtEntityScriptEvent.java index 0aa65b9d9d..9669addf06 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksAtEntityScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksAtEntityScriptEvent.java @@ -56,7 +56,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java index 434ec7471e..9b36107a47 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRightClicksEntityScriptEvent.java @@ -58,7 +58,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRiptideScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRiptideScriptEvent.java index 2bcd4d9207..4e85b440ce 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRiptideScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerRiptideScriptEvent.java @@ -46,7 +46,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; return runInCheck(scriptContainer, s, lower, event.getPlayer().getLocation()); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerShearsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerShearsScriptEvent.java index f624d4d184..9f4489c310 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerShearsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerShearsScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String ent = CoreUtilities.xthArgEquals(3, lower, "sheep") ? "sheep" : CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSneakScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSneakScriptEvent.java index fd6c5741ec..aa1caef59e 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSneakScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSneakScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String cmd = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSprintScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSprintScriptEvent.java index bec09365ca..cd8def3c67 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSprintScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSprintScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String cmd = CoreUtilities.getXthArg(1, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStandsOnScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStandsOnScriptEvent.java index c3e151a466..7e0be9131f 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStandsOnScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStandsOnScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java index 720158f3c7..93c969cfb6 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStatisticIncrementsScriptEvent.java @@ -57,7 +57,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String stat = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSteersEntityScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSteersEntityScriptEvent.java index 0f90716754..0fdf0b8884 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSteersEntityScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSteersEntityScriptEvent.java @@ -51,7 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String entityName = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStepsOnScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStepsOnScriptEvent.java index 38fcabd7dc..d6ee9117c7 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStepsOnScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerStepsOnScriptEvent.java @@ -55,7 +55,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSwapsItemsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSwapsItemsScriptEvent.java index 6bfdbe9464..24a4c39517 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSwapsItemsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerSwapsItemsScriptEvent.java @@ -52,7 +52,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { return true; } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java index 871fbf3ce5..45e01721ef 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java @@ -52,7 +52,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String itemTest = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerThrowsEggScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerThrowsEggScriptEvent.java index 4016f0f76e..c8a2351b2c 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerThrowsEggScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerThrowsEggScriptEvent.java @@ -56,7 +56,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; if (CoreUtilities.getXthArg(2, lower).equals("hatching") && !is_hatching) { diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerUsesPortalScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerUsesPortalScriptEvent.java index b684425e6a..d839fe6bd2 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerUsesPortalScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerUsesPortalScriptEvent.java @@ -48,7 +48,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; return runInCheck(scriptContainer, s, lower, to) || runInCheck(scriptContainer, s, lower, from); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerWalkScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerWalkScriptEvent.java index fbdab83229..7ed2a5c349 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerWalkScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerWalkScriptEvent.java @@ -52,7 +52,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; return runInCheck(scriptContainer, s, lower, old_location) || runInCheck(scriptContainer, s, lower, new_location); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerWalksOverScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerWalksOverScriptEvent.java index 70dee76de5..1caa8d332c 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerWalksOverScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerWalksOverScriptEvent.java @@ -49,7 +49,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String loc = CoreUtilities.getXthArg(3, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ResourcePackStatusScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ResourcePackStatusScriptEvent.java index d3a67f28e1..fdff38f870 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ResourcePackStatusScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ResourcePackStatusScriptEvent.java @@ -42,7 +42,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { return true; } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkLoadScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkLoadScriptEvent.java index 9ab9302883..ea788a57c1 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkLoadScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkLoadScriptEvent.java @@ -47,7 +47,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; return lower.equals("chunk loads for the first time") diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java index 9ebe6cb6f8..23a75da236 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/ChunkUnloadScriptEvent.java @@ -49,7 +49,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; return (lower.startsWith("chunk unloads") && !lower.contains(" in ")) diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/FurnaceBurnsItemScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/FurnaceBurnsItemScriptEvent.java index c22842cd1c..f6bbf75bb5 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/FurnaceBurnsItemScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/FurnaceBurnsItemScriptEvent.java @@ -51,7 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String iTest = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/FurnaceSmeltsItemScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/FurnaceSmeltsItemScriptEvent.java index 3f48eebed0..5b016050d4 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/FurnaceSmeltsItemScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/FurnaceSmeltsItemScriptEvent.java @@ -51,7 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String srcItem = CoreUtilities.getXthArg(2, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/InventoryPicksUpItemScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/InventoryPicksUpItemScriptEvent.java index e0182753db..4a94601241 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/InventoryPicksUpItemScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/InventoryPicksUpItemScriptEvent.java @@ -53,7 +53,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String inv = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/ItemMoveScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/ItemMoveScriptEvent.java index db60e6c154..6cc7989786 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/ItemMoveScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/ItemMoveScriptEvent.java @@ -59,7 +59,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String iCheck = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/LeafDecaysScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/LeafDecaysScriptEvent.java index f330b9ff07..501135660c 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/LeafDecaysScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/LeafDecaysScriptEvent.java @@ -47,7 +47,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String mat = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/LingeringPotionSplashScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/LingeringPotionSplashScriptEvent.java index f0f1a766ff..deea435ea5 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/LingeringPotionSplashScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/LingeringPotionSplashScriptEvent.java @@ -63,7 +63,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String iTest = CoreUtilities.getXthArg(1, s); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/LiquidSpreadScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/LiquidSpreadScriptEvent.java index 89753d1b2f..ef47c2b3d9 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/LiquidSpreadScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/LiquidSpreadScriptEvent.java @@ -50,7 +50,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String mat = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/PistonExtendsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/PistonExtendsScriptEvent.java index 141e68b640..d65329dd3d 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/PistonExtendsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/PistonExtendsScriptEvent.java @@ -59,7 +59,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String mat = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/PistonRetractsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/PistonRetractsScriptEvent.java index 46fd7c63ec..1ce6ea66c9 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/PistonRetractsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/PistonRetractsScriptEvent.java @@ -61,7 +61,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String mat = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/PortalCreateScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/PortalCreateScriptEvent.java index e3906a51d9..660ed8994c 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/PortalCreateScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/PortalCreateScriptEvent.java @@ -51,7 +51,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String rCheck = CoreUtilities.getXthArg(2, lower).equals("because") ? CoreUtilities.getXthArg(3, lower) : CoreUtilities.getXthArg(5, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/PotionSplashScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/PotionSplashScriptEvent.java index cc0c41db1c..c47ba46a96 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/PotionSplashScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/PotionSplashScriptEvent.java @@ -55,7 +55,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String iTest = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/SpawnChangeScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/SpawnChangeScriptEvent.java index cf5efd191d..5fa875552f 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/SpawnChangeScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/SpawnChangeScriptEvent.java @@ -46,7 +46,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { return true; } diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/StructureGrowsScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/StructureGrowsScriptEvent.java index a274b0868d..fc55e83fc3 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/StructureGrowsScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/StructureGrowsScriptEvent.java @@ -64,7 +64,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String struct = CoreUtilities.getXthArg(0, lower); diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/world/WeatherChangesScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/world/WeatherChangesScriptEvent.java index a45202092b..79b529dae0 100644 --- a/plugin/src/main/java/net/aufdemrand/denizen/events/world/WeatherChangesScriptEvent.java +++ b/plugin/src/main/java/net/aufdemrand/denizen/events/world/WeatherChangesScriptEvent.java @@ -46,7 +46,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) { } @Override - public boolean matches(ScriptContainer scriptContainer, ScriptPath path) { + public boolean matches(ScriptPath path) { String s = path.event; String lower = path.eventLower; String cmd = CoreUtilities.getXthArg(1, lower);