Upstream/GriefDefender
1
0
Fork 0
mirror of https://github.com/bloodmc/GriefDefender.git synced 2024-11-29 13:25:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Validate claim type permissions when using '/claimcreate'.

Browse Source
This commit is contained in:
bloodshot 2020-01-03 09:40:16 -05:00
parent 6169644109
commit 0d870c2a70
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bukkit/src/main/java/com/griefdefender/command/CommandClaimCreate.java
View File

@ -42,6 +42,7 @@
import com.griefdefender.api.claim.ClaimResultType; import com.griefdefender.api.claim.ClaimResultType;
import com.griefdefender.api.claim.ClaimType; import com.griefdefender.api.claim.ClaimType;
import com.griefdefender.api.claim.ClaimTypes; import com.griefdefender.api.claim.ClaimTypes;
import com.griefdefender.api.permission.ResultTypes;
import com.griefdefender.api.permission.option.Options; import com.griefdefender.api.permission.option.Options;
import com.griefdefender.api.permission.option.type.CreateModeTypes; import com.griefdefender.api.permission.option.type.CreateModeTypes;
import com.griefdefender.cache.MessageCache; import com.griefdefender.cache.MessageCache;
@ -101,6 +102,17 @@ public void execute(Player player, int radius, @Optional String type) {
final GDPermissionUser user = PermissionHolderCache.getInstance().getOrCreateUser(player); final GDPermissionUser user = PermissionHolderCache.getInstance().getOrCreateUser(player);
final GDPlayerData playerData = user.getInternalPlayerData(); final GDPlayerData playerData = user.getInternalPlayerData();
final ClaimType claimType = ClaimTypeRegistryModule.getInstance().getById(type).orElse(ClaimTypes.BASIC); final ClaimType claimType = ClaimTypeRegistryModule.getInstance().getById(type).orElse(ClaimTypes.BASIC);
if (claimType == ClaimTypes.WILDERNESS) {
GriefDefenderPlugin.sendMessage(player, GriefDefenderPlugin.getInstance().messageData.getMessage(MessageStorage.CREATE_FAILED_RESULT,
ImmutableMap.of("reason", ResultTypes.TARGET_NOT_VALID)));
return;
}
if (claimType == ClaimTypes.ADMIN && !playerData.ignoreAdminClaims && !playerData.canManageAdminClaims) {
GriefDefenderPlugin.sendMessage(player, GriefDefenderPlugin.getInstance().messageData.getMessage(MessageStorage.CREATE_FAILED_RESULT,
ImmutableMap.of("reason", ResultTypes.TARGET_NOT_VALID)));
return;
}
final boolean cuboid = playerData.getClaimCreateMode() == CreateModeTypes.VOLUME; final boolean cuboid = playerData.getClaimCreateMode() == CreateModeTypes.VOLUME;
if ((claimType == ClaimTypes.BASIC || claimType == ClaimTypes.TOWN) && GriefDefenderPlugin.getGlobalConfig().getConfig().economy.economyMode) { if ((claimType == ClaimTypes.BASIC || claimType == ClaimTypes.TOWN) && GriefDefenderPlugin.getGlobalConfig().getConfig().economy.economyMode) {
EconomyUtil.getInstance().economyCreateClaimConfirmation(player, playerData, location.getBlockY(), lesserBoundary, greaterBoundary, claimType, EconomyUtil.getInstance().economyCreateClaimConfirmation(player, playerData, location.getBlockY(), lesserBoundary, greaterBoundary, claimType,

12
sponge/src/main/java/com/griefdefender/command/CommandClaimCreate.java
View File

@ -38,6 +38,7 @@
import com.griefdefender.api.claim.ClaimResultType; import com.griefdefender.api.claim.ClaimResultType;
import com.griefdefender.api.claim.ClaimType; import com.griefdefender.api.claim.ClaimType;
import com.griefdefender.api.claim.ClaimTypes; import com.griefdefender.api.claim.ClaimTypes;
import com.griefdefender.api.permission.ResultTypes;
import com.griefdefender.api.permission.option.Options; import com.griefdefender.api.permission.option.Options;
import com.griefdefender.api.permission.option.type.CreateModeTypes; import com.griefdefender.api.permission.option.type.CreateModeTypes;
import com.griefdefender.cache.MessageCache; import com.griefdefender.cache.MessageCache;
@ -100,6 +101,17 @@ public void execute(Player player, int radius, @Optional String type) {
final GDPermissionUser user = PermissionHolderCache.getInstance().getOrCreateUser(player); final GDPermissionUser user = PermissionHolderCache.getInstance().getOrCreateUser(player);
final GDPlayerData playerData = user.getInternalPlayerData(); final GDPlayerData playerData = user.getInternalPlayerData();
final ClaimType claimType = ClaimTypeRegistryModule.getInstance().getById(type).orElse(ClaimTypes.BASIC); final ClaimType claimType = ClaimTypeRegistryModule.getInstance().getById(type).orElse(ClaimTypes.BASIC);
if (claimType == ClaimTypes.WILDERNESS) {
GriefDefenderPlugin.sendMessage(player, GriefDefenderPlugin.getInstance().messageData.getMessage(MessageStorage.CREATE_FAILED_RESULT,
ImmutableMap.of("reason", ResultTypes.TARGET_NOT_VALID)));
return;
}
if (claimType == ClaimTypes.ADMIN && !playerData.ignoreAdminClaims && !playerData.canManageAdminClaims) {
GriefDefenderPlugin.sendMessage(player, GriefDefenderPlugin.getInstance().messageData.getMessage(MessageStorage.CREATE_FAILED_RESULT,
ImmutableMap.of("reason", ResultTypes.TARGET_NOT_VALID)));
return;
}
final boolean cuboid = playerData.getClaimCreateMode() == CreateModeTypes.VOLUME; final boolean cuboid = playerData.getClaimCreateMode() == CreateModeTypes.VOLUME;
if ((claimType == ClaimTypes.BASIC || claimType == ClaimTypes.TOWN) && GriefDefenderPlugin.getGlobalConfig().getConfig().economy.economyMode) { if ((claimType == ClaimTypes.BASIC || claimType == ClaimTypes.TOWN) && GriefDefenderPlugin.getGlobalConfig().getConfig().economy.economyMode) {
EconomyUtil.getInstance().economyCreateClaimConfirmation(player, playerData, location.getBlockY(), lesserBoundary, greaterBoundary, claimType, EconomyUtil.getInstance().economyCreateClaimConfirmation(player, playerData, location.getBlockY(), lesserBoundary, greaterBoundary, claimType,