EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 27 Wiki Activity

Ignores cancelled block events

Browse Source
This commit is contained in:
Kristian Knarvik
2025-09-14 00:55:01 +02:00
parent bcde89dec4
commit 407b22fba0
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/knarcraft/stargate/listener/BlockEventListener.java
View File

@@ -38,7 +38,6 @@ import java.util.List;
/** /**
* This class is responsible for listening to relevant block events related to creating and breaking portals * This class is responsible for listening to relevant block events related to creating and breaking portals
*/ */
@SuppressWarnings("unused")
public class BlockEventListener implements Listener { public class BlockEventListener implements Listener {
/** /**
@@ -49,9 +48,9 @@ public class BlockEventListener implements Listener {
* *
* @param event <p>The triggered event</p> * @param event <p>The triggered event</p>
*/ */
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockFormedByEntity(@NotNull EntityBlockFormEvent event) { public void onBlockFormedByEntity(@NotNull EntityBlockFormEvent event) {
if (event.isCancelled() || (!Stargate.getGateConfig().protectEntrance() && if ((!Stargate.getGateConfig().protectEntrance() &&
!Stargate.getGateConfig().verifyPortals())) { !Stargate.getGateConfig().verifyPortals())) {
return; return;
} }
@@ -70,11 +69,8 @@ public class BlockEventListener implements Listener {
* *
* @param event <p>The triggered event</p> * @param event <p>The triggered event</p>
*/ */
@EventHandler @EventHandler(ignoreCancelled = true)
public void onSignChange(@NotNull SignChangeEvent event) { public void onSignChange(@NotNull SignChangeEvent event) {
if (event.isCancelled()) {
return;
}
Player player = event.getPlayer(); Player player = event.getPlayer();
Block block = event.getBlock(); Block block = event.getBlock();
//Ignore normal signs //Ignore normal signs
@@ -101,14 +97,12 @@ public class BlockEventListener implements Listener {
portal::drawSign, 1); portal::drawSign, 1);
} }
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
public void onBlockPlace(@NotNull BlockPlaceEvent event) { public void onBlockPlace(@NotNull BlockPlaceEvent event) {
if (event.isCancelled() || !Stargate.getGateConfig().protectEntrance()) { if (!Stargate.getGateConfig().protectEntrance()) {
return; return;
} }
Block block = event.getBlock(); Block block = event.getBlock();
Player player = event.getPlayer();
Portal portal = PortalHandler.getByEntrance(block); Portal portal = PortalHandler.getByEntrance(block);
if (portal != null) { if (portal != null) {
//Prevent blocks from being placed in the entrance, if protectEntrance is enabled, as breaking the block //Prevent blocks from being placed in the entrance, if protectEntrance is enabled, as breaking the block
@@ -122,11 +116,8 @@ public class BlockEventListener implements Listener {
* *
* @param event <p>The triggered event</p> * @param event <p>The triggered event</p>
*/ */
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
public void onBlockBreak(@NotNull BlockBreakEvent event) { public void onBlockBreak(@NotNull BlockBreakEvent event) {
if (event.isCancelled()) {
return;
}
Block block = event.getBlock(); Block block = event.getBlock();
Player player = event.getPlayer(); Player player = event.getPlayer();
@@ -220,7 +211,7 @@ public class BlockEventListener implements Listener {
* *
* @param event <p>The event to check and possibly cancel</p> * @param event <p>The event to check and possibly cancel</p>
*/ */
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockPhysics(@NotNull BlockPhysicsEvent event) { public void onBlockPhysics(@NotNull BlockPhysicsEvent event) {
Block block = event.getBlock(); Block block = event.getBlock();
Portal portal = null; Portal portal = null;
@@ -240,12 +231,12 @@ public class BlockEventListener implements Listener {
* *
* @param event <p>The event to check and possibly cancel</p> * @param event <p>The event to check and possibly cancel</p>
*/ */
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockFromTo(@NotNull BlockFromToEvent event) { public void onBlockFromTo(@NotNull BlockFromToEvent event) {
Portal portal = PortalHandler.getByEntrance(event.getBlock()); Portal portal = PortalHandler.getByEntrance(event.getBlock());
if (portal != null) { if (portal != null && event.getBlock().getY() == event.getToBlock().getY()) {
event.setCancelled((event.getBlock().getY() == event.getToBlock().getY())); event.setCancelled(true);
} }
} }
@@ -254,7 +245,7 @@ public class BlockEventListener implements Listener {
* *
* @param event <p>The event to check and possibly cancel</p> * @param event <p>The event to check and possibly cancel</p>
*/ */
@EventHandler @EventHandler(ignoreCancelled = true)
public void onPistonExtend(@NotNull BlockPistonExtendEvent event) { public void onPistonExtend(@NotNull BlockPistonExtendEvent event) {
cancelPistonEvent(event, event.getBlocks()); cancelPistonEvent(event, event.getBlocks());
} }
@@ -264,7 +255,7 @@ public class BlockEventListener implements Listener {
* *
* @param event <p>The event to check and possibly cancel</p> * @param event <p>The event to check and possibly cancel</p>
*/ */
@EventHandler @EventHandler(ignoreCancelled = true)
public void onPistonRetract(@NotNull BlockPistonRetractEvent event) { public void onPistonRetract(@NotNull BlockPistonRetractEvent event) {
if (!event.isSticky()) { if (!event.isSticky()) {
return; return;