Feature : Add cancellable IslandBanEvent (#1368)

* 🎨 Add IslandBanEvent cancellable ! * Fix error ❌ * 🎨 Optimize line when event call ! * 🎨 Change format of calling event !
BG-Software-LLC · Sep 23, 2022 · fdc9876 · fdc9876
1 parent e2ff574
commit fdc9876
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/API/src/main/java/com/bgsoftware/superiorskyblock/api/events/IslandBanEvent.java b/API/src/main/java/com/bgsoftware/superiorskyblock/api/events/IslandBanEvent.java
@@ -2,15 +2,18 @@
 
 import com.bgsoftware.superiorskyblock.api.island.Island;
 import com.bgsoftware.superiorskyblock.api.wrappers.SuperiorPlayer;
+import org.bukkit.event.Cancellable;
 
 /**
  * IslandBanEvent is called when a player is banned from his island.
  */
-public class IslandBanEvent extends IslandEvent {
+public class IslandBanEvent extends IslandEvent implements Cancellable {
 
     private final SuperiorPlayer superiorPlayer;
     private final SuperiorPlayer targetPlayer;
 
+    private boolean cancelled;
+
     /**
      * The constructor of the event.
      *
@@ -38,4 +41,13 @@ public SuperiorPlayer getTarget() {
         return targetPlayer;
     }
 
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
 }
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/core/events/EventsBus.java b/src/main/java/com/bgsoftware/superiorskyblock/core/events/EventsBus.java
@@ -67,10 +67,8 @@ public boolean callBlockUnstackEvent(Block block, Player player, int originalAmo
                 "blockunstackevent");
     }
 
-    public void callIslandBanEvent(SuperiorPlayer superiorPlayer, SuperiorPlayer targetPlayer, Island island) {
-        if (!plugin.getSettings().getDisabledEvents().contains("islandbanevent")) {
-            callEvent(new IslandBanEvent(superiorPlayer, targetPlayer, island));
-        }
+    public boolean callIslandBanEvent(SuperiorPlayer superiorPlayer, SuperiorPlayer targetPlayer, Island island) {
+        return callEvent(() -> new IslandBanEvent(superiorPlayer, targetPlayer, island), "islandbanevent");
     }
 
     public EventResult<String> callIslandBankDepositEvent(SuperiorPlayer superiorPlayer, Island island, BigDecimal amount) {

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/island/IslandUtils.java b/src/main/java/com/bgsoftware/superiorskyblock/island/IslandUtils.java
@@ -257,7 +257,8 @@ public static boolean checkBanRestrictions(SuperiorPlayer superiorPlayer, Island
     }
 
     public static void handleBanPlayer(SuperiorPlayer caller, Island island, SuperiorPlayer target) {
-        plugin.getEventsBus().callIslandBanEvent(caller, target, island);
+        if (plugin.getEventsBus().callIslandBanEvent(caller, target, island))
+            return;
 
         island.banMember(target, caller);