From 9cb9270c935cf5e710d0b0d5104640acd744aee2 Mon Sep 17 00:00:00 2001 From: Jarva <4622609+Jarva@users.noreply.github.com> Date: Sat, 26 Nov 2022 22:12:14 +0000 Subject: [PATCH] fix: allow subclaim title to be set via command --- .../io/github/flemmli97/flan/commands/CommandClaim.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java b/common/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java index 162b512..9c0310a 100644 --- a/common/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java +++ b/common/src/main/java/io/github/flemmli97/flan/commands/CommandClaim.java @@ -802,7 +802,11 @@ public class CommandClaim { ((MutableComponent) text).setStyle(style); } ServerPlayer player = context.getSource().getPlayerOrException(); - Claim claim = PermHelper.checkReturn(player, PermissionRegistry.CLAIMMESSAGE, PermHelper.genericNoPermMessage(player)); + PlayerClaimData data = PlayerClaimData.get(player); + Claim rootClaim = PermHelper.checkReturn(player, PermissionRegistry.CLAIMMESSAGE, PermHelper.genericNoPermMessage(player)); + if (rootClaim == null) + return 0; + Claim claim = data.getEditMode() == EnumEditMode.SUBCLAIM ? rootClaim.getSubClaim(player.blockPosition()) : rootClaim; if (claim == null) return 0; boolean sub = StringArgumentType.getString(context, "title").equals("subtitle");