aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting/ScriptMgr.cpp
diff options
context:
space:
mode:
authorCarbenium <keresztesschmidt@gmail.com>2015-04-14 22:12:41 +0200
committerCarbenium <keresztesschmidt@gmail.com>2015-04-14 22:12:41 +0200
commitb273c5f1bff419cc9a108197f4d37a0e8a2bd816 (patch)
treecccb76b448f65872b57fab1e30a22f56bd5608fb /src/server/game/Scripting/ScriptMgr.cpp
parent6a27d813ceff53e4e7ba4d75f88e0c04b1966e48 (diff)
parentcffcf7ef4636e0cabffa51be86f85062ec6d2cd9 (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.cpp')
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp4
1 files changed, 2 insertions, 2 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)