From b34d6b5b48d95177f07fa72d60be2371309c262d Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Wed, 13 Jan 2021 10:25:26 -0800 Subject: [PATCH] add location_flagged, item_flagged, new location event meta --- .../EntityKnocksbackEntityScriptEvent.java | 2 +- .../events/EntityPathfindScriptEvent.java | 2 +- .../events/ExperienceOrbMergeScriptEvent.java | 2 +- .../PlayerAbsorbsExperienceScriptEvent.java | 2 +- .../events/PlayerBeaconEffectScriptEvent.java | 2 +- .../PlayerClicksFakeEntityScriptEvent.java | 2 +- .../PlayerSpectatesEntityScriptEvent.java | 2 +- .../PlayerStopsSpectatingScriptEvent.java | 2 +- .../events/PreEntitySpawnScriptEvent.java | 2 +- .../events/ProjectileCollideScriptEvent.java | 2 +- .../paper/events/TNTPrimesScriptEvent.java | 2 +- .../denizen/events/BukkitScriptEvent.java | 54 ++++++++++++------- .../events/block/BlockBuiltScriptEvent.java | 2 +- .../events/block/BlockBurnsScriptEvent.java | 2 +- .../block/BlockDispensesScriptEvent.java | 2 +- .../block/BlockExplodesScriptEvent.java | 2 +- .../events/block/BlockFadesScriptEvent.java | 2 +- .../events/block/BlockFallsScriptEvent.java | 2 +- .../events/block/BlockFormsScriptEvent.java | 2 +- .../events/block/BlockGrowsScriptEvent.java | 2 +- .../events/block/BlockIgnitesScriptEvent.java | 2 +- .../events/block/BlockPhysicsScriptEvent.java | 2 +- .../events/block/BlockSpreadsScriptEvent.java | 2 +- .../block/BrewingStandFueledScriptEvent.java | 2 +- .../events/block/BrewsScriptEvent.java | 2 +- .../block/CauldronLevelChangeScriptEvent.java | 2 +- .../block/FurnaceBurnsItemScriptEvent.java | 2 +- .../block/FurnaceSmeltsItemScriptEvent.java | 2 +- .../events/block/LeafDecaysScriptEvent.java | 2 +- .../events/block/LiquidSpreadScriptEvent.java | 2 +- .../block/NoteBlockPlaysNoteScriptEvent.java | 2 +- .../block/PistonExtendsScriptEvent.java | 2 +- .../block/PistonRetractsScriptEvent.java | 2 +- .../events/block/RedstoneScriptEvent.java | 2 +- .../entity/CreeperPoweredScriptEvent.java | 2 +- .../entity/DragonPhaseChangeScriptEvent.java | 2 +- .../EntityAirLevelChangeScriptEvent.java | 2 +- .../EntityBreaksHangingScriptEvent.java | 2 +- .../events/entity/EntityBreedScriptEvent.java | 2 +- .../entity/EntityChangesBlockScriptEvent.java | 2 +- .../entity/EntityCombustsScriptEvent.java | 2 +- .../entity/EntityCreatePortalScriptEvent.java | 2 +- .../entity/EntityDamagedScriptEvent.java | 2 +- .../events/entity/EntityDeathScriptEvent.java | 2 +- .../entity/EntityDespawnScriptEvent.java | 2 +- .../entity/EntityEntersPortalScriptEvent.java | 2 +- .../EntityEntersVehicleScriptEvent.java | 2 +- .../entity/EntityExitsPortalScriptEvent.java | 2 +- .../entity/EntityExitsVehicleScriptEvent.java | 2 +- .../entity/EntityExplodesScriptEvent.java | 2 +- .../EntityExplosionPrimesScriptEvent.java | 2 +- .../EntityFoodLevelChangeScriptEvent.java | 2 +- .../entity/EntityFormsBlockScriptEvent.java | 2 +- .../events/entity/EntityGlideScriptEvent.java | 2 +- .../events/entity/EntityHealsScriptEvent.java | 2 +- .../entity/EntityInteractScriptEvent.java | 2 +- .../entity/EntityKilledScriptEvent.java | 2 +- .../entity/EntityPicksUpItemScriptEvent.java | 2 +- .../entity/EntityPotionEffectScriptEvent.java | 2 +- .../entity/EntityResurrectScriptEvent.java | 2 +- .../events/entity/EntityShootsBowEvent.java | 2 +- .../events/entity/EntitySpawnScriptEvent.java | 2 +- .../entity/EntitySpawnerSpawnScriptEvent.java | 2 +- .../events/entity/EntitySwimScriptEvent.java | 2 +- .../events/entity/EntityTamesScriptEvent.java | 2 +- .../entity/EntityTargetsScriptEvent.java | 2 +- .../entity/EntityTeleportScriptEvent.java | 2 +- .../entity/EntityTransformScriptEvent.java | 2 +- .../entity/EntityUnleashedScriptEvent.java | 2 +- .../ExperienceBottleBreaksScriptEvent.java | 2 +- .../entity/FireworkBurstsScriptEvent.java | 2 +- .../entity/HangingBreaksScriptEvent.java | 2 +- .../events/entity/HorseJumpsScriptEvent.java | 2 +- .../events/entity/PigZappedScriptEvent.java | 2 +- .../entity/ProjectileHitsScriptEvent.java | 4 +- .../entity/ProjectileLaunchedScriptEvent.java | 2 +- .../events/entity/SheepDyedScriptEvent.java | 2 +- .../entity/SheepRegrowsScriptEvent.java | 2 +- .../events/entity/SlimeSplitsScriptEvent.java | 2 +- .../VillagerAcquiresTradeScriptEvent.java | 2 +- .../VillagerChangesProfessionScriptEvent.java | 2 +- .../VillagerReplenishesTradeScriptEvent.java | 2 +- .../item/InventoryPicksUpItemScriptEvent.java | 2 +- .../events/item/ItemDespawnsScriptEvent.java | 2 +- .../events/item/ItemEnchantedScriptEvent.java | 2 +- .../events/item/ItemMergesScriptEvent.java | 2 +- .../events/item/ItemMoveScriptEvent.java | 2 +- .../events/item/ItemSpawnsScriptEvent.java | 2 +- .../events/npc/NPCNavigationScriptEvent.java | 2 +- .../events/npc/NPCSpawnScriptEvent.java | 2 +- .../events/npc/NPCStuckScriptEvent.java | 2 +- .../player/BiomeEnterExitScriptEvent.java | 2 +- .../events/player/ChatScriptEvent.java | 2 +- .../player/HotbarScrollScriptEvent.java | 2 +- .../player/PlayerAnimatesScriptEvent.java | 2 +- .../player/PlayerBreaksBlockScriptEvent.java | 2 +- .../player/PlayerBreaksItemScriptEvent.java | 2 +- .../player/PlayerChangesSignScriptEvent.java | 2 +- .../player/PlayerChangesWorldScriptEvent.java | 2 +- .../player/PlayerChangesXPScriptEvent.java | 2 +- .../player/PlayerClicksBlockScriptEvent.java | 2 +- .../PlayerClicksInInventoryScriptEvent.java | 4 +- .../player/PlayerClosesInvScriptEvent.java | 2 +- .../player/PlayerConsumesScriptEvent.java | 2 +- .../player/PlayerDamagesBlockScriptEvent.java | 2 +- .../player/PlayerDragsInInvScriptEvent.java | 4 +- .../player/PlayerDropsItemScriptEvent.java | 2 +- .../PlayerEmptiesBucketScriptEvent.java | 2 +- .../player/PlayerEntersBedScriptEvent.java | 2 +- .../player/PlayerFillsBucketScriptEvent.java | 2 +- .../player/PlayerFishesScriptEvent.java | 2 +- .../player/PlayerFlyingScriptEvent.java | 2 +- .../events/player/PlayerHoldsShieldEvent.java | 2 +- .../PlayerItemTakesDamageScriptEvent.java | 2 +- .../events/player/PlayerJumpScriptEvent.java | 2 +- .../PlayerLeashesEntityScriptEvent.java | 2 +- .../player/PlayerLeavesBedScriptEvent.java | 2 +- .../player/PlayerLevelsUpScriptEvent.java | 2 +- .../player/PlayerMendsItemScriptEvent.java | 2 +- .../player/PlayerOpensInvScriptEvent.java | 2 +- .../player/PlayerPlacesBlockScriptEvent.java | 2 +- .../PlayerPlacesHangingScriptEvent.java | 2 +- .../PlayerRightClicksEntityScriptEvent.java | 2 +- .../player/PlayerRiptideScriptEvent.java | 2 +- .../player/PlayerShearsScriptEvent.java | 2 +- .../events/player/PlayerSneakScriptEvent.java | 2 +- .../player/PlayerSprintScriptEvent.java | 2 +- .../player/PlayerStandsOnScriptEvent.java | 2 +- .../player/PlayerSteersEntityScriptEvent.java | 2 +- .../player/PlayerStepsOnScriptEvent.java | 2 +- .../PlayerTakesFromFurnaceScriptEvent.java | 2 +- .../PlayerTakesFromLecternScriptEvent.java | 2 +- .../player/PlayerThrowsEggScriptEvent.java | 2 +- .../player/PlayerUsesPortalScriptEvent.java | 2 +- .../events/player/PlayerWalkScriptEvent.java | 2 +- .../player/PlayerWalksOverScriptEvent.java | 2 +- .../events/server/CommandScriptEvent.java | 2 +- .../VehicleCollidesBlockScriptEvent.java | 2 +- .../VehicleCollidesEntityScriptEvent.java | 2 +- .../vehicle/VehicleCreatedScriptEvent.java | 2 +- .../vehicle/VehicleDamagedScriptEvent.java | 2 +- .../vehicle/VehicleDestroyedScriptEvent.java | 2 +- .../vehicle/VehicleMoveScriptEvent.java | 2 +- .../events/world/ChunkLoadScriptEvent.java | 2 +- .../events/world/ChunkUnloadScriptEvent.java | 2 +- .../world/LightningStrikesScriptEvent.java | 2 +- .../LingeringPotionSplashScriptEvent.java | 2 +- .../events/world/LootGenerateScriptEvent.java | 2 +- .../events/world/PortalCreateScriptEvent.java | 2 +- .../events/world/PotionSplashScriptEvent.java | 2 +- .../world/StructureGrowsScriptEvent.java | 2 +- 151 files changed, 190 insertions(+), 170 deletions(-) diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/EntityKnocksbackEntityScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/EntityKnocksbackEntityScriptEvent.java index c03bfae8a1..950da0cb9a 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/EntityKnocksbackEntityScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/EntityKnocksbackEntityScriptEvent.java @@ -22,7 +22,7 @@ public class EntityKnocksbackEntityScriptEvent extends BukkitScriptEvent impleme // // @Regex ^on [^\s]+ knocks back [^\s]+$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch with: to only process the event when the item used to cause damage (in the damager's hand) is a specified item. // // @Plugin Paper diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/EntityPathfindScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/EntityPathfindScriptEvent.java index c7b28aa3fc..3b67a0d6b1 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/EntityPathfindScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/EntityPathfindScriptEvent.java @@ -20,7 +20,7 @@ public class EntityPathfindScriptEvent extends BukkitScriptEvent implements List // // @Regex ^on [^\s]+ pathfinds$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch to: to only process the event if the entity is pathfinding into a specified area. // @Switch at: to only process the event when the entity is pathfinding at a specified entity. // diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/ExperienceOrbMergeScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/ExperienceOrbMergeScriptEvent.java index 4444187ab9..9bc0d0e3f8 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/ExperienceOrbMergeScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/ExperienceOrbMergeScriptEvent.java @@ -18,7 +18,7 @@ public class ExperienceOrbMergeScriptEvent extends BukkitScriptEvent implements // // @Regex ^on experience orbs merge$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Plugin Paper // diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerAbsorbsExperienceScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerAbsorbsExperienceScriptEvent.java index a939228a35..c20e86bbab 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerAbsorbsExperienceScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerAbsorbsExperienceScriptEvent.java @@ -18,7 +18,7 @@ public class PlayerAbsorbsExperienceScriptEvent extends BukkitScriptEvent implem // // @Regex ^on player absorbs experience$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Plugin Paper // diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerBeaconEffectScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerBeaconEffectScriptEvent.java index 73c04b4e59..2e34bcbd5c 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerBeaconEffectScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerBeaconEffectScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerBeaconEffectScriptEvent extends BukkitScriptEvent implements // // @Regex ^on player beacon effect applied$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Plugin Paper // diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerClicksFakeEntityScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerClicksFakeEntityScriptEvent.java index 4b555cf95c..fe14cd4e44 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerClicksFakeEntityScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerClicksFakeEntityScriptEvent.java @@ -20,7 +20,7 @@ public class PlayerClicksFakeEntityScriptEvent extends BukkitScriptEvent impleme // // @Regex ^on player ([^\s]+ )?clicks fake entity$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Plugin Paper // diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerSpectatesEntityScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerSpectatesEntityScriptEvent.java index e17c66ffb5..452da8d76b 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerSpectatesEntityScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerSpectatesEntityScriptEvent.java @@ -17,7 +17,7 @@ public class PlayerSpectatesEntityScriptEvent extends BukkitScriptEvent implemen // // @Regex ^on player spectates [^\s]+$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Plugin Paper // diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerStopsSpectatingScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerStopsSpectatingScriptEvent.java index 950bada59a..1bcb59f941 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerStopsSpectatingScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/PlayerStopsSpectatingScriptEvent.java @@ -17,7 +17,7 @@ public class PlayerStopsSpectatingScriptEvent extends BukkitScriptEvent implemen // // @Regex ^on player stops spectating( [^\s]+)?$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Plugin Paper // diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/PreEntitySpawnScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/PreEntitySpawnScriptEvent.java index f73a303357..40d34b6b5f 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/PreEntitySpawnScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/PreEntitySpawnScriptEvent.java @@ -23,7 +23,7 @@ public class PreEntitySpawnScriptEvent extends BukkitScriptEvent implements List // // @Regex ^on [^\s]+ prespawns( because [^\s]+)?$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/ProjectileCollideScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/ProjectileCollideScriptEvent.java index 141a00674f..8a5a1051a1 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/ProjectileCollideScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/ProjectileCollideScriptEvent.java @@ -18,7 +18,7 @@ public class ProjectileCollideScriptEvent extends BukkitScriptEvent implements L // // @Regex ^on [^\s]+ collides with [^\s]+$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Plugin Paper // diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/TNTPrimesScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/TNTPrimesScriptEvent.java index b188b112a8..071f4cd1a3 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/TNTPrimesScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/TNTPrimesScriptEvent.java @@ -21,7 +21,7 @@ public class TNTPrimesScriptEvent extends BukkitScriptEvent implements Listener // // @Regex ^on tnt primes$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Plugin Paper // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java index 8e98466b94..15b169990f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/BukkitScriptEvent.java @@ -5,6 +5,7 @@ import com.denizenscript.denizen.objects.notable.NotableManager; import com.denizenscript.denizen.tags.BukkitTagContext; import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData; +import com.denizenscript.denizencore.flags.AbstractFlagTracker; import com.denizenscript.denizencore.objects.core.ScriptTag; import com.denizenscript.denizencore.utilities.Deprecations; import com.denizenscript.denizencore.utilities.debugging.Debug; @@ -47,6 +48,8 @@ public abstract class BukkitScriptEvent extends ScriptEvent { // // "" or similar expects of course an ItemTag. // You can use any valid item material type like "stick", or the name of an item script, or "item" as a catch-all, or "potion" for any potion item. + // Items can also be used with an "item_flagged" secondary prefix, so for an event that has "with:", you can also do "with:item_flagged:". + // For item matchers that aren't switches, this works similarly, like "on player consumes item_flagged:myflag:" (note that this is not a switch). // // "" or similar expects of course an InventoryTag. // You can use "inventory" as a catch-all, "note" to mean any noted inventory, the name of an inventory script, @@ -174,6 +177,9 @@ public boolean couldMatchItem(String text) { if (text.equals("item")) { return true; } + if (text.startsWith("item_flagged:")) { + return true; + } if (MaterialTag.matches(text)) { MaterialTag mat = MaterialTag.valueOf(text, CoreUtilities.noDebugContext); if (mat == null || !mat.getMaterial().isItem()) { @@ -412,7 +418,27 @@ public boolean runInCheck(ScriptPath path, Location location) { return runInCheck(path, location, "in"); } + public boolean runLocationFlaggedCheck(ScriptPath path, String switchName, Location location) { + String flagged = path.switches.get(switchName); + if (flagged == null) { + return true; + } + if (location == null) { + return false; + } + AbstractFlagTracker tracker = new LocationTag(location).getFlagTracker(); + for (String flag : CoreUtilities.split(flagged, '|')) { + if (!tracker.hasFlag(flag)) { + return false; + } + } + return true; + } + public boolean runInCheck(ScriptPath path, Location location, String innote) { + if (!runLocationFlaggedCheck(path, "location_flagged", location)) { + return false; + } String inputText = path.switches.get(innote); if (inputText == null) { int index; @@ -551,31 +577,13 @@ public boolean runPermissionCheck(ScriptPath path, String switchName, PlayerTag return true; } - // <--[language] - // @name Player Event Switches - // @group Script Events - // @description - // There are a few special switches available to any script event with a linked player. - // - // The "flagged:" will limit the event to only fire when the player has the flag with the specified name. - // It can be used like "on player breaks block flagged:nobreak:" (that would be used alongside "- flag player nobreak"). - // - // The "permission:" will limit the event to only fire when the player has the specified permission key. - // It can be used like "on player breaks block permission:denizen.my.perm:" - // - // Note that these switches will be ignored for events that do not have a linked player. - // Be cautious with events that will only sometimes have a linked player. - // - // For multiple flag or permission requirements, just list them separated by '|' pipes, like "flagged:a|b|c". - // --> - public boolean runAutomaticPlayerSwitches(ScriptPath path) { if (!path.switches.containsKey("flagged") && !path.switches.containsKey("permission")) { return true; } BukkitScriptEntryData data = (BukkitScriptEntryData) getScriptEntryData(); if (!data.hasPlayer()) { - return true; + return false; } if (!runFlaggedCheck(path, data.getPlayer())) { return false; @@ -686,6 +694,14 @@ public boolean tryItem(ItemTag item, String comparedto) { return false; } comparedto = CoreUtilities.toLowerCase(comparedto); + if (comparedto.startsWith("item_flagged:")) { + for (String flag : CoreUtilities.split(comparedto.substring("item_flagged:".length()), '|')) { + if (!item.getFlagTracker().hasFlag(flag)) { + return false; + } + } + return true; + } if (comparedto.equals("item")) { return true; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBuiltScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBuiltScriptEvent.java index f3d44bbf06..a931444737 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBuiltScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBuiltScriptEvent.java @@ -22,7 +22,7 @@ public class BlockBuiltScriptEvent extends BukkitScriptEvent implements Listener // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBurnsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBurnsScriptEvent.java index 51a1d4f677..d720c268b3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBurnsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockBurnsScriptEvent.java @@ -19,7 +19,7 @@ public class BlockBurnsScriptEvent extends BukkitScriptEvent implements Listener // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockDispensesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockDispensesScriptEvent.java index 41db7b0b39..feaddf442e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockDispensesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockDispensesScriptEvent.java @@ -25,7 +25,7 @@ public class BlockDispensesScriptEvent extends BukkitScriptEvent implements List // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockExplodesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockExplodesScriptEvent.java index 97187ed9ef..53166c626c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockExplodesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockExplodesScriptEvent.java @@ -26,7 +26,7 @@ public class BlockExplodesScriptEvent extends BukkitScriptEvent implements Liste // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFadesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFadesScriptEvent.java index b8ab65d4e1..9acba46998 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFadesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFadesScriptEvent.java @@ -19,7 +19,7 @@ public class BlockFadesScriptEvent extends BukkitScriptEvent implements Listener // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFallsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFallsScriptEvent.java index 8263a5cd05..2de06a7978 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFallsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFallsScriptEvent.java @@ -20,7 +20,7 @@ public class BlockFallsScriptEvent extends BukkitScriptEvent implements Listener // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFormsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFormsScriptEvent.java index 96afd9146c..84dcccd5c7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFormsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockFormsScriptEvent.java @@ -19,7 +19,7 @@ public class BlockFormsScriptEvent extends BukkitScriptEvent implements Listener // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockGrowsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockGrowsScriptEvent.java index efda4b8ae8..013d91b559 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockGrowsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockGrowsScriptEvent.java @@ -21,7 +21,7 @@ public class BlockGrowsScriptEvent extends BukkitScriptEvent implements Listener // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch from: to only process the event if the material started at a specific age. // @Switch to: to only process the event if the material ended at a specific age. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockIgnitesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockIgnitesScriptEvent.java index 2eb77c6e38..9b7c3d7008 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockIgnitesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockIgnitesScriptEvent.java @@ -20,7 +20,7 @@ public class BlockIgnitesScriptEvent extends BukkitScriptEvent implements Listen // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch cause: to only process the event when it came from a specified cause. // // @Cancellable true diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockPhysicsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockPhysicsScriptEvent.java index 92c8a5cc85..82d8ab8d0c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockPhysicsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockPhysicsScriptEvent.java @@ -20,7 +20,7 @@ public class BlockPhysicsScriptEvent extends BukkitScriptEvent implements Listen // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Warning This event may fire very rapidly. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockSpreadsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockSpreadsScriptEvent.java index a7acacf6ca..0af66ad70f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockSpreadsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockSpreadsScriptEvent.java @@ -19,7 +19,7 @@ public class BlockSpreadsScriptEvent extends BukkitScriptEvent implements Listen // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BrewingStandFueledScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BrewingStandFueledScriptEvent.java index bb39b49bd8..bf566b22fc 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BrewingStandFueledScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BrewingStandFueledScriptEvent.java @@ -19,7 +19,7 @@ public class BrewingStandFueledScriptEvent extends BukkitScriptEvent implements // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BrewsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BrewsScriptEvent.java index 4a60c014a4..f78ab31f10 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/BrewsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/BrewsScriptEvent.java @@ -18,7 +18,7 @@ public class BrewsScriptEvent extends BukkitScriptEvent implements Listener { // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/CauldronLevelChangeScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/CauldronLevelChangeScriptEvent.java index e7893fa0be..c620f4cd36 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/CauldronLevelChangeScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/CauldronLevelChangeScriptEvent.java @@ -21,7 +21,7 @@ public class CauldronLevelChangeScriptEvent extends BukkitScriptEvent implements // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch cause: to only process the event when it came from a specified cause. // // @Cancellable true diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceBurnsItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceBurnsItemScriptEvent.java index a77fc63fe2..1ebb91e00b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceBurnsItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceBurnsItemScriptEvent.java @@ -21,7 +21,7 @@ public class FurnaceBurnsItemScriptEvent extends BukkitScriptEvent implements Li // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceSmeltsItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceSmeltsItemScriptEvent.java index 68fe584312..07b32b120d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceSmeltsItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceSmeltsItemScriptEvent.java @@ -21,7 +21,7 @@ public class FurnaceSmeltsItemScriptEvent extends BukkitScriptEvent implements L // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a furnace smelts an item. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/LeafDecaysScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/LeafDecaysScriptEvent.java index 896aad511b..fe90c04603 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/LeafDecaysScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/LeafDecaysScriptEvent.java @@ -19,7 +19,7 @@ public class LeafDecaysScriptEvent extends BukkitScriptEvent implements Listener // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/LiquidSpreadScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/LiquidSpreadScriptEvent.java index 95d8a17659..79cc9d2b38 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/LiquidSpreadScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/LiquidSpreadScriptEvent.java @@ -21,7 +21,7 @@ public class LiquidSpreadScriptEvent extends BukkitScriptEvent implements Listen // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/NoteBlockPlaysNoteScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/NoteBlockPlaysNoteScriptEvent.java index 635e04a020..3f94ae38e0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/NoteBlockPlaysNoteScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/NoteBlockPlaysNoteScriptEvent.java @@ -19,7 +19,7 @@ public class NoteBlockPlaysNoteScriptEvent extends BukkitScriptEvent implements // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch instrument: to only process the event if a specific instrument was played. // // @Cancellable true diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/PistonExtendsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/PistonExtendsScriptEvent.java index e8f7568581..c67cd000fb 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/PistonExtendsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/PistonExtendsScriptEvent.java @@ -22,7 +22,7 @@ public class PistonExtendsScriptEvent extends BukkitScriptEvent implements Liste // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/PistonRetractsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/PistonRetractsScriptEvent.java index 44215141af..946bb7d6a9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/PistonRetractsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/PistonRetractsScriptEvent.java @@ -22,7 +22,7 @@ public class PistonRetractsScriptEvent extends BukkitScriptEvent implements List // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/RedstoneScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/RedstoneScriptEvent.java index 0c4b16e596..a0745b60a9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/RedstoneScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/RedstoneScriptEvent.java @@ -18,7 +18,7 @@ public class RedstoneScriptEvent extends BukkitScriptEvent implements Listener { // // @Group Block // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Warning This event fires very very rapidly! // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/CreeperPoweredScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/CreeperPoweredScriptEvent.java index bc59c17d83..78d874b617 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/CreeperPoweredScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/CreeperPoweredScriptEvent.java @@ -19,7 +19,7 @@ public class CreeperPoweredScriptEvent extends BukkitScriptEvent implements List // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/DragonPhaseChangeScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/DragonPhaseChangeScriptEvent.java index 4145210d80..225c0df8fc 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/DragonPhaseChangeScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/DragonPhaseChangeScriptEvent.java @@ -20,7 +20,7 @@ public class DragonPhaseChangeScriptEvent extends BukkitScriptEvent implements L // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch from: to only process the event if the dragon was previously in the specified phase. // @Switch to: to only process the event if the dragon is changing to the specified phase. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityAirLevelChangeScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityAirLevelChangeScriptEvent.java index 14084d3d72..d867ded3ae 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityAirLevelChangeScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityAirLevelChangeScriptEvent.java @@ -23,7 +23,7 @@ public class EntityAirLevelChangeScriptEvent extends BukkitScriptEvent implement // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreaksHangingScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreaksHangingScriptEvent.java index 41dfa27437..6aab4b591a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreaksHangingScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreaksHangingScriptEvent.java @@ -29,7 +29,7 @@ public class EntityBreaksHangingScriptEvent extends BukkitScriptEvent implements // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java index d37038e6bb..fe88604b51 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java @@ -22,7 +22,7 @@ public class EntityBreedScriptEvent extends BukkitScriptEvent implements Listene // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityChangesBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityChangesBlockScriptEvent.java index 234e0f0174..d7c0385e68 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityChangesBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityChangesBlockScriptEvent.java @@ -26,7 +26,7 @@ public class EntityChangesBlockScriptEvent extends BukkitScriptEvent implements // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCombustsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCombustsScriptEvent.java index be9d4f80a9..461608a390 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCombustsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCombustsScriptEvent.java @@ -26,7 +26,7 @@ public class EntityCombustsScriptEvent extends BukkitScriptEvent implements List // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCreatePortalScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCreatePortalScriptEvent.java index 0fc1aedcb5..b2f72df8ec 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCreatePortalScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityCreatePortalScriptEvent.java @@ -24,7 +24,7 @@ public class EntityCreatePortalScriptEvent extends BukkitScriptEvent implements // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java index 1c2c8fee6a..1fefa3dc4f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDamagedScriptEvent.java @@ -42,7 +42,7 @@ public class EntityDamagedScriptEvent extends BukkitScriptEvent implements Liste // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Switch with: to only process the event when the item used to cause damage (in the damager's hand) is a specified item. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDeathScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDeathScriptEvent.java index e52735faeb..d9ed0c9d56 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDeathScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDeathScriptEvent.java @@ -35,7 +35,7 @@ public class EntityDeathScriptEvent extends BukkitScriptEvent implements Listene // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch by: to only process the event if the killer is of a specified entity type. // @Switch cause: to only process the event if it was caused by a specific damage cause. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDespawnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDespawnScriptEvent.java index ecb20bcd22..27ea7da262 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDespawnScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDespawnScriptEvent.java @@ -21,7 +21,7 @@ public class EntityDespawnScriptEvent extends BukkitScriptEvent { // // @Warning this event fires very rapidly. // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch cause: to only process the event when it came from a specified cause. // // @Triggers when an entity despawns permanently from the world. May fire repeatedly for one entity. diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityEntersPortalScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityEntersPortalScriptEvent.java index effe92b9a5..722bbc319c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityEntersPortalScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityEntersPortalScriptEvent.java @@ -21,7 +21,7 @@ public class EntityEntersPortalScriptEvent extends BukkitScriptEvent implements // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when an entity enters a portal. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityEntersVehicleScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityEntersVehicleScriptEvent.java index 0f0d9bf58e..4e4166f566 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityEntersVehicleScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityEntersVehicleScriptEvent.java @@ -25,7 +25,7 @@ public class EntityEntersVehicleScriptEvent extends BukkitScriptEvent implements // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExitsPortalScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExitsPortalScriptEvent.java index 48ebab8ea0..3cef466d6d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExitsPortalScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExitsPortalScriptEvent.java @@ -21,7 +21,7 @@ public class EntityExitsPortalScriptEvent extends BukkitScriptEvent implements L // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when an entity exits a portal. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExitsVehicleScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExitsVehicleScriptEvent.java index 07ae5fd5a0..016f42eadb 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExitsVehicleScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExitsVehicleScriptEvent.java @@ -22,7 +22,7 @@ public class EntityExitsVehicleScriptEvent extends BukkitScriptEvent implements // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplodesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplodesScriptEvent.java index fd328aed31..6f752b2722 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplodesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplodesScriptEvent.java @@ -26,7 +26,7 @@ public class EntityExplodesScriptEvent extends BukkitScriptEvent implements List // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java index 03b68c2d2a..c7d7179e54 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityExplosionPrimesScriptEvent.java @@ -21,7 +21,7 @@ public class EntityExplosionPrimesScriptEvent extends BukkitScriptEvent implemen // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java index 7a70b99612..faf224798d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java @@ -21,7 +21,7 @@ public class EntityFoodLevelChangeScriptEvent extends BukkitScriptEvent implemen // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityFormsBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityFormsBlockScriptEvent.java index cf473793bd..6cbae471b7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityFormsBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityFormsBlockScriptEvent.java @@ -24,7 +24,7 @@ public class EntityFormsBlockScriptEvent extends BukkitScriptEvent implements Li // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityGlideScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityGlideScriptEvent.java index d8bcdd4a99..64781ef622 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityGlideScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityGlideScriptEvent.java @@ -23,7 +23,7 @@ public class EntityGlideScriptEvent extends BukkitScriptEvent implements Listene // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityHealsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityHealsScriptEvent.java index 8cffcb662f..77ca086172 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityHealsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityHealsScriptEvent.java @@ -22,7 +22,7 @@ public class EntityHealsScriptEvent extends BukkitScriptEvent implements Listene // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityInteractScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityInteractScriptEvent.java index 62710200f2..67dccbbdcf 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityInteractScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityInteractScriptEvent.java @@ -24,7 +24,7 @@ public class EntityInteractScriptEvent extends BukkitScriptEvent implements List // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityKilledScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityKilledScriptEvent.java index 5fa90228ac..d806d011dc 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityKilledScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityKilledScriptEvent.java @@ -38,7 +38,7 @@ public class EntityKilledScriptEvent extends BukkitScriptEvent implements Listen // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityPicksUpItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityPicksUpItemScriptEvent.java index 27910ba09d..23fc2d0d0d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityPicksUpItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityPicksUpItemScriptEvent.java @@ -32,7 +32,7 @@ public class EntityPicksUpItemScriptEvent extends BukkitScriptEvent implements L // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityPotionEffectScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityPotionEffectScriptEvent.java index ea631800f6..18c29fdb86 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityPotionEffectScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityPotionEffectScriptEvent.java @@ -25,7 +25,7 @@ public class EntityPotionEffectScriptEvent extends BukkitScriptEvent implements // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch cause: to only process the event when it came from a specified cause. // @Switch effect: to only process the event when a specified potion effect is applied. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityResurrectScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityResurrectScriptEvent.java index 2c427ab363..3c11c3e403 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityResurrectScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityResurrectScriptEvent.java @@ -20,7 +20,7 @@ public class EntityResurrectScriptEvent extends BukkitScriptEvent implements Lis // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityShootsBowEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityShootsBowEvent.java index e08da403ec..f67581e28d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityShootsBowEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityShootsBowEvent.java @@ -34,7 +34,7 @@ public class EntityShootsBowEvent extends BukkitScriptEvent implements Listener // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java index 6a8995ac65..9928630834 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java @@ -27,7 +27,7 @@ public class EntitySpawnScriptEvent extends BukkitScriptEvent implements Listene // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnerSpawnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnerSpawnScriptEvent.java index f731cac4a5..833c09c744 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnerSpawnScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnerSpawnScriptEvent.java @@ -22,7 +22,7 @@ public class EntitySpawnerSpawnScriptEvent extends BukkitScriptEvent implements // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySwimScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySwimScriptEvent.java index a3c39e87c6..3d323c8aad 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySwimScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySwimScriptEvent.java @@ -23,7 +23,7 @@ public class EntitySwimScriptEvent extends BukkitScriptEvent implements Listener // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTamesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTamesScriptEvent.java index 63a6eecc60..8ef182bf89 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTamesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTamesScriptEvent.java @@ -23,7 +23,7 @@ public class EntityTamesScriptEvent extends BukkitScriptEvent implements Listene // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java index de462aa104..7cf140a4db 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java @@ -23,7 +23,7 @@ public class EntityTargetsScriptEvent extends BukkitScriptEvent implements Liste // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTeleportScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTeleportScriptEvent.java index 0be705f24f..bf0fdb1215 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTeleportScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTeleportScriptEvent.java @@ -25,7 +25,7 @@ public class EntityTeleportScriptEvent extends BukkitScriptEvent implements List // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch cause: to only process the event when it came from a specified cause. // // @Triggers when an entity teleports. diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTransformScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTransformScriptEvent.java index becd5f2255..e824faf61e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTransformScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTransformScriptEvent.java @@ -21,7 +21,7 @@ public class EntityTransformScriptEvent extends BukkitScriptEvent implements Lis // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch because: to only process the event if a specific reason caused the transformation. // // @Cancellable true diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityUnleashedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityUnleashedScriptEvent.java index 2a7ac77941..a3d74079ab 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityUnleashedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityUnleashedScriptEvent.java @@ -20,7 +20,7 @@ public class EntityUnleashedScriptEvent extends BukkitScriptEvent implements Lis // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when an entity is unleashed. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/ExperienceBottleBreaksScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/ExperienceBottleBreaksScriptEvent.java index 02cb5d535b..7332a4e2a2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/ExperienceBottleBreaksScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/ExperienceBottleBreaksScriptEvent.java @@ -19,7 +19,7 @@ public class ExperienceBottleBreaksScriptEvent extends BukkitScriptEvent impleme // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/FireworkBurstsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/FireworkBurstsScriptEvent.java index fc92d28038..ddfe543953 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/FireworkBurstsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/FireworkBurstsScriptEvent.java @@ -21,7 +21,7 @@ public class FireworkBurstsScriptEvent extends BukkitScriptEvent implements List // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/HangingBreaksScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/HangingBreaksScriptEvent.java index 599dbf772c..ed12d966af 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/HangingBreaksScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/HangingBreaksScriptEvent.java @@ -24,7 +24,7 @@ public class HangingBreaksScriptEvent extends BukkitScriptEvent implements Liste // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java index 89b8211a29..3d4df1ac7e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java @@ -21,7 +21,7 @@ public class HorseJumpsScriptEvent extends BukkitScriptEvent implements Listener // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/PigZappedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/PigZappedScriptEvent.java index e8655c2b27..00e928955b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/PigZappedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/PigZappedScriptEvent.java @@ -18,7 +18,7 @@ public class PigZappedScriptEvent extends BukkitScriptEvent implements Listener // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileHitsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileHitsScriptEvent.java index 5044f403d8..6f4ed06812 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileHitsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileHitsScriptEvent.java @@ -25,7 +25,7 @@ public class ProjectileHitsScriptEvent extends BukkitScriptEvent implements List // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a projectile hits a block. // @@ -48,7 +48,7 @@ public class ProjectileHitsScriptEvent extends BukkitScriptEvent implements List // // @Regex ^on [^\s]+ shoots [^\s]+$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a projectile shot by an entity hits a block. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileLaunchedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileLaunchedScriptEvent.java index 9e6bbc5088..c109c386b8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileLaunchedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileLaunchedScriptEvent.java @@ -20,7 +20,7 @@ public class ProjectileLaunchedScriptEvent extends BukkitScriptEvent implements // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/SheepDyedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/SheepDyedScriptEvent.java index 87ee866611..0906afea78 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/SheepDyedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/SheepDyedScriptEvent.java @@ -20,7 +20,7 @@ public class SheepDyedScriptEvent extends BukkitScriptEvent implements Listener // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/SheepRegrowsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/SheepRegrowsScriptEvent.java index 3e1a11d770..28261bc58d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/SheepRegrowsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/SheepRegrowsScriptEvent.java @@ -18,7 +18,7 @@ public class SheepRegrowsScriptEvent extends BukkitScriptEvent implements Listen // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/SlimeSplitsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/SlimeSplitsScriptEvent.java index 3bd7cc26a7..50d5f6bc12 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/SlimeSplitsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/SlimeSplitsScriptEvent.java @@ -18,7 +18,7 @@ public class SlimeSplitsScriptEvent extends BukkitScriptEvent implements Listene // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerAcquiresTradeScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerAcquiresTradeScriptEvent.java index 2c5070747c..58ca5507f0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerAcquiresTradeScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerAcquiresTradeScriptEvent.java @@ -18,7 +18,7 @@ public class VillagerAcquiresTradeScriptEvent extends BukkitScriptEvent implemen // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerChangesProfessionScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerChangesProfessionScriptEvent.java index 653506d6ec..0e67ddc331 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerChangesProfessionScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerChangesProfessionScriptEvent.java @@ -19,7 +19,7 @@ public class VillagerChangesProfessionScriptEvent extends BukkitScriptEvent impl // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerReplenishesTradeScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerReplenishesTradeScriptEvent.java index b0273c3a09..dd31d03681 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerReplenishesTradeScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/VillagerReplenishesTradeScriptEvent.java @@ -19,7 +19,7 @@ public class VillagerReplenishesTradeScriptEvent extends BukkitScriptEvent imple // // @Group Entity // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/item/InventoryPicksUpItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/item/InventoryPicksUpItemScriptEvent.java index f1e30dde0b..5b9294ce63 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/item/InventoryPicksUpItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/item/InventoryPicksUpItemScriptEvent.java @@ -22,7 +22,7 @@ public class InventoryPicksUpItemScriptEvent extends BukkitScriptEvent implement // // @Group Item // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemDespawnsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemDespawnsScriptEvent.java index 8b0c0ab49d..159fc1b611 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemDespawnsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemDespawnsScriptEvent.java @@ -21,7 +21,7 @@ public class ItemDespawnsScriptEvent extends BukkitScriptEvent implements Listen // // @Group Item // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemEnchantedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemEnchantedScriptEvent.java index 92ddb9da35..1a5a60c8e9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemEnchantedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemEnchantedScriptEvent.java @@ -31,7 +31,7 @@ public class ItemEnchantedScriptEvent extends BukkitScriptEvent implements Liste // // @Group Item // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMergesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMergesScriptEvent.java index 9561b664b4..af7802605d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMergesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMergesScriptEvent.java @@ -21,7 +21,7 @@ public class ItemMergesScriptEvent extends BukkitScriptEvent implements Listener // // @Group Item // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMoveScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMoveScriptEvent.java index 633e20fb54..e7120c46f2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMoveScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMoveScriptEvent.java @@ -22,7 +22,7 @@ public class ItemMoveScriptEvent extends BukkitScriptEvent implements Listener { // // @Regex ^on [^\s]+ moves from [^\s]+( to [^\s]+)?$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemSpawnsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemSpawnsScriptEvent.java index f7a19091c1..dc0c031fc0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemSpawnsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemSpawnsScriptEvent.java @@ -21,7 +21,7 @@ public class ItemSpawnsScriptEvent extends BukkitScriptEvent implements Listener // // @Group Item // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCNavigationScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCNavigationScriptEvent.java index 3158bf2b76..8a1b37cb5d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCNavigationScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCNavigationScriptEvent.java @@ -20,7 +20,7 @@ public class NPCNavigationScriptEvent extends BukkitScriptEvent implements Liste // // @Group NPC // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Regex ^on npc (begins|completes|cancels) navigation$ // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCSpawnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCSpawnScriptEvent.java index 213f544aa8..95c391b335 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCSpawnScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCSpawnScriptEvent.java @@ -20,7 +20,7 @@ public class NPCSpawnScriptEvent extends BukkitScriptEvent implements Listener { // // @Group NPC // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCStuckScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCStuckScriptEvent.java index 8f80b62e98..cc835f4156 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCStuckScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCStuckScriptEvent.java @@ -22,7 +22,7 @@ public class NPCStuckScriptEvent extends BukkitScriptEvent implements Listener { // // @Group NPC // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when an NPC's navigator is stuck. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/BiomeEnterExitScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/BiomeEnterExitScriptEvent.java index 897e56787b..9d42200a0a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/BiomeEnterExitScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/BiomeEnterExitScriptEvent.java @@ -26,7 +26,7 @@ public class BiomeEnterExitScriptEvent extends BukkitScriptEvent implements List // // @Regex ^on player (enters|exits) [^\s]+$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Warning Cancelling this event will fire a similar event immediately after. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java index 17b819de57..d7ae7aecd3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/ChatScriptEvent.java @@ -32,7 +32,7 @@ public class ChatScriptEvent extends BukkitScriptEvent implements Listener { // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/HotbarScrollScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/HotbarScrollScriptEvent.java index bc9b0e1f4c..2cabd615dd 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/HotbarScrollScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/HotbarScrollScriptEvent.java @@ -22,7 +22,7 @@ public class HotbarScrollScriptEvent extends BukkitScriptEvent implements Listen // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch item: to only process the event when the player is going to hold a specified item. // // @Cancellable true diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerAnimatesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerAnimatesScriptEvent.java index edd3951d02..51d54f647c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerAnimatesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerAnimatesScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerAnimatesScriptEvent extends BukkitScriptEvent implements List // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java index 5e650434bd..174feae67d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java @@ -28,7 +28,7 @@ public class PlayerBreaksBlockScriptEvent extends BukkitScriptEvent implements L // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch with: to only process the event when the player is breaking the block with a specified item. // // @Cancellable true diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksItemScriptEvent.java index 10d84f2fb8..c5df0811ca 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksItemScriptEvent.java @@ -27,7 +27,7 @@ public class PlayerBreaksItemScriptEvent extends BukkitScriptEvent implements Li // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesSignScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesSignScriptEvent.java index d36a547c5c..a9837a6cb3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesSignScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesSignScriptEvent.java @@ -25,7 +25,7 @@ public class PlayerChangesSignScriptEvent extends BukkitScriptEvent implements L // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesWorldScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesWorldScriptEvent.java index 477d058014..213ad4284d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesWorldScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesWorldScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerChangesWorldScriptEvent extends BukkitScriptEvent implements // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player moves to a different world. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesXPScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesXPScriptEvent.java index d1af4f44bf..67a43230a9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesXPScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerChangesXPScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerChangesXPScriptEvent extends BukkitScriptEvent implements Lis // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksBlockScriptEvent.java index 50a92baa62..6969e77235 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksBlockScriptEvent.java @@ -35,7 +35,7 @@ public class PlayerClicksBlockScriptEvent extends BukkitScriptEvent implements L // // @Switch with: to only process the event if a specified item was held. // @Switch using:hand/off_hand/either_hand to only process the event if the specified hand was used to click. - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player clicks on a block or in the air. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksInInventoryScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksInInventoryScriptEvent.java index 17cbb947b5..c8ab46b198 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksInInventoryScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClicksInInventoryScriptEvent.java @@ -78,7 +78,9 @@ public class PlayerClicksInInventoryScriptEvent extends BukkitScriptEvent implem // @Group Player // // @Switch with: to only process the event if a specified cursor item was used. - // @Switch in_area: to only process the event if it occurred within a specified area. + // @Switch in_area: replaces the default 'in:' for this event. + // + // @Location true // // @Triggers when a player clicks in an inventory. Note that you likely will also want to listen to <@link event player drags in inventory>. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClosesInvScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClosesInvScriptEvent.java index 123e3cbb5d..fa7955ae5b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClosesInvScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerClosesInvScriptEvent.java @@ -23,7 +23,7 @@ public class PlayerClosesInvScriptEvent extends BukkitScriptEvent implements Lis // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player closes an inventory. (EG, chests, not the player's main inventory.) // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerConsumesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerConsumesScriptEvent.java index fa76b90192..74daeae52f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerConsumesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerConsumesScriptEvent.java @@ -24,7 +24,7 @@ public class PlayerConsumesScriptEvent extends BukkitScriptEvent implements List // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDamagesBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDamagesBlockScriptEvent.java index 6459656075..057f160b49 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDamagesBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDamagesBlockScriptEvent.java @@ -22,7 +22,7 @@ public class PlayerDamagesBlockScriptEvent extends BukkitScriptEvent implements // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch with: to only process the event when the player is hitting the block with a specified item. // // @Cancellable true diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java index f315354c12..e04cfe98db 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java @@ -29,7 +29,9 @@ public class PlayerDragsInInvScriptEvent extends BukkitScriptEvent implements Li // // @Group Player // - // @Switch in_area: to only process the event if it occurred within a specified area. + // @Switch in_area: replaces the default 'in:' for this event. + // + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java index fd6ebc8080..739d7f4547 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDropsItemScriptEvent.java @@ -23,7 +23,7 @@ public class PlayerDropsItemScriptEvent extends BukkitScriptEvent implements Lis // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java index 5b1312f25f..9c17b68acf 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java @@ -23,7 +23,7 @@ public class PlayerEmptiesBucketScriptEvent extends BukkitScriptEvent implements // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player empties a bucket. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEntersBedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEntersBedScriptEvent.java index bc736fa6df..df06cecc4e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEntersBedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEntersBedScriptEvent.java @@ -20,7 +20,7 @@ public class PlayerEntersBedScriptEvent extends BukkitScriptEvent implements Lis // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java index bd688fca16..83c1182938 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java @@ -23,7 +23,7 @@ public class PlayerFillsBucketScriptEvent extends BukkitScriptEvent implements L // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player fills a bucket. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java index 868c1dfe95..4b4f2e7a2e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFishesScriptEvent.java @@ -26,7 +26,7 @@ public class PlayerFishesScriptEvent extends BukkitScriptEvent implements Listen // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFlyingScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFlyingScriptEvent.java index 3aa857de87..584a6871f0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFlyingScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFlyingScriptEvent.java @@ -22,7 +22,7 @@ public class PlayerFlyingScriptEvent extends BukkitScriptEvent implements Listen // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerHoldsShieldEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerHoldsShieldEvent.java index e4eaf488c2..8f8cac0068 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerHoldsShieldEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerHoldsShieldEvent.java @@ -30,7 +30,7 @@ public class PlayerHoldsShieldEvent extends BukkitScriptEvent implements Listene // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player starts or stops holding up a shield. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java index 9b83c15aea..cec59171c3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java @@ -27,7 +27,7 @@ public class PlayerItemTakesDamageScriptEvent extends BukkitScriptEvent implemen // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java index 0da00522ad..38970a36e8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerJumpScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerJumpScriptEvent extends BukkitScriptEvent implements Listener // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player jumps. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeashesEntityScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeashesEntityScriptEvent.java index f57a82c513..031be2a493 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeashesEntityScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeashesEntityScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerLeashesEntityScriptEvent extends BukkitScriptEvent implements // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeavesBedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeavesBedScriptEvent.java index fe45384b84..9d335add0e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeavesBedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLeavesBedScriptEvent.java @@ -20,7 +20,7 @@ public class PlayerLeavesBedScriptEvent extends BukkitScriptEvent implements Lis // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLevelsUpScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLevelsUpScriptEvent.java index d82a2b3641..fb34b7272c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLevelsUpScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerLevelsUpScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerLevelsUpScriptEvent extends BukkitScriptEvent implements List // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player levels up. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerMendsItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerMendsItemScriptEvent.java index 8c903b7547..ac2842fd2e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerMendsItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerMendsItemScriptEvent.java @@ -24,7 +24,7 @@ public class PlayerMendsItemScriptEvent extends BukkitScriptEvent implements Lis // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerOpensInvScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerOpensInvScriptEvent.java index 0d3e198797..ccdb01f2ae 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerOpensInvScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerOpensInvScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerOpensInvScriptEvent extends BukkitScriptEvent implements List // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player opens an inventory. (EG, chests, not the player's main inventory.) // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesBlockScriptEvent.java index 53aead16d9..1ad2f44ff5 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesBlockScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerPlacesBlockScriptEvent extends BukkitScriptEvent implements L // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch using: to only process the event if the player is using the specified hand type (HAND or OFF_HAND). // // @Cancellable true diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesHangingScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesHangingScriptEvent.java index 011e07bf32..db7838be32 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesHangingScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerPlacesHangingScriptEvent.java @@ -23,7 +23,7 @@ public class PlayerPlacesHangingScriptEvent extends BukkitScriptEvent implements // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java index 969efd87ab..41a76c2506 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java @@ -23,7 +23,7 @@ public class PlayerRightClicksEntityScriptEvent extends BukkitScriptEvent implem // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch with: to only process the event when the player is holding a specified item. // // @Warning this event may in some cases double-fire, requiring usage of the 'ratelimit' command (like 'ratelimit 1t') to prevent doubling actions. diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRiptideScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRiptideScriptEvent.java index a8c17c8f90..cfbbd8dc0e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRiptideScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRiptideScriptEvent.java @@ -22,7 +22,7 @@ public class PlayerRiptideScriptEvent extends BukkitScriptEvent implements Liste // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player activates the riptide effect. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerShearsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerShearsScriptEvent.java index 4ed28921bf..49a5a72949 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerShearsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerShearsScriptEvent.java @@ -24,7 +24,7 @@ public class PlayerShearsScriptEvent extends BukkitScriptEvent implements Listen // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSneakScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSneakScriptEvent.java index 0fcfdd6c41..b240f9d3f9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSneakScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSneakScriptEvent.java @@ -22,7 +22,7 @@ public class PlayerSneakScriptEvent extends BukkitScriptEvent implements Listene // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSprintScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSprintScriptEvent.java index b378d23d2c..73703ef619 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSprintScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSprintScriptEvent.java @@ -22,7 +22,7 @@ public class PlayerSprintScriptEvent extends BukkitScriptEvent implements Listen // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStandsOnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStandsOnScriptEvent.java index 5eb00c4586..26bc2035a0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStandsOnScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStandsOnScriptEvent.java @@ -23,7 +23,7 @@ public class PlayerStandsOnScriptEvent extends BukkitScriptEvent implements List // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSteersEntityScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSteersEntityScriptEvent.java index 4bd8562e60..8c2121f31e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSteersEntityScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerSteersEntityScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerSteersEntityScriptEvent extends BukkitScriptEvent { // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStepsOnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStepsOnScriptEvent.java index d3b0fc89f9..27197d97e2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStepsOnScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerStepsOnScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerStepsOnScriptEvent extends BukkitScriptEvent implements Liste // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Warning This event may fire very rapidly. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java index cb48c16575..9f8c010b45 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromFurnaceScriptEvent.java @@ -24,7 +24,7 @@ public class PlayerTakesFromFurnaceScriptEvent extends BukkitScriptEvent impleme // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player takes an item from a furnace. // @Context diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromLecternScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromLecternScriptEvent.java index 71f779b134..3704ccdb14 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromLecternScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerTakesFromLecternScriptEvent.java @@ -24,7 +24,7 @@ public class PlayerTakesFromLecternScriptEvent extends BukkitScriptEvent impleme // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerThrowsEggScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerThrowsEggScriptEvent.java index 6ef6665b65..f4c715ccb2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerThrowsEggScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerThrowsEggScriptEvent.java @@ -22,7 +22,7 @@ public class PlayerThrowsEggScriptEvent extends BukkitScriptEvent implements Lis // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerUsesPortalScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerUsesPortalScriptEvent.java index 3aae054601..05e2652aa6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerUsesPortalScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerUsesPortalScriptEvent.java @@ -20,7 +20,7 @@ public class PlayerUsesPortalScriptEvent extends BukkitScriptEvent implements Li // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player enters a portal. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalkScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalkScriptEvent.java index 374abb3f0a..424bdf9ef7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalkScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalkScriptEvent.java @@ -21,7 +21,7 @@ public class PlayerWalkScriptEvent extends BukkitScriptEvent implements Listener // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Warning This event fires very very rapidly! // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalksOverScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalksOverScriptEvent.java index 8c58e26b5f..cfc093761a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalksOverScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerWalksOverScriptEvent.java @@ -24,7 +24,7 @@ public class PlayerWalksOverScriptEvent extends BukkitScriptEvent implements Lis // // @Group Player // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/server/CommandScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/server/CommandScriptEvent.java index d374640ffc..89ef0f2463 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/server/CommandScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/server/CommandScriptEvent.java @@ -33,7 +33,7 @@ public class CommandScriptEvent extends BukkitScriptEvent implements Listener { // // @Group Server // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a player, console, or command block/minecart runs a Bukkit command. This happens before // any code of established commands, allowing scripts to 'override' existing commands. diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCollidesBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCollidesBlockScriptEvent.java index 4d3c9320ef..6ecb1a7eed 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCollidesBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCollidesBlockScriptEvent.java @@ -22,7 +22,7 @@ public class VehicleCollidesBlockScriptEvent extends BukkitScriptEvent implement // // @Regex ^on [^\s]+ collides with [^\s]+$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Triggers when a vehicle collides with a block. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCollidesEntityScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCollidesEntityScriptEvent.java index 0abd680602..2b57811182 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCollidesEntityScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCollidesEntityScriptEvent.java @@ -24,7 +24,7 @@ public class VehicleCollidesEntityScriptEvent extends BukkitScriptEvent implemen // // @Regex ^on [^\s]+ collides with [^\s]+$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCreatedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCreatedScriptEvent.java index a306cae5cf..4a61663833 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCreatedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleCreatedScriptEvent.java @@ -19,7 +19,7 @@ public class VehicleCreatedScriptEvent extends BukkitScriptEvent implements List // // @Regex ^on [^\s]+ created$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleDamagedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleDamagedScriptEvent.java index b35bbc240e..ed4004068c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleDamagedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleDamagedScriptEvent.java @@ -25,7 +25,7 @@ public class VehicleDamagedScriptEvent extends BukkitScriptEvent implements List // // @Regex ^on [^\s]+ damages [^\s]+$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleDestroyedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleDestroyedScriptEvent.java index cbe383a185..09ba591f81 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleDestroyedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleDestroyedScriptEvent.java @@ -24,7 +24,7 @@ public class VehicleDestroyedScriptEvent extends BukkitScriptEvent implements Li // // @Regex ^on [^\s]+ destroys [^\s]+$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleMoveScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleMoveScriptEvent.java index 6c729427a9..5c8d3af627 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleMoveScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/vehicle/VehicleMoveScriptEvent.java @@ -19,7 +19,7 @@ public class VehicleMoveScriptEvent extends BukkitScriptEvent implements Listene // // @Regex ^on [^\s]+ moves$ // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Warning This event fires very very rapidly! // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/ChunkLoadScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/ChunkLoadScriptEvent.java index ea30f904eb..ef482df799 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/ChunkLoadScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/ChunkLoadScriptEvent.java @@ -19,7 +19,7 @@ public class ChunkLoadScriptEvent extends BukkitScriptEvent implements Listener // // @Group World // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Warning This event will fire *extremely* rapidly and often when using 'for the first time'. // When not using that, it will fire so rapidly that lag is almost guaranteed. Use with maximum caution. diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/ChunkUnloadScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/ChunkUnloadScriptEvent.java index 553aac71fb..2b0025e1d9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/ChunkUnloadScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/ChunkUnloadScriptEvent.java @@ -19,7 +19,7 @@ public class ChunkUnloadScriptEvent extends BukkitScriptEvent implements Listene // // @Group World // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Warning This event will fire *extremely* rapidly and often! // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/LightningStrikesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/LightningStrikesScriptEvent.java index 3de0c44586..75620b71be 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/LightningStrikesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/LightningStrikesScriptEvent.java @@ -20,7 +20,7 @@ public class LightningStrikesScriptEvent extends BukkitScriptEvent implements Li // // @Group World // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java index 25d337c235..9b421e978b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java @@ -23,7 +23,7 @@ public class LingeringPotionSplashScriptEvent extends BukkitScriptEvent implemen // // @Group World // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/LootGenerateScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/LootGenerateScriptEvent.java index bba1de6647..87e075186e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/LootGenerateScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/LootGenerateScriptEvent.java @@ -27,7 +27,7 @@ public class LootGenerateScriptEvent extends BukkitScriptEvent implements Listen // // @Group World // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // @Switch for: to only process the event if a certain inventory type is receiving loot (like 'for:chest'). // // @Cancellable true diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/PortalCreateScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/PortalCreateScriptEvent.java index a011c520c6..30a0677d69 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/PortalCreateScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/PortalCreateScriptEvent.java @@ -23,7 +23,7 @@ public class PortalCreateScriptEvent extends BukkitScriptEvent implements Listen // // @Group World // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/PotionSplashScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/PotionSplashScriptEvent.java index 67591f6a02..a8f5203430 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/PotionSplashScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/PotionSplashScriptEvent.java @@ -22,7 +22,7 @@ public class PotionSplashScriptEvent extends BukkitScriptEvent implements Listen // // @Group World // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true // diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/StructureGrowsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/StructureGrowsScriptEvent.java index 9d4b1beb9a..4bca783fc8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/StructureGrowsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/StructureGrowsScriptEvent.java @@ -27,7 +27,7 @@ public class StructureGrowsScriptEvent extends BukkitScriptEvent implements List // // @Group World // - // @Switch in: to only process the event if it occurred within a specified area. + // @Location true // // @Cancellable true //