aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJScias <DJScias@gmail.com>2015-05-30 03:23:05 +0200
committerDJScias <DJScias@gmail.com>2015-05-30 12:08:06 +0200
commite9c9bee8b10c8bc012891cdb90dc703a365e61df (patch)
tree788173f7a0dee5cc363994086f7df2c3ae2651a8
parent675ad4438bfe5e8405f2c02eb1acaae893d524d9 (diff)
Core/Guilds: Disallow sending invite to people already in a guild
- In the case this would happen the player was able to join two (or more) guilds and bug themself out heavily - If the player declined the invite, they instead were removed from their current guild until restart, this allowed the above to loop endlessly
-rw-r--r--src/server/game/Guilds/Guild.cpp4
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())