From 9aa964110710751b85367d4fd6ed1cc07efa2f49 Mon Sep 17 00:00:00 2001
From: Flemmli97 <Flemmli97@users.noreply.github.com>
Date: Thu, 2 Sep 2021 14:16:25 +0200
Subject: [PATCH] remove need of claimblocks when in admin mode
---
.../java/io/github/flemmli97/flan/claim/ClaimStorage.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java b/common/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java
index a19d901..efa54b7 100644
--- a/common/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java
+++ b/common/src/main/java/io/github/flemmli97/flan/claim/ClaimStorage.java
@@ -90,11 +90,11 @@ public class ClaimStorage implements IPermissionStorage {
player.sendMessage(PermHelper.simpleColoredText(String.format(ConfigHandler.lang.minClaimSize, ConfigHandler.config.minClaimsize), Formatting.RED), false);
return false;
}
- if (ConfigHandler.config.maxClaims != -1 && !PermissionNodeHandler.permBelowEqVal(player, PermissionNodeHandler.permMaxClaims, this.playerClaimMap.getOrDefault(player.getUuid(), Sets.newHashSet()).size() + 1, ConfigHandler.config.maxClaims)) {
+ if (!data.isAdminIgnoreClaim() && ConfigHandler.config.maxClaims != -1 && !PermissionNodeHandler.permBelowEqVal(player, PermissionNodeHandler.permMaxClaims, this.playerClaimMap.getOrDefault(player.getUuid(), Sets.newHashSet()).size() + 1, ConfigHandler.config.maxClaims)) {
player.sendMessage(PermHelper.simpleColoredText(String.format(ConfigHandler.lang.maxClaims), Formatting.RED), false);
return false;
}
- if (!data.canUseClaimBlocks(claim.getPlane())) {
+ if (!data.isAdminIgnoreClaim() && !data.canUseClaimBlocks(claim.getPlane())) {
player.sendMessage(PermHelper.simpleColoredText(ConfigHandler.lang.notEnoughBlocks, Formatting.RED), false);
return false;
}
@@ -188,7 +188,7 @@ public class ClaimStorage implements IPermissionStorage {
return data;
return (IPlayerData) PlayerClaimData.get(o);
}).orElse(new OfflinePlayerData(player.getServer(), claim.getOwner()));
- boolean enoughBlocks = claim.isAdminClaim() || newData.canUseClaimBlocks(diff);
+ boolean enoughBlocks = claim.isAdminClaim() || data.isAdminIgnoreClaim() || newData.canUseClaimBlocks(diff);
if (enoughBlocks) {
Flan.log("Resizing claim {}", claim);
this.deleteClaim(claim, false, EnumEditMode.DEFAULT, player.getServerWorld());