diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Events/AndroidMineEvent.java b/src/main/java/me/mrCookieSlime/Slimefun/Events/AndroidMineEvent.java index 2b23b18a4..6d294f19b 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Events/AndroidMineEvent.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Events/AndroidMineEvent.java @@ -1,19 +1,30 @@ package me.mrCookieSlime.Slimefun.Events; +import me.mrCookieSlime.Slimefun.androids.ProgrammableAndroid; import org.bukkit.block.Block; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; +/** + * This event is fired before a miner android mines a block. + * If this event is cancelled, the block will not be mined. + */ public class AndroidMineEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); private final Block block; + private final ProgrammableAndroid android; private boolean cancelled; - public AndroidMineEvent(Block block) { + /** + * @param block - mined block + * @param android - android + */ + public AndroidMineEvent(Block block, ProgrammableAndroid android) { this.block = block; + this.android = android; } public static HandlerList getHandlerList() { @@ -25,12 +36,16 @@ public class AndroidMineEvent extends Event implements Cancellable { } /** - * @return the broken block + * @return the mined block */ public Block getBlock() { return this.block; } + /** + * @return the android + */ + public ProgrammableAndroid getAndroid() { return this.android;} @Override public boolean isCancelled() { return this.cancelled; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java b/src/main/java/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java index b7d25c482..e000263fa 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java @@ -500,7 +500,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem implements Invent Collection drops = block.getDrops(); if (!blockblacklist.contains(block.getType()) && !drops.isEmpty() && SlimefunPlugin.getProtectionManager().hasPermission(Bukkit.getOfflinePlayer(UUID.fromString(BlockStorage.getLocationInfo(b.getLocation(), "owner"))), block.getLocation(), ProtectableAction.BREAK_BLOCK)) { String item = BlockStorage.checkID(block); - AndroidMineEvent event = new AndroidMineEvent(block); + AndroidMineEvent event = new AndroidMineEvent(block, this); Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { return; @@ -533,7 +533,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem implements Invent Collection drops = block.getDrops(); if (!blockblacklist.contains(block.getType()) && !drops.isEmpty() && SlimefunPlugin.getProtectionManager().hasPermission(Bukkit.getOfflinePlayer(UUID.fromString(BlockStorage.getLocationInfo(b.getLocation(), "owner"))), block.getLocation(), ProtectableAction.BREAK_BLOCK)) { SlimefunItem item = BlockStorage.check(block); - AndroidMineEvent event = new AndroidMineEvent(block); + AndroidMineEvent event = new AndroidMineEvent(block, this); Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { return;