aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/base/world_database.sql2
-rw-r--r--sql/updates/9077_world_trinity_string.sql1
-rw-r--r--src/server/game/Chat/Commands/Level1.cpp4
3 files changed, 5 insertions, 2 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 760a451980e..7720b40f901 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -14690,7 +14690,7 @@ LOCK TABLES `trinity_string` WRITE;
INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES
(1, 'You should select a character or a creature.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(2, 'You should select a creature.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(3, '|cffff0000[System Message]: %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(3, '[SERVER] %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(4, '|cffff0000[Event Message]: %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5, 'There is no help for that command', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(6, 'There is no such command', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
diff --git a/sql/updates/9077_world_trinity_string.sql b/sql/updates/9077_world_trinity_string.sql
new file mode 100644
index 00000000000..1360e3c4539
--- /dev/null
+++ b/sql/updates/9077_world_trinity_string.sql
@@ -0,0 +1 @@
+UPDATE `trinity_string` SET `content_default`='[SERVER] %s' WHERE `entry`=3;
diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp
index 771339645fe..40269fb0be2 100644
--- a/src/server/game/Chat/Commands/Level1.cpp
+++ b/src/server/game/Chat/Commands/Level1.cpp
@@ -164,7 +164,9 @@ bool ChatHandler::HandleAnnounceCommand(const char* args)
if (!*args)
return false;
- sWorld.SendWorldText(LANG_SYSTEMMESSAGE,args);
+ char buff[2048];
+ sprintf(buff, GetTrinityString(LANG_SYSTEMMESSAGE), args);
+ sWorld.SendServerMessage(SERVER_MSG_STRING, buff);
return true;
}