LunaChat v3.0.14 : Fixed issue #209

ucchyocean · Sep 12, 2020 · 274415a · 274415a
1 parent 5f5a8c2
commit 274415a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/com/github/ucchyocean/lc3/bridge/BungeePermsBridge.java b/src/main/java/com/github/ucchyocean/lc3/bridge/BungeePermsBridge.java
@@ -40,7 +40,8 @@ public static BungeePermsBridge load(Plugin plugin) {
      * @return the full prefix; may be null
      */
     public String userPrefix(String nameoruuid, String server, String world) {
-        return BungeePermsAPI.userPrefix(nameoruuid, server, world);
+        String prefix = BungeePermsAPI.userPrefix(nameoruuid, server, world);
+        return (prefix != null) ? prefix : "";
     }
 
     /**
@@ -51,6 +52,7 @@ public String userPrefix(String nameoruuid, String server, String world) {
      * @return the full suffix; may be null
      */
     public String userSuffix(String nameoruuid, String server, String world) {
-        return BungeePermsAPI.userSuffix(nameoruuid, server, world);
+        String suffix = BungeePermsAPI.userSuffix(nameoruuid, server, world);
+        return (suffix != null) ? suffix : "";
     }
 }
diff --git a/src/main/java/com/github/ucchyocean/lc3/bridge/VaultChatBridge.java b/src/main/java/com/github/ucchyocean/lc3/bridge/VaultChatBridge.java
@@ -49,7 +49,8 @@ public static VaultChatBridge load(Plugin plugin) {
      * @return プレイヤーのprefix
      */
     public String getPlayerPrefix(Player player) {
-        return chatPlugin.getPlayerPrefix(player);
+        String prefix = chatPlugin.getPlayerPrefix(player);
+        return (prefix != null) ? prefix : "";
     }
 
     /**
@@ -58,6 +59,7 @@ public String getPlayerPrefix(Player player) {
      * @return プレイヤーのsuffix
      */
     public String getPlayerSuffix(Player player) {
-        return chatPlugin.getPlayerSuffix(player);
+        String suffix = chatPlugin.getPlayerSuffix(player);
+        return (suffix != null) ? suffix : "";
     }
 }