diff --git a/bukkit/src/main/java/com/griefdefender/command/ClaimFlagBase.java b/bukkit/src/main/java/com/griefdefender/command/ClaimFlagBase.java index a27a01a..1a52945 100644 --- a/bukkit/src/main/java/com/griefdefender/command/ClaimFlagBase.java +++ b/bukkit/src/main/java/com/griefdefender/command/ClaimFlagBase.java @@ -160,7 +160,8 @@ public void execute(Player player, String[] args) throws InvalidCommandArgument } } - final Set contextSet = CauseContextHelper.generateContexts(flag.getPermission(), player, claim, contexts); + String flagPermission = flag != null ? flag.getPermission() : ""; + final Set contextSet = CauseContextHelper.generateContexts(flagPermission, player, claim, contexts); if (contextSet == null) { return; } diff --git a/bukkit/src/main/java/com/griefdefender/command/ClaimOptionBase.java b/bukkit/src/main/java/com/griefdefender/command/ClaimOptionBase.java index 701b2fe..61d8c93 100644 --- a/bukkit/src/main/java/com/griefdefender/command/ClaimOptionBase.java +++ b/bukkit/src/main/java/com/griefdefender/command/ClaimOptionBase.java @@ -181,7 +181,8 @@ public void execute(Player player, String[] args) throws InvalidCommandArgument } } - final Set contextSet = CauseContextHelper.generateContexts(option.getPermission(), player, claim, contexts); + String optionPermission = option != null ? option.getPermission() : ""; + final Set contextSet = CauseContextHelper.generateContexts(optionPermission, player, claim, contexts); if (contextSet == null) { return; } diff --git a/sponge/src/main/java/com/griefdefender/command/ClaimFlagBase.java b/sponge/src/main/java/com/griefdefender/command/ClaimFlagBase.java index c3d70c0..b462555 100644 --- a/sponge/src/main/java/com/griefdefender/command/ClaimFlagBase.java +++ b/sponge/src/main/java/com/griefdefender/command/ClaimFlagBase.java @@ -160,7 +160,8 @@ public void execute(Player player, String[] args) throws InvalidCommandArgument } } - final Set contextSet = CauseContextHelper.generateContexts(flag.getPermission(), player, claim, contexts); + String flagPermission = flag != null ? flag.getPermission() : ""; + final Set contextSet = CauseContextHelper.generateContexts(flagPermission, player, claim, contexts); if (contextSet == null) { return; } diff --git a/sponge/src/main/java/com/griefdefender/command/ClaimOptionBase.java b/sponge/src/main/java/com/griefdefender/command/ClaimOptionBase.java index 7c40b45..f2db49b 100644 --- a/sponge/src/main/java/com/griefdefender/command/ClaimOptionBase.java +++ b/sponge/src/main/java/com/griefdefender/command/ClaimOptionBase.java @@ -181,7 +181,8 @@ public void execute(Player player, String[] args) throws InvalidCommandArgument } } - final Set contextSet = CauseContextHelper.generateContexts(option.getPermission(), player, claim, contexts); + String optionPermission = option != null ? option.getPermission() : ""; + final Set contextSet = CauseContextHelper.generateContexts(optionPermission, player, claim, contexts); if (contextSet == null) { return; }