flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #210 /flan group ignoring subclaim mode

Browse Source
This commit is contained in:
Flemmli97 2023-03-10 23:08:15 +01:00
parent 327ae28df8
commit 82124199e1
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java
View File

@ -580,11 +580,16 @@ public class CommandClaim {
PermHelper.noClaimMessage(player); PermHelper.noClaimMessage(player);
return 0; return 0;
} }
if (PlayerClaimData.get(player).getEditMode() == EnumEditMode.SUBCLAIM) {
Claim sub = claim.getSubClaim(player.blockPosition());
if (sub != null)
claim = sub;
}
if (remove) { if (remove) {
if (claim.removePermGroup(player, group)) if (claim.removePermGroup(player, group))
player.displayClientMessage(PermHelper.simpleColoredText(String.format(ConfigHandler.langManager.get("groupRemove"), group), ChatFormatting.GOLD), false); player.displayClientMessage(PermHelper.simpleColoredText(String.format(ConfigHandler.langManager.get("groupRemove"), group), ChatFormatting.GOLD), false);
else { else {
PermHelper.genericNoPermMessage(player); player.displayClientMessage(PermHelper.simpleColoredText(ConfigHandler.langManager.get("noPermission"), ChatFormatting.DARK_RED), false);
return 0; return 0;
} }
} else { } else {
@ -594,7 +599,7 @@ public class CommandClaim {
} else if (claim.editPerms(player, group, PermissionRegistry.EDITPERMS, -1)) } else if (claim.editPerms(player, group, PermissionRegistry.EDITPERMS, -1))
player.displayClientMessage(PermHelper.simpleColoredText(String.format(ConfigHandler.langManager.get("groupAdd"), group), ChatFormatting.GOLD), false); player.displayClientMessage(PermHelper.simpleColoredText(String.format(ConfigHandler.langManager.get("groupAdd"), group), ChatFormatting.GOLD), false);
else { else {
PermHelper.genericNoPermMessage(player); player.displayClientMessage(PermHelper.simpleColoredText(ConfigHandler.langManager.get("noPermission"), ChatFormatting.DARK_RED), false);
return 0; return 0;
} }
} }
@ -623,8 +628,13 @@ public class CommandClaim {
PermHelper.noClaimMessage(player); PermHelper.noClaimMessage(player);
return 0; return 0;
} }
if (PlayerClaimData.get(player).getEditMode() == EnumEditMode.SUBCLAIM) {
Claim sub = claim.getSubClaim(player.blockPosition());
if (sub != null)
claim = sub;
}
if (!claim.canInteract(player, PermissionRegistry.EDITPERMS, player.blockPosition())) { if (!claim.canInteract(player, PermissionRegistry.EDITPERMS, player.blockPosition())) {
PermHelper.genericNoPermMessage(player); player.displayClientMessage(PermHelper.simpleColoredText(ConfigHandler.langManager.get("noPermission"), ChatFormatting.DARK_RED), false);
return 0; return 0;
} }
List<String> modified = new ArrayList<>(); List<String> modified = new ArrayList<>();
@ -670,6 +680,11 @@ public class CommandClaim {
PermHelper.noClaimMessage(player); PermHelper.noClaimMessage(player);
return 0; return 0;
} }
if (PlayerClaimData.get(player).getEditMode() == EnumEditMode.SUBCLAIM) {
Claim sub = claim.getSubClaim(player.blockPosition());
if (sub != null)
claim = sub;
}
if (!claim.canInteract(player, PermissionRegistry.EDITPERMS, player.blockPosition())) { if (!claim.canInteract(player, PermissionRegistry.EDITPERMS, player.blockPosition())) {
player.displayClientMessage(PermHelper.simpleColoredText(ConfigHandler.langManager.get("noPermission"), ChatFormatting.DARK_RED), false); player.displayClientMessage(PermHelper.simpleColoredText(ConfigHandler.langManager.get("noPermission"), ChatFormatting.DARK_RED), false);
return 0; return 0;