diff options
| author | Carbenium <keresztesschmidt@gmail.com> | 2015-04-14 22:12:41 +0200 |
|---|---|---|
| committer | Carbenium <keresztesschmidt@gmail.com> | 2015-04-14 22:12:41 +0200 |
| commit | b273c5f1bff419cc9a108197f4d37a0e8a2bd816 (patch) | |
| tree | cccb76b448f65872b57fab1e30a22f56bd5608fb /src/server/game/Scripting/ScriptMgr.h | |
| parent | 6a27d813ceff53e4e7ba4d75f88e0c04b1966e48 (diff) | |
| parent | cffcf7ef4636e0cabffa51be86f85062ec6d2cd9 (diff) | |
Merge pull request #14508 from et65/6.x
Core/Guilds: Fix crash on kicking offline player of a guild.
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.h')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |