From 6e01c0b0b4205f0d981ec658ae4d61b7e54fbab7 Mon Sep 17 00:00:00 2001 From: joschiwald Date: Wed, 15 Jan 2014 18:21:13 +0100 Subject: DB: update more creature templates --- sql/updates/world/2014_01_15_00_world_misc.sql | 116 +++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 sql/updates/world/2014_01_15_00_world_misc.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_15_00_world_misc.sql b/sql/updates/world/2014_01_15_00_world_misc.sql new file mode 100644 index 00000000000..b7c22edc3d9 --- /dev/null +++ b/sql/updates/world/2014_01_15_00_world_misc.sql @@ -0,0 +1,116 @@ +UPDATE `creature_template` SET `spell1`=66518, `spell2`=0 WHERE `entry`=34929; -- Alliance Gunship Cannon +UPDATE `creature_template` SET `spell1`=66218, `spell2`=66296, `spell8`=0, `unit_flags`=16384, `speed_walk`=2.8, `speed_run`=3.642857 WHERE `entry`=34793; -- Catapult +UPDATE `creature_template` SET `spell1`=66218, `spell2`=66296, `unit_flags`=16384, `speed_walk`=2.8, `speed_run`=3.642857 WHERE `entry`=35413; -- Catapult (1) +UPDATE `creature_template` SET `spell1`=67440, `spell2`=67441, `unit_flags`=16384 WHERE `entry`=34775; -- Demolisher +UPDATE `creature_template` SET `spell1`=68068, `spell2`=67442, `unit_flags`=16384 WHERE `entry`=35415; -- Demolisher (1) +UPDATE `creature_template` SET `spell1`=66456, `spell2`=67195, `faction_A`=1732, `faction_H`=1732, `unit_flags`=16384 WHERE `entry`=34802; -- Glaive Thrower (A) +UPDATE `creature_template` SET `spell1`=67034, `spell2`=67195, `faction_A`=1735, `faction_H`=1735, `unit_flags`=16384 WHERE `entry`=35273; -- Glaive Thrower (H) +UPDATE `creature_template` SET `spell1`=68826, `spell2`=69515, `faction_A`=1735, `faction_H`=1735, `unit_flags`=16384, `minlevel`=80, `maxlevel`=80, `speed_walk`=3.2, `speed_run`=1.14286 WHERE `entry`=35421; -- Glaive Thrower (1) (H) +UPDATE `creature_template` SET `spell1`=68827, `spell2`=69515, `faction_A`=1732, `faction_H`=1732, `unit_flags`=16384 WHERE `entry`=35419; -- Glaive Thrower (1) (A) +UPDATE `creature_template` SET `spell1`=66529, `spell2`=0 WHERE `entry`=34935; -- Horde Gunship Cannon +UPDATE `creature_template` SET `spell1`=67452, `spell2`=66541, `unit_flags`=16384 WHERE `entry`=34944; -- Keep Cannon -- sniff +UPDATE `creature_template` SET `spell1`=68170, `spell2`=68169, `unit_flags`=16384 WHERE `entry`=35429; -- Keep Cannon (1) +UPDATE `creature_template` SET `spell1`=67796, `spell2`=67797, `faction_A`=1735, `faction_H`=1735, `unit_flags`=16640 WHERE `entry`=35069; -- Siege Engine (H) +UPDATE `creature_template` SET `spell1`=67796, `spell2`=67797, `faction_A`=1732, `faction_H`=1732, `unit_flags`=16640 WHERE `entry`=34776; -- Siege Engine (A) +UPDATE `creature_template` SET `spell1`=67816, `spell2`=69502, `faction_A`=1735, `faction_H`=1735, `unit_flags`=16640, `speed_walk`=1.2, `speed_run`=1 WHERE `entry`=35433; -- Siege Engine (1) (H) +UPDATE `creature_template` SET `spell1`=67816, `spell2`=69502, `faction_A`=1732, `faction_H`=1732, `unit_flags`=16640 WHERE `entry`=35431; -- Siege Engine (1) (A) + +UPDATE `creature_template` SET `minlevel`=70, `maxlevel`=70, `spell1`=66186, `faction_A`=1732, `faction_H`=1732, `unit_flags`=16384, `VehicleId`=436 WHERE `entry`=34778; -- Flame Turret (A) +UPDATE `creature_template` SET `minlevel`=70, `maxlevel`=70, `spell1`=66186, `faction_A`=1735, `faction_H`=1735, `unit_flags`=16384 WHERE `entry`=36356; -- Flame Turret (H) +UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `spell1`=68832, `faction_A`=1732, `faction_H`=1732, `unit_flags`=16384 WHERE `entry`=35417; -- Flame Turret (1) (A) +UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `spell1`=68832, `faction_A`=1735, `faction_H`=1735, `unit_flags`=16384 WHERE `entry`=36358; -- Flame Turret (1) (H) + +UPDATE `creature_template` SET `difficulty_entry_1`=35417 WHERE `entry`=34778; -- Flame Turret (A) +UPDATE `creature_template` SET `difficulty_entry_1`=36358 WHERE `entry`=36356; -- Flame Turret (H) + +UPDATE `creature_template` SET `minlevel`=70, `maxlevel`=70, `spell1`=66203, `spell2`=67461, `faction_A`=1732, `faction_H`=1732, `unit_flags`=16384, `VehicleId`=436 WHERE `entry`=34777; -- Siege Turret (A) +UPDATE `creature_template` SET `minlevel`=70, `maxlevel`=70, `spell1`=66203, `spell2`=67461, `faction_A`=1735, `faction_H`=1735, `unit_flags`=16384 WHERE `entry`=36355; -- Siege Turret (H) +UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `spell1`=67462, `spell2`=69505, `faction_A`=1732, `faction_H`=1732, `unit_flags`=16384 WHERE `entry`=35436; -- Siege Turret (1) (A) +UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `spell1`=67462, `spell2`=69505, `faction_A`=1735, `faction_H`=1735, `unit_flags`=16384 WHERE `entry`=36357; -- Siege Turret (1) (H) + +UPDATE `creature_template` SET `difficulty_entry_1`=35436 WHERE `entry`=34777; -- Siege Turret (A) +UPDATE `creature_template` SET `difficulty_entry_1`=36357 WHERE `entry`=36355; -- Siege Turret (H) + +UPDATE `creature_template` SET `speed_walk`=1.2, `speed_run`=1.142857 WHERE `entry` IN (34778,36356,35417,36358,34777,36355,35436,36357); + +UPDATE `creature_template` SET `npcflag`=16777216, `baseattacktime`=2000, `rangeattacktime`=2000, `mechanic_immune_mask`=344276858 WHERE `entry` IN (34929,34793,35413,34775,35415,34802,35273,35421,35419,34935,34944,35429,35069,34776,35433,35431,34778,36356,35417,36358,34777,36355,35436,36357); + +DELETE FROM `vehicle_template_accessory` WHERE `entry` IN (34776,35069); +INSERT INTO `vehicle_template_accessory` (`entry`,`accessory_entry`,`seat_id`,`minion`,`description`,`summontype`,`summontimer`) VALUES +(34776,34778,1,1,'Siege Engine - Flame Turret',6,30000), +(34776,34778,2,1,'Siege Engine - Flame Turret',6,30000), +(34776,34777,7,1,'Siege Engine - Siege Turret',6,30000), +(35069,36356,1,1,'Siege Engine - Flame Turret',6,30000), +(35069,36356,2,1,'Siege Engine - Flame Turret',6,30000), +(35069,36355,7,1,'Siege Engine - Siege Turret',6,30000); + +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (34929,34793,35413,34775,35415,34802,35273,35421,35419,34935,34944,35429,35069,34776,35433,35431,34778,36356,35417,36358,34777,36355,35436,36357); +INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES +(34775,66245,1,0), +(34776,66245,1,0), +(34776,46598,1,0), -- accessorys +(34777,66245,1,0), +(34778,66245,1,0), +(34793,66245,1,0), +(34802,68503,1,0), +(34929,43671,1,0), +(34935,43671,1,0), +(34944,68458,1,0), +(35069,66245,1,0), +(35069,46598,1,0), -- accessorys +(35273,68503,1,0), +(35413,66245,1,0), +(35415,66245,1,0), +(35417,66245,1,0), +(35419,68503,1,0), +(35421,68503,1,0), +(35429,68458,1,0), +(35431,66245,1,0), +(35431,46598,1,0), -- accessorys +(35433,66245,1,0), +(35433,46598,1,0), -- accessorys +(35436,66245,1,0), +(36355,66245,1,0), +(36356,66245,1,0), +(36357,66245,1,0), +(36358,66245,1,0); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup` IN (34776,35069,35431,35433); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(18,34776,66245,0,0,31,0,4,0,0,0,0,0,'','Require player for spellclick'), +(18,34776,46598,0,0,31,0,3,0,0,0,0,0,'','Require unit for spellclick'), +(18,35069,66245,0,0,31,0,4,0,0,0,0,0,'','Require player for spellclick'), +(18,35069,46598,0,0,31,0,3,0,0,0,0,0,'','Require unit for spellclick'), +(18,35431,66245,0,0,31,0,4,0,0,0,0,0,'','Require player for spellclick'), +(18,35431,46598,0,0,31,0,3,0,0,0,0,0,'','Require unit for spellclick'), +(18,35433,66245,0,0,31,0,4,0,0,0,0,0,'','Require player for spellclick'), +(18,35433,46598,0,0,31,0,3,0,0,0,0,0,'','Require unit for spellclick'); + +UPDATE `gameobject_template` SET `flags`=40 WHERE `entry` IN (195121,195276); + + +UPDATE `creature_template` SET `faction_A`=1732, `faction_H`=1732 WHERE `entry`=28312; -- Wintergrasp Siege Engine (A) +UPDATE `creature_template` SET `faction_A`=1735, `faction_H`=1735 WHERE `entry`=32627; -- Wintergrasp Siege Engine (H) +UPDATE `creature_template` SET `faction_A`=1732, `faction_H`=1732 WHERE `entry`=28319; -- Wintergrasp Siege Turret (A) +UPDATE `creature_template` SET `faction_A`=1735, `faction_H`=1735 WHERE `entry`=32629; -- Wintergrasp Siege Turret (H) + +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (28312,32627,28319,32629); +INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES +(28312,60968,1,0), +(28312,46598,1,0), -- accessorys +(32627,60968,1,0), +(32627,46598,1,0), -- accessorys +(28319,60968,1,0), +(32629,60968,1,0); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup` IN (28312,32627,28319,32629); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(18,28312,60968,0,0,31,0,4,0,0,0,0,0,'','Require player for spellclick'), +(18,28312,46598,0,0,31,0,3,0,0,0,0,0,'','Require unit for spellclick'), +(18,32627,60968,0,0,31,0,4,0,0,0,0,0,'','Require player for spellclick'), +(18,32627,46598,0,0,31,0,3,0,0,0,0,0,'','Require unit for spellclick'); + + +UPDATE `creature_template` SET `faction_A`=71, `faction_H`=71, `unit_flags`=32768, `baseattacktime`=2000, `rangeattacktime`=2000 WHERE `entry`=5624; -- Undercity Guardian +UPDATE `creature_template` SET `faction_A`=14, `faction_H`=14 WHERE `entry`=25422; -- Mystical Webbing +UPDATE `creature_template` SET `faction_A`=2148, `faction_H`=2148 WHERE `entry`=27189; -- Unu'pe Spearman -- cgit v1.2.3 From 101cad1f2872a87be925b74b9d17760381bb9808 Mon Sep 17 00:00:00 2001 From: Zabustak Date: Thu, 2 Jan 2014 22:34:04 +0100 Subject: Show Kick, Mute and Ban in world --- sql/updates/world/2014_01_02_00_trinity_string.sql | 9 ++++++ src/server/game/Miscellaneous/Language.h | 12 ++++++++ src/server/game/World/World.cpp | 2 ++ src/server/game/World/World.h | 2 ++ src/server/scripts/Commands/cs_ban.cpp | 30 ++++++++++++++++---- src/server/scripts/Commands/cs_misc.cpp | 32 ++++++++++++++++------ src/server/worldserver/worldserver.conf.dist | 17 ++++++++++++ 7 files changed, 91 insertions(+), 13 deletions(-) create mode 100644 sql/updates/world/2014_01_02_00_trinity_string.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_02_00_trinity_string.sql b/sql/updates/world/2014_01_02_00_trinity_string.sql new file mode 100644 index 00000000000..ae9943de179 --- /dev/null +++ b/sql/updates/world/2014_01_02_00_trinity_string.sql @@ -0,0 +1,9 @@ + +DELETE FROM trinity_string where entry in (11002, 11003, 11004, 11005, 11006, 11007); +INSERT INTO `trinity_string` VALUES +('11002', 'Server: %s has kicked %s, reason: %s', '', '', '', '', '', '', '', ''), +('11003', 'Server: %s has muted %s for %u minutes, reason: %s', '', '', '', '', '', '', '', ''), +('11004', 'Server: %s has banned character %s for %s, reason: %s', '', '', '', '', '', '', '', ''), +('11005', 'Server: %s has banned character %s permanetly, reason: %s', '', '', '', '', '', '', '', ''), +('11006', 'Server: %s has banned %s for %s, reason: %s', '', '', '', '', '', '', '', ''), +('11007', 'Server: %s has banned %s permanetly, reason: %s', '', '', '', '', '', '', '', ''); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 6f380d42fda..3102e2c6854 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1215,6 +1215,18 @@ enum TrinityStrings LANG_AUTO_BROADCAST = 11000, LANG_INVALID_REALMID = 11001, + // Show Kick in world + LANG_COMMAND_KICKMESSAGE_WORLD = 11002, + + // Show Mute in world + LANG_COMMAND_MUTEMESSAGE_WORLD = 11003, + + // Show Ban in world + LANG_BAN_CHARACTER_YOUBANNEDMESSAGE_WORLD = 11004, + LANG_BAN_CHARACTER_YOUPERMBANNEDMESSAGE_WORLD = 11005, + LANG_BAN_ACCOUNT_YOUBANNEDMESSAGE_WORLD = 11006, + LANG_BAN_ACCOUNT_YOUPERMBANNEDMESSAGE_WORLD = 11007, + // NOT RESERVED IDS 12000-1999999999 // `db_script_string` table index 2000000000-2000009999 (MIN_DB_SCRIPT_STRING_ID-MAX_DB_SCRIPT_STRING_ID) // For other tables maybe 2000010000-2147483647 (max index) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 3658130db3d..d5bd0974922 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1173,6 +1173,8 @@ void World::LoadConfigSettings(bool reload) m_bool_configs[CONFIG_NO_RESET_TALENT_COST] = sConfigMgr->GetBoolDefault("NoResetTalentsCost", false); m_bool_configs[CONFIG_SHOW_KICK_IN_WORLD] = sConfigMgr->GetBoolDefault("ShowKickInWorld", false); + m_bool_configs[CONFIG_SHOW_MUTE_IN_WORLD] = sConfigMgr->GetBoolDefault("ShowMuteInWorld", false); + m_bool_configs[CONFIG_SHOW_BAN_IN_WORLD] = sConfigMgr->GetBoolDefault("ShowBanInWorld", false); m_int_configs[CONFIG_INTERVAL_LOG_UPDATE] = sConfigMgr->GetIntDefault("RecordUpdateTimeDiffInterval", 60000); m_int_configs[CONFIG_MIN_LOG_UPDATE] = sConfigMgr->GetIntDefault("MinRecordUpdateTimeDiff", 100); m_int_configs[CONFIG_NUMTHREADS] = sConfigMgr->GetIntDefault("MapUpdate.Threads", 1); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 080c9d9006b..8c8aebf97d9 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -137,6 +137,8 @@ enum WorldBoolConfigs CONFIG_PVP_TOKEN_ENABLE, CONFIG_NO_RESET_TALENT_COST, CONFIG_SHOW_KICK_IN_WORLD, + CONFIG_SHOW_MUTE_IN_WORLD, + CONFIG_SHOW_BAN_IN_WORLD, CONFIG_CHATLOG_CHANNEL, CONFIG_CHATLOG_WHISPER, CONFIG_CHATLOG_SYSCHAN, diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index c32a03f9bd8..b1a3dd4bca5 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -114,9 +114,19 @@ public: case BAN_SUCCESS: { if (atoi(durationStr) > 0) - handler->PSendSysMessage(LANG_BAN_YOUBANNED, name.c_str(), secsToTimeString(TimeStringToSecs(durationStr), true).c_str(), reasonStr); + { + if (sWorld->getBoolConfig(CONFIG_SHOW_BAN_IN_WORLD)) + sWorld->SendWorldText(LANG_BAN_CHARACTER_YOUBANNEDMESSAGE_WORLD, (handler->GetSession() ? handler->GetSession()->GetPlayerName().c_str() : "Server"), name.c_str(), secsToTimeString(TimeStringToSecs(durationStr), true).c_str(), reasonStr); + else + handler->PSendSysMessage(LANG_BAN_YOUBANNED, name.c_str(), secsToTimeString(TimeStringToSecs(durationStr), true).c_str(), reasonStr); + } else - handler->PSendSysMessage(LANG_BAN_YOUPERMBANNED, name.c_str(), reasonStr); + { + if (sWorld->getBoolConfig(CONFIG_SHOW_BAN_IN_WORLD)) + sWorld->SendWorldText(LANG_BAN_CHARACTER_YOUPERMBANNEDMESSAGE_WORLD, (handler->GetSession() ? handler->GetSession()->GetPlayerName().c_str() : "Server"), name.c_str(), reasonStr); + else + handler->PSendSysMessage(LANG_BAN_YOUPERMBANNED, name.c_str(), reasonStr); + } break; } case BAN_NOTFOUND: @@ -189,9 +199,19 @@ public: { case BAN_SUCCESS: if (atoi(durationStr) > 0) - handler->PSendSysMessage(LANG_BAN_YOUBANNED, nameOrIP.c_str(), secsToTimeString(TimeStringToSecs(durationStr), true).c_str(), reasonStr); - else - handler->PSendSysMessage(LANG_BAN_YOUPERMBANNED, nameOrIP.c_str(), reasonStr); + { + if (sWorld->getBoolConfig(CONFIG_SHOW_BAN_IN_WORLD)) + sWorld->SendWorldText(LANG_BAN_ACCOUNT_YOUBANNEDMESSAGE_WORLD, (handler->GetSession() ? handler->GetSession()->GetPlayerName().c_str() : "Server"), nameOrIP.c_str(), secsToTimeString(TimeStringToSecs(durationStr), true).c_str(), reasonStr); + else + handler->PSendSysMessage(LANG_BAN_YOUBANNED, nameOrIP.c_str(), secsToTimeString(TimeStringToSecs(durationStr), true).c_str(), reasonStr); + } + else + { + if (sWorld->getBoolConfig(CONFIG_SHOW_BAN_IN_WORLD)) + sWorld->SendWorldText(LANG_BAN_ACCOUNT_YOUPERMBANNEDMESSAGE_WORLD, (handler->GetSession() ? handler->GetSession()->GetPlayerName().c_str() : "Server"), nameOrIP.c_str(), reasonStr); + else + handler->PSendSysMessage(LANG_BAN_YOUPERMBANNED, nameOrIP.c_str(), reasonStr); + } break; case BAN_SYNTAX_ERROR: return false; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 796416b4031..1b8f50b5eab 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -808,12 +808,16 @@ public: if (handler->HasLowerSecurity(target, 0)) return false; - if (sWorld->getBoolConfig(CONFIG_SHOW_KICK_IN_WORLD)) - sWorld->SendWorldText(LANG_COMMAND_KICKMESSAGE, playerName.c_str()); - else - handler->PSendSysMessage(LANG_COMMAND_KICKMESSAGE, playerName.c_str()); + char const* kickReason = strtok(NULL, "\r"); + std::string kickReasonStr = "No reason"; + if (kickReason != NULL) + kickReasonStr = kickReason; - target->GetSession()->KickPlayer(); + if (sWorld->getBoolConfig(CONFIG_SHOW_KICK_IN_WORLD)) + sWorld->SendWorldText(LANG_COMMAND_KICKMESSAGE_WORLD, (handler->GetSession() ? handler->GetSession()->GetPlayerName().c_str() : "Server"), playerName.c_str(), kickReasonStr.c_str()); + else + handler->PSendSysMessage(LANG_COMMAND_KICKMESSAGE, playerName.c_str()); + target->GetSession()->KickPlayer(); return true; } @@ -1835,7 +1839,17 @@ public: int64 muteTime = time(NULL) + notSpeakTime * MINUTE; target->GetSession()->m_muteTime = muteTime; stmt->setInt64(0, muteTime); - ChatHandler(target->GetSession()).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notSpeakTime, muteBy.c_str(), muteReasonStr.c_str()); + std::string nameLink = handler->playerLink(targetName); + + if (sWorld->getBoolConfig(CONFIG_SHOW_MUTE_IN_WORLD)) + { + sWorld->SendWorldText(LANG_COMMAND_MUTEMESSAGE_WORLD, (handler->GetSession() ? handler->GetSession()->GetPlayerName().c_str() : "Server"), nameLink.c_str(), notSpeakTime, muteReasonStr.c_str()); + ChatHandler(target->GetSession()).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notSpeakTime, muteBy.c_str(), muteReasonStr.c_str()); + } + else + { + ChatHandler(target->GetSession()).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notSpeakTime, muteBy.c_str(), muteReasonStr.c_str()); + } } else { @@ -1850,8 +1864,10 @@ public: LoginDatabase.Execute(stmt); std::string nameLink = handler->playerLink(targetName); - handler->PSendSysMessage(target ? LANG_YOU_DISABLE_CHAT : LANG_COMMAND_DISABLE_CHAT_DELAYED, nameLink.c_str(), notSpeakTime, muteReasonStr.c_str()); - + if (sWorld->getBoolConfig(CONFIG_SHOW_MUTE_IN_WORLD) && !target) + sWorld->SendWorldText(LANG_COMMAND_MUTEMESSAGE_WORLD, handler->GetSession()->GetPlayerName().c_str(), nameLink.c_str(), notSpeakTime, muteReasonStr.c_str()); + else + handler->PSendSysMessage(target ? LANG_YOU_DISABLE_CHAT : LANG_COMMAND_DISABLE_CHAT_DELAYED, nameLink.c_str(), notSpeakTime, muteReasonStr.c_str()); return true; } diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 1e6d7d92ddc..2a47c8f989e 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2560,6 +2560,23 @@ Guild.AllowMultipleGuildMaster = 0 ShowKickInWorld = 0 +# ShowMuteInWorld +# Description: Determines whether a message is broadcasted to the entire server when a +# player gets muted. +# Default: 0 - (Disabled) +# 1 - (Enabled) + +ShowMuteInWorld = 0 + +# +# ShowBanInWorld +# Description: Determines whether a message is broadcasted to the entire server when a +# player gets banned. +# Default: 0 - (Disabled) +# 1 - (Enabled) + +ShowBanInWorld = 0 + # # RecordUpdateTimeDiffInterval # Description: Time (in milliseconds) update time diff is written to the log file. -- cgit v1.2.3 From ea740deb263afcdd3105c05ed304ad7818bdf434 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 17 Jan 2014 12:29:48 +0100 Subject: Rename 2014_01_02_00_trinity_string.sql to 2014_01_17_00_trinity_string.sql --- sql/updates/world/2014_01_02_00_trinity_string.sql | 9 --------- sql/updates/world/2014_01_17_00_trinity_string.sql | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 sql/updates/world/2014_01_02_00_trinity_string.sql create mode 100644 sql/updates/world/2014_01_17_00_trinity_string.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_02_00_trinity_string.sql b/sql/updates/world/2014_01_02_00_trinity_string.sql deleted file mode 100644 index ae9943de179..00000000000 --- a/sql/updates/world/2014_01_02_00_trinity_string.sql +++ /dev/null @@ -1,9 +0,0 @@ - -DELETE FROM trinity_string where entry in (11002, 11003, 11004, 11005, 11006, 11007); -INSERT INTO `trinity_string` VALUES -('11002', 'Server: %s has kicked %s, reason: %s', '', '', '', '', '', '', '', ''), -('11003', 'Server: %s has muted %s for %u minutes, reason: %s', '', '', '', '', '', '', '', ''), -('11004', 'Server: %s has banned character %s for %s, reason: %s', '', '', '', '', '', '', '', ''), -('11005', 'Server: %s has banned character %s permanetly, reason: %s', '', '', '', '', '', '', '', ''), -('11006', 'Server: %s has banned %s for %s, reason: %s', '', '', '', '', '', '', '', ''), -('11007', 'Server: %s has banned %s permanetly, reason: %s', '', '', '', '', '', '', '', ''); diff --git a/sql/updates/world/2014_01_17_00_trinity_string.sql b/sql/updates/world/2014_01_17_00_trinity_string.sql new file mode 100644 index 00000000000..698af0f56cb --- /dev/null +++ b/sql/updates/world/2014_01_17_00_trinity_string.sql @@ -0,0 +1,8 @@ +DELETE FROM trinity_string where entry in (11002, 11003, 11004, 11005, 11006, 11007); +INSERT INTO `trinity_string` VALUES +('11002', 'Server: %s has kicked %s, reason: %s', '', '', '', '', '', '', '', ''), +('11003', 'Server: %s has muted %s for %u minutes, reason: %s', '', '', '', '', '', '', '', ''), +('11004', 'Server: %s has banned character %s for %s, reason: %s', '', '', '', '', '', '', '', ''), +('11005', 'Server: %s has banned character %s permanetly, reason: %s', '', '', '', '', '', '', '', ''), +('11006', 'Server: %s has banned %s for %s, reason: %s', '', '', '', '', '', '', '', ''), +('11007', 'Server: %s has banned %s permanetly, reason: %s', '', '', '', '', '', '', '', ''); -- cgit v1.2.3