Merge pull request #134 from wushin/broken-nick-fix

Fix Broken Nick M+ Issue

3 files changed, 5 insertions, 5 deletions

diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 5db8288..4dd80bb 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -4102,10 +4102,10 @@ ATCE atcommand_pvp(Session *s, dumb_ptr<map_session_data> sd,
 
     if (chan < 1) {
         sd->state.pvpchannel = 1;
-        clif_displaymessage(s, "##3PvP : ##BOn"_s);
+        clif_displaymessage(s, "PvP : ##3##BOn"_s);
     } else {
         sd->state.pvpchannel = 0;
-        clif_displaymessage(s, "##3PvP : ##BOff"_s);
+        clif_displaymessage(s, "PvP : ##3##BOff"_s);
     }
 
     sd->state.pvp_rank = 0;
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 96233e1..254ecb5 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -812,7 +812,7 @@ void pc_show_motd(dumb_ptr<map_session_data> sd)
     // If you remove the sending of this message,
     // the license does not permit you to publicly use this software.
 
-    clif_displaymessage(sd->sess, "##7Server : This server is Free Software, for details type @source in chat or use the tmwa-source tool"_s);
+    clif_displaymessage(sd->sess, "Server : ##7This server is Free Software, for details type @source in chat or use the tmwa-source tool"_s);
     npc_event_doall_l(stringish<ScriptLabel>("OnPCLoginEvent"_s), sd->bl_id, nullptr);
 
     sd->state.seen_motd = true;
diff --git a/src/map/tmw.cpp b/src/map/tmw.cpp
index df76720..5422b3a 100644
--- a/src/map/tmw.cpp
+++ b/src/map/tmw.cpp
@@ -109,8 +109,8 @@ int tmw_CheckChatSpam(dumb_ptr<map_session_data> sd, XString message)
         (sd->chat_lines_in >= battle_config.chat_spam_warn
          || sd->chat_total_repeats >= battle_config.chat_spam_warn))
     {
-        clif_displaymessage(sd->sess, "##1WARNING : ##BYou are about to be automatically banned for spam!"_s);
-        clif_displaymessage(sd->sess, "##1WARNING : ##BPlease slow down, do not repeat, and do not SHOUT!"_s);
+        clif_displaymessage(sd->sess, "WARNING : ##1##BYou are about to be automatically banned for spam!"_s);
+        clif_displaymessage(sd->sess, "WARNING : ##1##BPlease slow down, do not repeat, and do not SHOUT!"_s);
     }
 
     return 0;