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

Fix NPE when using flag command.

Browse Source
This commit is contained in:
bloodshot 2019-12-30 18:50:20 -05:00
parent 436f053fbe
commit dde267d997
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bukkit/src/main/java/com/griefdefender/command/ClaimFlagBase.java
View File

@ -160,7 +160,8 @@ public void execute(Player player, String[] args) throws InvalidCommandArgument
}
}
final Set<Context> contextSet = CauseContextHelper.generateContexts(flag.getPermission(), player, claim, contexts);
String flagPermission = flag != null ? flag.getPermission() : "";
final Set<Context> contextSet = CauseContextHelper.generateContexts(flagPermission, player, claim, contexts);
if (contextSet == null) {
return;
}

3
bukkit/src/main/java/com/griefdefender/command/ClaimOptionBase.java
View File

@ -181,7 +181,8 @@ public void execute(Player player, String[] args) throws InvalidCommandArgument
}
}
final Set<Context> contextSet = CauseContextHelper.generateContexts(option.getPermission(), player, claim, contexts);
String optionPermission = option != null ? option.getPermission() : "";
final Set<Context> contextSet = CauseContextHelper.generateContexts(optionPermission, player, claim, contexts);
if (contextSet == null) {
return;
}

3
sponge/src/main/java/com/griefdefender/command/ClaimFlagBase.java
View File

@ -160,7 +160,8 @@ public void execute(Player player, String[] args) throws InvalidCommandArgument
}
}
final Set<Context> contextSet = CauseContextHelper.generateContexts(flag.getPermission(), player, claim, contexts);
String flagPermission = flag != null ? flag.getPermission() : "";
final Set<Context> contextSet = CauseContextHelper.generateContexts(flagPermission, player, claim, contexts);
if (contextSet == null) {
return;
}

3
sponge/src/main/java/com/griefdefender/command/ClaimOptionBase.java
View File

@ -181,7 +181,8 @@ public void execute(Player player, String[] args) throws InvalidCommandArgument
}
}
final Set<Context> contextSet = CauseContextHelper.generateContexts(option.getPermission(), player, claim, contexts);
String optionPermission = option != null ? option.getPermission() : "";
final Set<Context> contextSet = CauseContextHelper.generateContexts(optionPermission, player, claim, contexts);
if (contextSet == null) {
return;
}