josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Chat Commands: add name of GM (or Console) into output of gmannounce command (and also fix typo from previous commit)

Browse Source
This commit is contained in:
Az@zel
2011-05-11 12:58:50 +06:00
parent 52bc1e5fd3
commit 574f55382a
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/base/world_database.sql
+1 -1
View File
@@ -27723,7 +27723,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_
(6610, 'You cannot trade with characters lower than level %d.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(6611, 'You cannot send mail until you become level %d.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(6612, 'You cannot send mail to characters lower than level %d.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(6613, '|cfff00000[GM Announcement]: %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(6613, '|cfff00000[GM Announcement by [%s]]: %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(6614, 'Notification to GM''s - ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(6615, '|cffffff00[|c1f40af20GM Announce by|r |cffff0000%s|cffffff00]:|r %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(6616, 'Silence is ON for %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
sql/updates/world/2011_05_11_00_world_trinity_string.sql
+1
View File
@@ -0,0 +1 @@
UPDATE `trinity_string` SET `content_default` = '|cfff00000[GM Announcement by [%s]]: %s|r' WHERE `entry` = 6613;
src/server/game/Chat/Commands/Level1.cpp
+5 -1
View File
@@ -78,7 +78,11 @@ bool ChatHandler::HandleGMAnnounceCommand(const char* args)
if (!*args)
return false;
sWorld->SendGMText(LANG_GM_BROADCAST, args);
std::string name("Console");
if (Player* _player = m_session->GetPlayer())
name = _player->GetName();
sWorld->SendGMText(LANG_GM_BROADCAST, name.c_str(), args);
return true;
}
src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp
+1 -1
View File
@@ -748,7 +748,7 @@ class spell_shield_of_runes : public SpellScriptLoader
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* caster = GetCaster())
if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE)
if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE)
caster->CastSpell(caster, SPELL_SHIELD_OF_RUNES_BUFF, false);
}