v1.0.1

Author: fromgate

README.md

@@ -94,9 +94,16 @@ group:
   scan-subgroups: true
 # Chat format 
   format:
+# List of groups
+# First - lower prity,  last - higher
+# For example, if player are member of three groups: default, vip and admin
+# Will used format describe in last group in list - admin 
     default: # Group name
       chat: '&5[GUEST]&3%player%&a: 6%message%' # Chat format
     vip: # Group name
-      chat: '&6[VIP]&4%player%&a: %message%' # Chat format
+      chat: '&6[VIP]&e%player%&a: %message%' # Chat format
       name-tag: '&6[VIP] &4%player%' # Name tag format
+    admin: 
+      '&4[ADM]&c%player%e:&a %message'
+      name-tag: '&4[admin] &4%player%' # Name tag format
 ```

src/main/java/ru/nukkit/multichat/command/ChatGroup.java

@@ -23,7 +23,7 @@ public boolean execute(CommandSender sender, Player player, String[] args) {
 
             Message.CHAT_GROUP_CHAT_OK.print(sender, group, format);
             sender.sendMessage(TextFormat.colorize(format).replace("%player%", "{%0}").replace("%message%", "{%1}").replace("{%0}", "Leeloo").replace("{%1}", "Big bada boom!"));
-        } else if (args[1].matches("(?i)name|tag|nametag")){
+        } else if (args[1].matches("(?i)name|tag|nametag")) {
             if (!format.contains("{%0}") && !format.contains("%player%"))
                 return Message.CHAT_FAILTAGFORMAT.print(sender);
             MultiChat.getCfg().customGroups.set(group + ".name-tag", format);

src/main/java/ru/nukkit/multichat/command/ChatSet.java

@@ -23,7 +23,7 @@ public boolean execute(CommandSender sender, Player player, String[] args) {
 
             Message.CHAT_SET_OK.print(sender, format);
             sender.sendMessage(TextFormat.colorize(format).replace("%player%", "{%0}").replace("%message%", "{%1}").replace("{%0}", "Leeloo").replace("{%1}", "Big bada boom!"));
-        } else if (args[1].matches("(?i)name|tag|nametag")){
+        } else if (args[1].matches("(?i)name|tag|nametag")) {
             if (!format.contains("{%0}") && !format.contains("%player%"))
                 return Message.CHAT_FAILTAGFORMAT.print(sender);
             MultiChat.getCfg().nametagFormat = format;

src/main/java/ru/nukkit/multichat/util/Util.java

@@ -13,24 +13,23 @@ public static String getChatFormat(Player player) {
     }
 
     public static String getCustomFormat(Player player) {
-        ConfigSection section = MultiChat.getCfg().customGroups;
-        String chatFormat = MultiChat.getCfg().chatFormat;
-        for (String key : section.getKeys(false)) {
-            if (!isPlayerInGroup(player, key)) continue;
-            chatFormat = section.getString(key + ".chat", chatFormat);
-        }
-        Message.debugMessage("getCustomFormat(" + player.getName() + "):", chatFormat);
-        return chatFormat;
+        return getCusomParam(player, true);
     }
 
     public static String getCustomNameTag(Player player) {
+        return getCusomParam(player, false);
+    }
+
+    private static String getCusomParam(Player player, boolean getFormat) {
+        String param = getFormat ? ".chat" : ".name-tag";
+        String result = getFormat ? MultiChat.getCfg().chatFormat : MultiChat.getCfg().nametagFormat;
         ConfigSection section = MultiChat.getCfg().customGroups;
-        String nameTag = MultiChat.getCfg().nametagFormat;
         for (String key : section.getKeys(false)) {
-            if (!isPlayerInGroup(player, key)) continue;
-            nameTag = section.getString(key + ".name-tag", nameTag);
+            if (isPlayerInGroup(player, key) && section.exists(key + param)) {
+                result = section.getString(key + param);
+            }
         }
-        return nameTag;
+        return result;
     }
 
     private static boolean isPlayerInGroup(Player player, String group) {
@@ -66,8 +65,9 @@ public static String join(String[] args, int num) {
     }
 
     public static void setNameTag(Player player, String nameTag) {
-        if (nameTag == null || nameTag.isEmpty()) player.setNameTagVisible(false);
-        else {
+        if (nameTag == null || nameTag.isEmpty()) {
+            player.setNameTagVisible(false);
+        } else {
             player.isNameTagVisible();
             player.setDisplayName(TextFormat.colorize(nameTag));
         }

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: MultiChat
 main: ru.nukkit.multichat.MultiChat
-version: "1.0.0"
+version: "1.0.1"
 author: fromgate, nukkit.ru
 api: ["1.0.0"]
 description: MultiChat - universal chat formater based on MultiPass plugin