Core/Spells: Fixed possible crashes in Shadow's Fate proc (71169) introduced in r91073dc6ace3
Core/AuctionHouse: Removed "using namespace std" and fixed crash in AuctionHouseMgr destructor Closes issue #5132. Closes issue #5134. --HG-- branch : trunk
This commit is contained in:
@@ -39,15 +39,13 @@ enum eAuctionHouse
|
|||||||
AH_MINIMUM_DEPOSIT = 100,
|
AH_MINIMUM_DEPOSIT = 100,
|
||||||
};
|
};
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
|
|
||||||
AuctionHouseMgr::AuctionHouseMgr()
|
AuctionHouseMgr::AuctionHouseMgr()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
AuctionHouseMgr::~AuctionHouseMgr()
|
AuctionHouseMgr::~AuctionHouseMgr()
|
||||||
{
|
{
|
||||||
for (ItemMap::const_iterator itr = mAitems.begin(); itr != mAitems.end(); ++itr)
|
for (ItemMap::iterator itr = mAitems.begin(); itr != mAitems.end(); ++itr)
|
||||||
delete itr->second;
|
delete itr->second;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5793,6 +5793,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
|
|||||||
case 71169:
|
case 71169:
|
||||||
{
|
{
|
||||||
target = triggeredByAura->GetCaster();
|
target = triggeredByAura->GetCaster();
|
||||||
|
if (!target)
|
||||||
|
return false;
|
||||||
Player* player = target->ToPlayer();
|
Player* player = target->ToPlayer();
|
||||||
if (!player)
|
if (!player)
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -1370,7 +1370,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
|
|||||||
switch (GetSpellProto()->SpellFamilyName)
|
switch (GetSpellProto()->SpellFamilyName)
|
||||||
{
|
{
|
||||||
case SPELLFAMILY_GENERIC:
|
case SPELLFAMILY_GENERIC:
|
||||||
switch(GetId())
|
switch (GetId())
|
||||||
{
|
{
|
||||||
case 50720: // Vigilance
|
case 50720: // Vigilance
|
||||||
if (apply)
|
if (apply)
|
||||||
|
|||||||
Reference in New Issue
Block a user