Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-27 21:15:57 +01:00
Code Issues Projects Releases Wiki Activity

Ignore cancelled events in event abstraction.

Browse Source
This commit is contained in:
sk89q 2014-08-24 14:39:44 -07:00
parent f4700ded12
commit 4a3dac0aa4
1 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
View File

@ -128,12 +128,12 @@ public EventAbstractionListener(WorldGuardPlugin plugin) {
// Block break / place // Block break / place
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockBreak(BlockBreakEvent event) { public void onBlockBreak(BlockBreakEvent event) {
Events.fireToCancel(event, new BreakBlockEvent(event, create(event.getPlayer()), event.getBlock())); Events.fireToCancel(event, new BreakBlockEvent(event, create(event.getPlayer()), event.getBlock()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockPlace(BlockPlaceEvent event) { public void onBlockPlace(BlockPlaceEvent event) {
BlockState previousState = event.getBlockReplacedState(); BlockState previousState = event.getBlockReplacedState();
@ -142,13 +142,17 @@ public void onBlockPlace(BlockPlaceEvent event) {
Events.fireToCancel(event, new BreakBlockEvent(event, create(event.getPlayer()), previousState.getLocation(), previousState.getType())); Events.fireToCancel(event, new BreakBlockEvent(event, create(event.getPlayer()), previousState.getLocation(), previousState.getType()));
} }
if (!event.isCancelled()) {
ItemStack itemStack = new ItemStack(event.getBlockPlaced().getType(), 1); ItemStack itemStack = new ItemStack(event.getBlockPlaced().getType(), 1);
Events.fireToCancel(event, new UseItemEvent(event, create(event.getPlayer()), event.getPlayer().getWorld(), itemStack)); Events.fireToCancel(event, new UseItemEvent(event, create(event.getPlayer()), event.getPlayer().getWorld(), itemStack));
Events.fireToCancel(event, new PlaceBlockEvent(event, create(event.getPlayer()), event.getBlock()));
} }
@EventHandler if (!event.isCancelled()) {
Events.fireToCancel(event, new PlaceBlockEvent(event, create(event.getPlayer()), event.getBlock()));
}
}
@EventHandler(ignoreCancelled = true)
public void onBlockBurn(BlockBurnEvent event) { public void onBlockBurn(BlockBurnEvent event) {
Block target = event.getBlock(); Block target = event.getBlock();
@ -179,7 +183,7 @@ public void onBlockBurn(BlockBurnEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onStructureGrowEvent(StructureGrowEvent event) { public void onStructureGrowEvent(StructureGrowEvent event) {
List<Block> blockList = Lists.transform(event.getBlocks(), new BlockStateAsBlockFunction()); List<Block> blockList = Lists.transform(event.getBlocks(), new BlockStateAsBlockFunction());
Events.fireBulkEventToCancel(event, new PlaceBlockEvent(event, create(event.getPlayer()), event.getLocation().getWorld(), blockList, Material.AIR)); Events.fireBulkEventToCancel(event, new PlaceBlockEvent(event, create(event.getPlayer()), event.getLocation().getWorld(), blockList, Material.AIR));
@ -187,7 +191,7 @@ public void onStructureGrowEvent(StructureGrowEvent event) {
// TODO: Handle EntityCreatePortalEvent? // TODO: Handle EntityCreatePortalEvent?
@EventHandler @EventHandler(ignoreCancelled = true)
public void onEntityChangeBlock(EntityChangeBlockEvent event) { public void onEntityChangeBlock(EntityChangeBlockEvent event) {
Block block = event.getBlock(); Block block = event.getBlock();
Entity entity = event.getEntity(); Entity entity = event.getEntity();
@ -228,14 +232,14 @@ public void onEntityChangeBlock(EntityChangeBlockEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onEntityExplode(EntityExplodeEvent event) { public void onEntityExplode(EntityExplodeEvent event) {
Entity entity = event.getEntity(); Entity entity = event.getEntity();
Events.fireBulkEventToCancel(event, new BreakBlockEvent(event, create(entity), event.getLocation().getWorld(), event.blockList(), Material.AIR)); Events.fireBulkEventToCancel(event, new BreakBlockEvent(event, create(entity), event.getLocation().getWorld(), event.blockList(), Material.AIR));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockPistonRetract(BlockPistonRetractEvent event) { public void onBlockPistonRetract(BlockPistonRetractEvent event) {
if (event.isSticky()) { if (event.isSticky()) {
Cause cause = create(event.getBlock()); Cause cause = create(event.getBlock());
@ -244,7 +248,7 @@ public void onBlockPistonRetract(BlockPistonRetractEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockPistonExtend(BlockPistonExtendEvent event) { public void onBlockPistonExtend(BlockPistonExtendEvent event) {
// A hack for now // A hack for now
List<Block> blocks = new ArrayList<Block>(event.getBlocks()); List<Block> blocks = new ArrayList<Block>(event.getBlocks());
@ -261,7 +265,7 @@ public void onBlockPistonExtend(BlockPistonExtendEvent event) {
// Block external interaction // Block external interaction
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockDamage(BlockDamageEvent event) { public void onBlockDamage(BlockDamageEvent event) {
Block target = event.getBlock(); Block target = event.getBlock();
@ -272,7 +276,7 @@ public void onBlockDamage(BlockDamageEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onPlayerInteract(PlayerInteractEvent event) { public void onPlayerInteract(PlayerInteractEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
@Nullable ItemStack item = player.getItemInHand(); @Nullable ItemStack item = player.getItemInHand();
@ -330,12 +334,12 @@ public void onPlayerInteract(PlayerInteractEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onEntityInteract(org.bukkit.event.entity.EntityInteractEvent event) { public void onEntityInteract(org.bukkit.event.entity.EntityInteractEvent event) {
interactDebounce.debounce(event.getBlock(), event.getEntity(), event, new UseBlockEvent(event, create(event.getEntity()), event.getBlock())); interactDebounce.debounce(event.getBlock(), event.getEntity(), event, new UseBlockEvent(event, create(event.getEntity()), event.getBlock()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockIgnite(BlockIgniteEvent event) { public void onBlockIgnite(BlockIgniteEvent event) {
Block block = event.getBlock(); Block block = event.getBlock();
Material type = block.getType(); Material type = block.getType();
@ -355,17 +359,17 @@ public void onBlockIgnite(BlockIgniteEvent event) {
Events.fireToCancel(event, new PlaceBlockEvent(event, cause, block.getLocation(), Material.FIRE)); Events.fireToCancel(event, new PlaceBlockEvent(event, cause, block.getLocation(), Material.FIRE));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onSignChange(SignChangeEvent event) { public void onSignChange(SignChangeEvent event) {
Events.fireToCancel(event, new UseBlockEvent(event, create(event.getPlayer()), event.getBlock())); Events.fireToCancel(event, new UseBlockEvent(event, create(event.getPlayer()), event.getBlock()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBedEnter(PlayerBedEnterEvent event) { public void onBedEnter(PlayerBedEnterEvent event) {
Events.fireToCancel(event, new UseBlockEvent(event, create(event.getPlayer()), event.getBed())); Events.fireToCancel(event, new UseBlockEvent(event, create(event.getPlayer()), event.getBed()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) { public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
Block blockAffected = event.getBlockClicked().getRelative(event.getBlockFace()); Block blockAffected = event.getBlockClicked().getRelative(event.getBlockFace());
@ -379,7 +383,7 @@ public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onPlayerBucketFill(PlayerBucketFillEvent event) { public void onPlayerBucketFill(PlayerBucketFillEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
Block blockAffected = event.getBlockClicked().getRelative(event.getBlockFace()); Block blockAffected = event.getBlockClicked().getRelative(event.getBlockFace());
@ -398,7 +402,7 @@ public void onPlayerBucketFill(PlayerBucketFillEvent event) {
// Block self-interaction // Block self-interaction
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockFromTo(BlockFromToEvent event) { public void onBlockFromTo(BlockFromToEvent event) {
WorldConfiguration config = getWorldConfig(event.getBlock().getWorld()); WorldConfiguration config = getWorldConfig(event.getBlock().getWorld());
@ -440,17 +444,17 @@ public void onBlockFromTo(BlockFromToEvent event) {
// Entity break / place // Entity break / place
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@EventHandler @EventHandler(ignoreCancelled = true)
public void onCreatureSpawn(CreatureSpawnEvent event) { public void onCreatureSpawn(CreatureSpawnEvent event) {
Events.fireToCancel(event, new SpawnEntityEvent(event, Cause.unknown(), event.getEntity())); Events.fireToCancel(event, new SpawnEntityEvent(event, Cause.unknown(), event.getEntity()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onHangingPlace(HangingPlaceEvent event) { public void onHangingPlace(HangingPlaceEvent event) {
Events.fireToCancel(event, new SpawnEntityEvent(event, create(event.getPlayer()), event.getEntity())); Events.fireToCancel(event, new SpawnEntityEvent(event, create(event.getPlayer()), event.getEntity()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onHangingBreak(HangingBreakEvent event) { public void onHangingBreak(HangingBreakEvent event) {
if (event instanceof HangingBreakByEntityEvent) { if (event instanceof HangingBreakByEntityEvent) {
Events.fireToCancel(event, new DestroyEntityEvent(event, create(((HangingBreakByEntityEvent) event).getRemover()), event.getEntity())); Events.fireToCancel(event, new DestroyEntityEvent(event, create(((HangingBreakByEntityEvent) event).getRemover()), event.getEntity()));
@ -459,12 +463,12 @@ public void onHangingBreak(HangingBreakEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onVehicleDestroy(VehicleDestroyEvent event) { public void onVehicleDestroy(VehicleDestroyEvent event) {
Events.fireToCancel(event, new DestroyEntityEvent(event, create(event.getAttacker()), event.getVehicle())); Events.fireToCancel(event, new DestroyEntityEvent(event, create(event.getAttacker()), event.getVehicle()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockExp(BlockExpEvent event) { public void onBlockExp(BlockExpEvent event) {
if (event.getExpToDrop() > 0) { // Event is raised even where no XP is being dropped if (event.getExpToDrop() > 0) { // Event is raised even where no XP is being dropped
if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(event.getBlock()), event.getBlock().getLocation(), EntityType.EXPERIENCE_ORB))) { if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(event.getBlock()), event.getBlock().getLocation(), EntityType.EXPERIENCE_ORB))) {
@ -473,21 +477,21 @@ public void onBlockExp(BlockExpEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onPlayerFish(PlayerFishEvent event) { public void onPlayerFish(PlayerFishEvent event) {
if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(event.getPlayer(), event.getHook()), event.getCaught().getLocation(), EntityType.EXPERIENCE_ORB))) { if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(event.getPlayer(), event.getHook()), event.getCaught().getLocation(), EntityType.EXPERIENCE_ORB))) {
event.setExpToDrop(0); event.setExpToDrop(0);
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onExpBottle(ExpBottleEvent event) { public void onExpBottle(ExpBottleEvent event) {
if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(event.getEntity()), event.getEntity().getLocation(), EntityType.EXPERIENCE_ORB))) { if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(event.getEntity()), event.getEntity().getLocation(), EntityType.EXPERIENCE_ORB))) {
event.setExperience(0); event.setExperience(0);
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onEntityDeath(EntityDeathEvent event) { public void onEntityDeath(EntityDeathEvent event) {
if (event.getDroppedExp() > 0) { if (event.getDroppedExp() > 0) {
if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(event.getEntity()), event.getEntity().getLocation(), EntityType.EXPERIENCE_ORB))) { if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(event.getEntity()), event.getEntity().getLocation(), EntityType.EXPERIENCE_ORB))) {
@ -500,7 +504,7 @@ public void onEntityDeath(EntityDeathEvent event) {
// Entity external interaction // Entity external interaction
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@EventHandler @EventHandler(ignoreCancelled = true)
public void onPlayerInteractEntity(PlayerInteractEntityEvent event) { public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
World world = player.getWorld(); World world = player.getWorld();
@ -511,7 +515,7 @@ public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
Events.fireToCancel(event, new UseEntityEvent(event, create(player), entity)); Events.fireToCancel(event, new UseEntityEvent(event, create(player), entity));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onEntityDamage(EntityDamageEvent event) { public void onEntityDamage(EntityDamageEvent event) {
if (event instanceof EntityDamageByBlockEvent) { if (event instanceof EntityDamageByBlockEvent) {
Events.fireToCancel(event, new DamageEntityEvent(event, create(((EntityDamageByBlockEvent) event).getDamager()), event.getEntity())); Events.fireToCancel(event, new DamageEntityEvent(event, create(((EntityDamageByBlockEvent) event).getDamager()), event.getEntity()));
@ -537,7 +541,7 @@ public void onEntityDamage(EntityDamageEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onEntityCombust(EntityCombustEvent event) { public void onEntityCombust(EntityCombustEvent event) {
if (event instanceof EntityCombustByBlockEvent) { if (event instanceof EntityCombustByBlockEvent) {
Events.fireToCancel(event, new DamageEntityEvent(event, create(((EntityCombustByBlockEvent) event).getCombuster()), event.getEntity())); Events.fireToCancel(event, new DamageEntityEvent(event, create(((EntityCombustByBlockEvent) event).getCombuster()), event.getEntity()));
@ -550,7 +554,7 @@ public void onEntityCombust(EntityCombustEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onEntityUnleash(EntityUnleashEvent event) { public void onEntityUnleash(EntityUnleashEvent event) {
if (event instanceof PlayerUnleashEntityEvent) { if (event instanceof PlayerUnleashEntityEvent) {
PlayerUnleashEntityEvent playerEvent = (PlayerUnleashEntityEvent) event; PlayerUnleashEntityEvent playerEvent = (PlayerUnleashEntityEvent) event;
@ -560,33 +564,33 @@ public void onEntityUnleash(EntityUnleashEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onEntityTame(EntityTameEvent event) { public void onEntityTame(EntityTameEvent event) {
Events.fireToCancel(event, new UseEntityEvent(event, create(event.getOwner()), event.getEntity())); Events.fireToCancel(event, new UseEntityEvent(event, create(event.getOwner()), event.getEntity()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onPlayerShearEntity(PlayerShearEntityEvent event) { public void onPlayerShearEntity(PlayerShearEntityEvent event) {
Events.fireToCancel(event, new UseEntityEvent(event, create(event.getPlayer()), event.getEntity())); Events.fireToCancel(event, new UseEntityEvent(event, create(event.getPlayer()), event.getEntity()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onPlayerPickupItem(PlayerPickupItemEvent event) { public void onPlayerPickupItem(PlayerPickupItemEvent event) {
Item item = event.getItem(); Item item = event.getItem();
pickupDebounce.debounce(event.getPlayer(), item, event, new DestroyEntityEvent(event, create(event.getPlayer()), event.getItem())); pickupDebounce.debounce(event.getPlayer(), item, event, new DestroyEntityEvent(event, create(event.getPlayer()), event.getItem()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onPlayerDropItem(PlayerDropItemEvent event) { public void onPlayerDropItem(PlayerDropItemEvent event) {
Events.fireToCancel(event, new SpawnEntityEvent(event, create(event.getPlayer()), event.getItemDrop())); Events.fireToCancel(event, new SpawnEntityEvent(event, create(event.getPlayer()), event.getItemDrop()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onVehicleDamage(VehicleDamageEvent event) { public void onVehicleDamage(VehicleDamageEvent event) {
Events.fireToCancel(event, new DestroyEntityEvent(event, create(event.getAttacker()), event.getVehicle())); Events.fireToCancel(event, new DestroyEntityEvent(event, create(event.getAttacker()), event.getVehicle()));
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onVehicleEnter(VehicleDamageEvent event) { public void onVehicleEnter(VehicleDamageEvent event) {
Events.fireToCancel(event, new UseEntityEvent(event, create(event.getAttacker()), event.getVehicle())); Events.fireToCancel(event, new UseEntityEvent(event, create(event.getAttacker()), event.getVehicle()));
} }
@ -595,7 +599,7 @@ public void onVehicleEnter(VehicleDamageEvent event) {
// Composite events // Composite events
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@EventHandler @EventHandler(ignoreCancelled = true)
public void onPotionSplash(PotionSplashEvent event) { public void onPotionSplash(PotionSplashEvent event) {
Entity entity = event.getEntity(); Entity entity = event.getEntity();
ThrownPotion potion = event.getPotion(); ThrownPotion potion = event.getPotion();
@ -622,7 +626,7 @@ public void onPotionSplash(PotionSplashEvent event) {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockDispense(BlockDispenseEvent event) { public void onBlockDispense(BlockDispenseEvent event) {
Cause cause = create(event.getBlock()); Cause cause = create(event.getBlock());
Block dispenserBlock = event.getBlock(); Block dispenserBlock = event.getBlock();