Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripts/Commands: add some missing checks for .guild create command

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/a2c0f6d32113c8ff42760c389826bad80ce77815)
This commit is contained in:
hondacrx
2021-12-01 20:50:03 -05:00
parent 34144e11b0
commit 36f037db38
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/GuildCommands.cs
+16 -4
View File
@@ -35,18 +35,30 @@ namespace Game.Chat
if (!handler.ExtractPlayerTarget(args[0] != '"' ? args : null, out target)) if (!handler.ExtractPlayerTarget(args[0] != '"' ? args : null, out target))
return false; return false;
string guildname = handler.ExtractQuotedArg(args.NextString()); string guildName = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(guildname)) if (string.IsNullOrEmpty(guildName))
return false; return false;
if (target.GetGuildId() != 0) if (target.GetGuildId() != 0)
{ {
handler.SendSysMessage(CypherStrings.PlayerInGuild); handler.SendSysMessage(CypherStrings.PlayerInGuild);
return true; return false;
}
if (Global.GuildMgr.GetGuildByName(guildName))
{
handler.SendSysMessage(CypherStrings.GuildRenameAlreadyExists);
return false;
}
if (Global.ObjectMgr.IsReservedName(guildName) || !ObjectManager.IsValidCharterName(guildName))
{
handler.SendSysMessage(CypherStrings.BadValue);
return false;
} }
Guild guild = new(); Guild guild = new();
if (!guild.Create(target, guildname)) if (!guild.Create(target, guildName))
{ {
handler.SendSysMessage(CypherStrings.GuildNotCreated); handler.SendSysMessage(CypherStrings.GuildNotCreated);
return false; return false;