From f2578c0e7403448ca74bfeeb2f0573a68dcd247c Mon Sep 17 00:00:00 2001 From: Schmoozerd Date: Fri, 10 Aug 2012 22:55:35 +0200 Subject: [PATCH] [12085] Fix a bug with SCRIPT_COMMAND_KILL_CREDIT This bug can happen if a (group) kill credit is provided without involved creature. Thanks to Atari for pointing! --- src/game/Player.cpp | 4 +++- src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index f0df4309a..ffad1c373 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -21070,6 +21070,8 @@ void Player::RewardSinglePlayerAtKill(Unit* pVictim) void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewardSource) { + MANGOS_ASSERT((!GetGroup() || pRewardSource) && "Player::RewardPlayerAndGroupAtEvent called for Group-Case but no source for range searching provided"); + ObjectGuid creature_guid = pRewardSource && pRewardSource->GetTypeId() == TYPEID_UNIT ? pRewardSource->GetObjectGuid() : ObjectGuid(); // prepare data for near group iteration @@ -21082,7 +21084,7 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar continue; if (!pGroupGuy->IsAtGroupRewardDistance(pRewardSource)) - continue; // member (alive or dead) or his corpse at req. distance + continue; // member (alive or dead) or his corpse at req. distance // quest objectives updated only for alive group member or dead but with not released body if (pGroupGuy->isAlive() || !pGroupGuy->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 9d01354f2..95dd52884 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12084" + #define REVISION_NR "12085" #endif // __REVISION_NR_H__