aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorForesterDev <11771800+ForesterDev@users.noreply.github.com>2019-04-24 18:58:56 +0400
committerShauren <shauren.trinity@gmail.com>2021-12-02 00:39:20 +0100
commita2c0f6d32113c8ff42760c389826bad80ce77815 (patch)
tree93391129d5446e1de98f6c42fd55b4c47a914ca6 /src
parent93a9ee9c1217d6a0b3388ce0237778585c5db4e6 (diff)
Scripts/Commands: add some missing checks for .guild create command (#23201)
* Core/Conditions: implement CONDITION_GAMEMASTER * Scripts/Commands: add some missing checks for .guild create command (cherry picked from commit ae8750716f63ddc41f21bb38ceafe949d7260f0e)
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Commands/cs_guild.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp
index 870089f5da7..7e6e2714e35 100644
--- a/src/server/scripts/Commands/cs_guild.cpp
+++ b/src/server/scripts/Commands/cs_guild.cpp
@@ -90,7 +90,22 @@ public:
if (target->GetGuildId())
{
handler->SendSysMessage(LANG_PLAYER_IN_GUILD);
- return true;
+ handler->SetSentErrorMessage(true);
+ return false;
+ }
+
+ if (sGuildMgr->GetGuildByName(guildName))
+ {
+ handler->SendSysMessage(LANG_GUILD_RENAME_ALREADY_EXISTS);
+ handler->SetSentErrorMessage(true);
+ return false;
+ }
+
+ if (sObjectMgr->IsReservedName(guildName) || !sObjectMgr->IsValidCharterName(guildName))
+ {
+ handler->SendSysMessage(LANG_BAD_VALUE);
+ handler->SetSentErrorMessage(true);
+ return false;
}
Guild* guild = new Guild;