aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <none@none>2010-12-18 23:16:55 +0100
committerShauren <none@none>2010-12-18 23:16:55 +0100
commit7196b880d6f28c4a98a026ab6f04dfcedb64e68d (patch)
tree041c6d55e28744f9983ec2d6ad846ba6c9b4c342 /src
parent3ad400ad1a7455942cdd5012704049ee2f3b65e2 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/server/game/AuctionHouse/AuctionHouseMgr.cpp4
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp2
-rwxr-xr-xsrc/server/game/Spells/Auras/SpellAuras.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 70c437af71b..ddfe50bb41a 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -39,15 +39,13 @@ enum eAuctionHouse
AH_MINIMUM_DEPOSIT = 100,
};
-using namespace std;
-
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;
}
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 39a64c1065d..7c619fcf2a8 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -5793,6 +5793,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
case 71169:
{
target = triggeredByAura->GetCaster();
+ if (!target)
+ return false;
Player* player = target->ToPlayer();
if (!player)
return false;
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index 711f8744d2e..fdedea53aa4 100755
--- a/src/server/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
@@ -1370,7 +1370,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
switch (GetSpellProto()->SpellFamilyName)
{
case SPELLFAMILY_GENERIC:
- switch(GetId())
+ switch (GetId())
{
case 50720: // Vigilance
if (apply)