Upstream
/
Multiverse-Core
mirror of https://github.com/Multiverse/Multiverse-Core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add null value formatting for MapContentProvider

This commit is contained in:
Ben Woo 2023-09-22 17:20:13 +08:00
parent 41f9989eef
commit 61e3ffb7e5
No known key found for this signature in database
GPG Key ID: FB2A3645536E12C8
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/mvplugins/multiverse/core/display/parsers/MapContentProvider.java
View File

@ -2,9 +2,9 @@ package org.mvplugins.multiverse.core.display.parsers;
import java.util.Collection;
import java.util.Map;
import java.util.stream.Collectors;
import co.aikar.commands.BukkitCommandIssuer;
import com.google.common.base.Strings;
import org.bukkit.ChatColor;
import org.jetbrains.annotations.NotNull;
@ -45,8 +45,15 @@ public class MapContentProvider<K, V> implements ContentProvider {
@Override
public Collection<String> parse(@NotNull BukkitCommandIssuer issuer) {
return map.entrySet().stream()
.map(e -> String.format(format, keyColor, e.getKey(), separator, valueColor, e.getValue()))
.collect(Collectors.toList());
.map(e -> String.format(format, keyColor, e.getKey(), separator, valueColor, formatValue(e.getValue())))
.toList();
}
private String formatValue(V value) {
if (value instanceof String stringValue) {
return Strings.isNullOrEmpty(stringValue) ? "&7&onull" : stringValue;
}
return value == null ? "&7&onull" : String.valueOf(value);
}
/**