Skip to content

Commit ccebc99

Browse files
committed
Remove other listener.
1 parent a23608d commit ccebc99

File tree

1 file changed

+1
-20
lines changed

1 file changed

+1
-20
lines changed

src/main/java/world/bentobox/aoneblock/listeners/BlockProtect.java

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515
import org.bukkit.event.EventPriority;
1616
import org.bukkit.event.Listener;
1717
import org.bukkit.event.block.Action;
18-
import org.bukkit.event.block.BlockDamageEvent;
1918
import org.bukkit.event.block.BlockPistonExtendEvent;
2019
import org.bukkit.event.block.BlockPistonRetractEvent;
2120
import org.bukkit.event.entity.EntityChangeBlockEvent;
2221
import org.bukkit.event.entity.EntityExplodeEvent;
2322
import org.bukkit.event.entity.EntitySpawnEvent;
24-
import org.bukkit.event.inventory.ClickType;
2523
import org.bukkit.event.player.PlayerInteractEvent;
2624
import org.bukkit.util.Vector;
2725

@@ -43,35 +41,18 @@ public BlockProtect(AOneBlock addon) {
4341
this.addon = addon;
4442
}
4543

46-
/**
47-
* Show particles when block is hit
48-
* @param e - event
49-
*/
50-
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
51-
public void onBlockDamage(BlockDamageEvent e) {
52-
if (!addon.inWorld(e.getBlock().getWorld())
53-
&& addon.getSettings().getClickType().equals(ClickType.LEFT.name())) {
54-
return;
55-
}
56-
Block block = e.getBlock();
57-
Location l = block.getLocation();
58-
addon.getIslands().getIslandAt(l).map(Island::getCenter).filter(l::equals).ifPresent(this::showSparkles);
59-
60-
}
61-
6244
/**
6345
* Show particles when block is hit
6446
* @param e - event
6547
*/
6648
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
6749
public void onBlockDamage(PlayerInteractEvent e) {
68-
if (!addon.inWorld(e.getPlayer().getWorld())) {
50+
if (!addon.inWorld(e.getPlayer().getWorld()) || e.getClickedBlock() == null) {
6951
return;
7052
}
7153

7254
Action action = e.getAction();
7355
String clickType = addon.getSettings().getClickType();
74-
7556
if ((action == Action.LEFT_CLICK_BLOCK && clickType.equalsIgnoreCase("LEFT"))
7657
|| (action == Action.RIGHT_CLICK_BLOCK && clickType.equalsIgnoreCase("RIGHT"))) {
7758

0 commit comments

Comments
 (0)