Fix crash

MikChanNoPlugins · Mar 8, 2023 · f5a5e8f · f5a5e8f
1 parent 146286a
commit f5a5e8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/dev/mikchan/mcnp/chat/implementation/base/event/listeners/BaseChatListener.kt b/src/main/java/dev/mikchan/mcnp/chat/implementation/base/event/listeners/BaseChatListener.kt
@@ -63,7 +63,7 @@ internal open class BaseChatListener(private val plugin: ChatPlugin) {
 
                 return false
             } else {
-                event.format = mcncEvent.formattedMessage
+                event.format = mcncEvent.formattedMessage.replace("%", "%%")
                 event.recipients.clear()
                 event.recipients.addAll(mcncEvent.recipients)
 

diff --git a/src/main/java/dev/mikchan/mcnp/chat/implementation/fallback/formatting/FallbackFormatter.kt b/src/main/java/dev/mikchan/mcnp/chat/implementation/fallback/formatting/FallbackFormatter.kt
@@ -13,8 +13,7 @@ internal class FallbackFormatter(private val plugin: ChatPlugin) : BaseFormatter
         alwaysTranslateColors: Boolean = false,
         to: (() -> String?)? = null
     ): String {
-        val name = { "%1\$s" }
-
+        val name = { player.displayName }
         return prepareTemplate(template, name, to ?: name, name, name, name, name) {
             if (alwaysTranslateColors || player.hasPermission("mcn.chat.colors")) {
                 ChatColor.translateAlternateColorCodes(