Merge branch 'master' into 4.3.4
Conflicts: src/server/game/Battlefield/Zones/BattlefieldWG.cpp src/server/game/Conditions/ConditionMgr.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/SpellEffects.cpp src/server/scripts/EasternKingdoms/stormwind_city.cpp src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp src/server/scripts/Kalimdor/azshara.cpp
This commit is contained in:
commit
8ae0f2332c
67 files changed
+3559
-1434
No files matched your search
@@ -5123,12 +5123,11 @@ void Spell::EffectDurabilityDamage(SpellEffIndex effIndex)
|
||||
|
||||
int32 slot = m_spellInfo->Effects[effIndex].MiscValue;
|
||||
|
||||
// FIXME: some spells effects have value -1/-2
|
||||
// Possibly its mean -1 all player equipped items and -2 all items
|
||||
// -1 means all player equipped items and -2 all items
|
||||
if (slot < 0)
|
||||
{
|
||||
unitTarget->ToPlayer()->DurabilityPointsLossAll(damage, (slot < -1));
|
||||
ExecuteLogEffectDurabilityDamage(effIndex, unitTarget, -1, -1); // -1 -1 pair triggers SPELL_DURABILITY_DAMAGE_ALL event
|
||||
ExecuteLogEffectDurabilityDamage(effIndex, unitTarget, -1, -1);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user