diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-05-30 12:09:28 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-05-30 12:09:28 +0200 |
| commit | 12d59623fff5fe88d2fff0e8ddcabad7bec62c71 (patch) | |
| tree | 788173f7a0dee5cc363994086f7df2c3ae2651a8 /src | |
| parent | 675ad4438bfe5e8405f2c02eb1acaae893d524d9 (diff) | |
| parent | e9c9bee8b10c8bc012891cdb90dc703a365e61df (diff) | |
Merge pull request #14803 from DJScias/guildinvitefix
Core/Guilds: Disallow sending invite to people already in a guild
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 0225c9405ce..d4c6a0a680d 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1602,11 +1602,11 @@ void Guild::HandleInviteMember(WorldSession* session, std::string const& name) } // Invited player cannot be in another guild - /*if (pInvitee->GetGuildId()) + if (pInvitee->GetGuildId()) { SendCommandResult(session, GUILD_COMMAND_INVITE_PLAYER, ERR_ALREADY_IN_GUILD_S, name); return; - }*/ + } // Invited player cannot be invited if (pInvitee->GetGuildIdInvited()) |