diff --git a/pom.xml b/pom.xml
index 007fa90..58b5b4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.github.judgetread
GriefPreventionQuickShopBridge
- 1.2.0
+ 1.3.0
diff --git a/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/QuickShopListener.java b/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/QuickShopListener.java
index 1427053..ec1b0bc 100644
--- a/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/QuickShopListener.java
+++ b/src/main/java/com/github/judgetread/GriefPreventionQuickShopBridge/listeners/QuickShopListener.java
@@ -37,9 +37,11 @@ public final class QuickShopListener implements Listener {
* @param event QuickShop ShopPreCreateEvent
*/
@EventHandler(priority = EventPriority.HIGH)
- public final void onPreShopEvent(@NonNull ShopPreCreateEvent event) {
+ public final void onPreShopEvent(@NonNull ShopPreCreateEvent event)
+ {
- if (event.isCancelled()) {
+ if (event.isCancelled())
+ {
return;
}
@@ -47,16 +49,21 @@ public final class QuickShopListener implements Listener {
final Claim claim = GriefPrevention.instance.dataStore.getClaimAt(location, false, null);
final Player player = event.getPlayer();
- if(plugin.getConfig().getBoolean("op-bypass-claim-checks", true) && player.isOp()){
+ if(plugin.getConfig().getBoolean("op-bypass-claim-checks", true) && player.isOp())
+ {
return;
}
- if(claim == null){
+ if(!plugin.getConfig().getBoolean("allow-unclaimed-land-shops", true) && claim == null)
+ {
event.setCancelled(true);
return;
}
- if(plugin.getConfig().getBoolean("only-claim-owner-can-create-shops", true) && !claim.ownerID.toString().equals(player.getUniqueId().toString())){
+ if(claim != null &&
+ plugin.getConfig().getBoolean("only-claim-owner-can-create-shops", true) &&
+ !claim.ownerID.toString().equals(player.getUniqueId().toString()))
+ {
event.setCancelled(true);
return;
}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index ea85155..ef6c294 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,12 +1,15 @@
# Only allow shops to be created in claims that player is owner of.
-# --> If false anyone can create a shop in the any claim.
+# --> If false anyone can create a shop in any claim.
only-claim-owner-can-create-shops: true
# Ignore claim checks if player is op, allows op to create shop anywhere.
op-bypass-claim-checks: true
# Delete shops inside a claim if that claim is deleted/removed
-delete-shops-when-claims-deleted: true
+delete-shops-when-claims-deleted: false
# Delete shops inside a claim if that claim expires
-delete-shops-when-claims-expires: true
\ No newline at end of file
+delete-shops-when-claims-expires: false
+
+# Allows players to make shops anywhere EXCEPT other player's claims, so even in unclaimed land
+allow-unclaimed-land-shops: true
\ No newline at end of file