diff options
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_guild.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index 0359cbbe379..9f65ec46958 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -247,16 +247,12 @@ public: static bool HandleGuildInfoCommand(ChatHandler* handler, char const* args) { - Player* target; - uint32 guildId; - std::string guildName; - std::string guildMasterName; - Guild* guild; + Guild* guild = nullptr; if (!*args) { // Look for the guild of the selected player or ourselves - if (target = handler->getSelectedPlayerOrSelf()) + if (Player* target = handler->getSelectedPlayerOrSelf()) guild = target->GetGuild(); else // getSelectedPlayerOrSelf will return null if there is no session @@ -264,7 +260,7 @@ public: // without specifying args. return false; } - else if (guildId = atoi(args)) // Try searching by Id + else if (uint32 guildId = atoi(args)) // Try searching by Id guild = sGuildMgr->GetGuildById(guildId); else { @@ -277,13 +273,15 @@ public: if (!guildStr) return false; - guildName = guildStr; + std::string guildName = guildStr; guild = sGuildMgr->GetGuildByName(guildName); } if (!guild) return false; + std::string guildMasterName; + // Display Guild Information handler->PSendSysMessage(LANG_GUILD_INFO_NAME, guild->GetName().c_str(), guild->GetId()); // Guild Id + Name if (sObjectMgr->GetPlayerNameByGUID(guild->GetLeaderGUID(), guildMasterName)) |