Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-23 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE caused by flag value permissions.

Browse Source
This commit is contained in:
sk89q 2015-01-08 14:29:06 -08:00
parent f04f9093bc
commit 79612915a7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/sk89q/worldguard/bukkit/permission/RegionPermissionModel.java
View File

@ -27,6 +27,8 @@
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import javax.annotation.Nullable;
/**
* Used for querying region-related permissions.
*/
@ -124,11 +126,16 @@ public boolean maySetFlag(ProtectedRegion region, Flag<?> flag) {
"flag.flags." + flag.getName().toLowerCase(), region);
}
public boolean maySetFlag(ProtectedRegion region, Flag<?> flag, String value) {
String sanitizedValue = value.trim().toLowerCase().replaceAll("[^a-z0-9]", "");
public boolean maySetFlag(ProtectedRegion region, Flag<?> flag, @Nullable String value) {
String sanitizedValue;
if (sanitizedValue.length() > 20) {
sanitizedValue = sanitizedValue.substring(0, 20);
if (value != null) {
sanitizedValue = value.trim().toLowerCase().replaceAll("[^a-z0-9]", "");
if (sanitizedValue.length() > 20) {
sanitizedValue = sanitizedValue.substring(0, 20);
}
} else {
sanitizedValue = "unset";
}
// This is a WTF permission