From ac9066225dccc991fe20032ea180753446ef381c Mon Sep 17 00:00:00 2001 From: nikky Date: Mon, 6 Aug 2018 17:38:58 +0200 Subject: [PATCH] improve color stripping --- 1.7.10/src/main/kotlin/matterlink/MatterLink.kt | 2 ++ core/src/main/kotlin/matterlink/Util.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/1.7.10/src/main/kotlin/matterlink/MatterLink.kt b/1.7.10/src/main/kotlin/matterlink/MatterLink.kt index 1504cb1..13da1b6 100644 --- a/1.7.10/src/main/kotlin/matterlink/MatterLink.kt +++ b/1.7.10/src/main/kotlin/matterlink/MatterLink.kt @@ -8,6 +8,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent import cpw.mods.fml.common.event.FMLServerStartingEvent import cpw.mods.fml.common.event.FMLServerStoppingEvent import matterlink.bridge.command.IBridgeCommand +import matterlink.command.AuthCommand import matterlink.command.MatterLinkCommand import matterlink.command.MatterLinkCommandSender import matterlink.config.BaseConfig @@ -50,6 +51,7 @@ class MatterLink : IMatterLink() { fun serverStarting(event: FMLServerStartingEvent) { logger.debug("Registering server commands") event.registerServerCommand(MatterLinkCommand()) + event.registerServerCommand(AuthCommand()) start() } diff --git a/core/src/main/kotlin/matterlink/Util.kt b/core/src/main/kotlin/matterlink/Util.kt index 1fbc478..093610c 100644 --- a/core/src/main/kotlin/matterlink/Util.kt +++ b/core/src/main/kotlin/matterlink/Util.kt @@ -44,7 +44,7 @@ fun String.lazyFormat(env: Map String?>): String { val String.stripColorOut: String get() = if (cfg.outgoing.stripColors) - this.replace("§.?".toRegex(RegexOption.UNIX_LINES), "") + this.replace("[&§][0-9A-FK-OR]".toRegex(RegexOption.IGNORE_CASE), "") else this