Merge commit 'ccdc100d10143285bc058d968f0472ea4d073120' into 4.3.4
Conflicts: sql/updates/world/2015_01_09_01_world.sql sql/updates/world/2015_01_18_00_world.sql src/server/game/Entities/Unit/Unit.cpp src/server/scripts/Spells/spell_hunter.cpp src/server/scripts/Spells/spell_warlock.cpp src/tools/CMakeLists.txt
This commit is contained in:
commit
9d3b94f7f2
30 files changed
+310
-293
No files matched your search
@@ -3366,6 +3366,12 @@ void Unit::RemoveOwnedAura(Aura* aura, AuraRemoveMode removeMode)
|
||||
|
||||
ASSERT(aura->GetOwner() == this);
|
||||
|
||||
if (removeMode == AURA_REMOVE_NONE)
|
||||
{
|
||||
TC_LOG_ERROR("spells", "Unit::RemoveOwnedAura() called with unallowed removeMode AURA_REMOVE_NONE, spellId %u", aura->GetId());
|
||||
return;
|
||||
}
|
||||
|
||||
uint32 spellId = aura->GetId();
|
||||
AuraMapBoundsNonConst range = m_ownedAuras.equal_range(spellId);
|
||||
|
||||
@@ -8159,7 +8165,7 @@ int32 Unit::DealHeal(Unit* victim, uint32 addhealth)
|
||||
|
||||
bool Unit::IsMagnet() const
|
||||
{
|
||||
// Grounding Totem
|
||||
// Grounding Totem
|
||||
if (GetUInt32Value(UNIT_CREATED_BY_SPELL) == 8177) /// @todo: find a more generic solution
|
||||
return true;
|
||||
|
||||
|
||||
Reference in new issue
Block a user