[1.2.3]更改一下消息发送的判断逻辑

Author: ChiyodaXiaoYi

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.github.yufiriamazenta"
-version = "1.2.2"
+version = "1.2.3"
 
 repositories {
     mavenLocal()

src/main/kotlin/com/github/yufiriamazenta/deathmsg/listener/DeathHandler.kt

@@ -99,19 +99,24 @@ class DeathHandler: Listener {
         //组装成完整的死亡消息组件
         val deathMsgComponent = TranslatableComponent(TextUtil.color(message), *objList.toTypedArray())
 
+        //当为all时直接让其为null,下面判断两种方式都发送
         val chatMessageTypeStr = DEATH_MESSAGE.config.getString("death_message_type", "chat")!!.uppercase()
-        val chatMessageType = try {
-            ChatMessageType.valueOf(chatMessageTypeStr)
-        } catch (e: Exception) {
-            ChatMessageType.CHAT
+        val chatMessageType = if (chatMessageTypeStr != "ALL") {
+            try {
+                ChatMessageType.valueOf(chatMessageTypeStr)
+            } catch (e: Exception) {
+                ChatMessageType.CHAT
+            }
+        } else {
+            null
         }
 
         //发送死亡消息给没有屏蔽死亡消息的玩家
         for (onlinePlayer in Bukkit.getOnlinePlayers()) {
             if (deadPlayer != onlinePlayer) {
                 if (DEATH_MESSAGE.isPlayerDeathMsgFilterOn(onlinePlayer)) continue
             }
-            if (chatMessageTypeStr != "ALL")
+            if (chatMessageType != null)
                 onlinePlayer.spigot().sendMessage(chatMessageType, deathMsgComponent)
             else {
                 onlinePlayer.spigot().sendMessage(ChatMessageType.CHAT, deathMsgComponent)