diff options
| author | et65 <et65@ashbringer.fr> | 2015-04-06 17:42:16 +0200 |
|---|---|---|
| committer | et65 <et65@ashbringer.fr> | 2015-04-06 17:42:16 +0200 |
| commit | cffcf7ef4636e0cabffa51be86f85062ec6d2cd9 (patch) | |
| tree | 62d5aaf49470738ccc2172795d8f641f43357af2 /src/server/game/Scripting | |
| parent | 568a217c2dcf0e2bb1338e62e24b96db01d974f0 (diff) | |
Core/Guilds: Fix crash on kicking offline player of a guild.
Diffstat (limited to 'src/server/game/Scripting')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 8b05ec98fa5..1496ca988e5 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1354,9 +1354,9 @@ void ScriptMgr::OnGuildAddMember(Guild* guild, Player* player, uint8& plRank) FOREACH_SCRIPT(GuildScript)->OnAddMember(guild, player, plRank); } -void ScriptMgr::OnGuildRemoveMember(Guild* guild, Player* player, bool isDisbanding, bool isKicked) +void ScriptMgr::OnGuildRemoveMember(Guild* guild, ObjectGuid guid, bool isDisbanding, bool isKicked) { - FOREACH_SCRIPT(GuildScript)->OnRemoveMember(guild, player, isDisbanding, isKicked); + FOREACH_SCRIPT(GuildScript)->OnRemoveMember(guild, guid, isDisbanding, isKicked); } void ScriptMgr::OnGuildMOTDChanged(Guild* guild, const std::string& newMotd) diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 97f4c4e6bc9..2ac42dd1a63 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -814,7 +814,7 @@ class GuildScript : public ScriptObject virtual void OnAddMember(Guild* /*guild*/, Player* /*player*/, uint8& /*plRank*/) { } // Called when a member is removed from the guild. - virtual void OnRemoveMember(Guild* /*guild*/, Player* /*player*/, bool /*isDisbanding*/, bool /*isKicked*/) { } + virtual void OnRemoveMember(Guild* /*guild*/, ObjectGuid /*guid*/, bool /*isDisbanding*/, bool /*isKicked*/) { } // Called when the guild MOTD (message of the day) changes. virtual void OnMOTDChanged(Guild* /*guild*/, const std::string& /*newMotd*/) { } @@ -1101,7 +1101,7 @@ class ScriptMgr public: /* GuildScript */ void OnGuildAddMember(Guild* guild, Player* player, uint8& plRank); - void OnGuildRemoveMember(Guild* guild, Player* player, bool isDisbanding, bool isKicked); + void OnGuildRemoveMember(Guild* guild, ObjectGuid guid, bool isDisbanding, bool isKicked); void OnGuildMOTDChanged(Guild* guild, const std::string& newMotd); void OnGuildInfoChanged(Guild* guild, const std::string& newInfo); void OnGuildCreate(Guild* guild, Player* leader, const std::string& name); |