*Prevent guild members promoting other members to the rank of the person who is promoting by spam-clicking the promote button.

--HG--
branch : trunk

1 files changed, 4 insertions, 4 deletions

diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp
index ffb6d26676f..f3f9c6c6758 100644
--- a/src/game/GuildHandler.cpp
+++ b/src/game/GuildHandler.cpp
@@ -314,10 +314,6 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket)
 
     uint32 newRankId = slot->RankId < guild->GetNrRanks() ? slot->RankId-1 : guild->GetNrRanks()-1;
 
-    guild->ChangeRank(plGuid, newRankId);
-    // Put record into guildlog
-    guild->LogGuildEvent(GUILD_EVENT_LOG_PROMOTE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), newRankId);
-
     WorldPacket data(SMSG_GUILD_EVENT, (2+30));             // guess size
     data << (uint8)GE_PROMOTION;
     data << (uint8)3;
@@ -325,6 +321,10 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket)
     data << plName;
     data << guild->GetRankName(newRankId);
     guild->BroadcastPacket(&data);
+    
+    guild->ChangeRank(plGuid, newRankId);
+    // Put record into guildlog
+    guild->LogGuildEvent(GUILD_EVENT_LOG_PROMOTE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), newRankId);
 }
 
 void WorldSession::HandleGuildDemoteOpcode(WorldPacket& recvPacket)