diff options
| -rw-r--r-- | src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Spells/Auras/SpellAuras.cpp | 2 |
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) |