* Added the "isCancelBlockPlaceEvent" and "setCancelBlockPlaceEvent" …

…methods to the "ShopCreationEvent" allowing cancelling of the internal "BlockPlaceEvent". * Adjusted all events to set a default cancellation value. Signed-off-by: XZot1K <[email protected]>
XZot1K · Nov 3, 2020 · 85c23c9 · 85c23c9
1 parent 8df9fc6
commit 85c23c9
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 3 deletions.
diff --git a/API Version.txt b/API Version.txt
@@ -1 +1 @@
-## API-VERSION 1.2 ##
+## API-VERSION 1.2.1 ##
diff --git a/src/xzot1k/plugins/ds/api/events/ChatInteractionEvent.java b/src/xzot1k/plugins/ds/api/events/ChatInteractionEvent.java
@@ -21,6 +21,7 @@ public ChatInteractionEvent(Player player, ChatInteractionType chatInteractionTy
         setPlayer(player);
         setChatInteractionType(chatInteractionType);
         setPlayerEntryValue(playerEntryValue);
+        setCancelled(false);
     }
 
     public static HandlerList getHandlerList() {

diff --git a/src/xzot1k/plugins/ds/api/events/ShopCreationEvent.java b/src/xzot1k/plugins/ds/api/events/ShopCreationEvent.java
@@ -1,7 +1,6 @@
 /*
  * Copyright (c) 2020 XZot1K, All rights reserved.
  */
-
 package xzot1k.plugins.ds.api.events;
 
 import org.bukkit.Location;
@@ -13,12 +12,14 @@
 public class ShopCreationEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
     private Player player;
-    private boolean cancelled;
+    private boolean cancelled, cancelBlockPlaceEvent;
     private Location location;
 
     public ShopCreationEvent(Player player, Location location) {
         setPlayer(player);
         setLocation(location);
+        setCancelled(false);
+        setCancelBlockPlaceEvent(false);
     }
 
     public static HandlerList getHandlerList() {
@@ -56,4 +57,12 @@ public Location getLocation() {
     public void setLocation(Location location) {
         this.location = location;
     }
+
+    public boolean isCancelBlockPlaceEvent() {
+        return cancelBlockPlaceEvent;
+    }
+
+    public void setCancelBlockPlaceEvent(boolean cancelBlockPlaceEvent) {
+        this.cancelBlockPlaceEvent = cancelBlockPlaceEvent;
+    }
 }
diff --git a/src/xzot1k/plugins/ds/api/events/ShopDeletionEvent.java b/src/xzot1k/plugins/ds/api/events/ShopDeletionEvent.java
@@ -19,6 +19,7 @@ public class ShopDeletionEvent extends Event implements Cancellable {
     public ShopDeletionEvent(Player player, Location location) {
         setPlayer(player);
         setLocation(location);
+        setCancelled(false);
     }
 
     public static HandlerList getHandlerList() {

diff --git a/src/xzot1k/plugins/ds/api/events/ShopEditEvent.java b/src/xzot1k/plugins/ds/api/events/ShopEditEvent.java
@@ -19,6 +19,7 @@ public class ShopEditEvent extends Event implements Cancellable {
     public ShopEditEvent(Player player, Shop shop) {
         this.player = player;
         this.shop = shop;
+        setCancelled(false);
     }
 
     // getters & setters

diff --git a/src/xzot1k/plugins/ds/api/events/ShopTransactionEvent.java b/src/xzot1k/plugins/ds/api/events/ShopTransactionEvent.java
@@ -19,6 +19,7 @@ public class ShopTransactionEvent extends Event implements Cancellable {
     public ShopTransactionEvent(Player player, Shop shop) {
         this.player = player;
         this.shop = shop;
+        setCancelled(false);
     }
 
     // getters & setters

diff --git a/src/xzot1k/plugins/ds/api/events/ShopVisitEvent.java b/src/xzot1k/plugins/ds/api/events/ShopVisitEvent.java
@@ -21,6 +21,7 @@ public ShopVisitEvent(Player player, Shop shop, double chargeAmount) {
         setPlayer(player);
         setShop(shop);
         setChargeAmount(chargeAmount);
+        setCancelled(false);
     }
 
     public static HandlerList getHandlerList() {