Merge remote-tracking branch 'tc/3.3.5' into 4.3.4

Conflicts:
	sql/updates/world/2015_11_09_02_world335.sql
	sql/updates/world/2015_11_09_02_world_335.sql
	sql/updates/world/2015_11_11_24_world_from_335_was_2015_11_09_02_world.sql
	sql/updates/world/2015_12_16_02_world335.sql
	sql/updates/world/2015_12_16_02_world_335.sql
	sql/updates/world/2015_12_18_19_world_from_335_was_2015_12_16_02_world_335.sql
	sql/updates/world/2016_01_02_00_world335.sql
	sql/updates/world/2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_04_28_world_from_335_was_2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_10_05_world335.sql
	sql/updates/world/2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_12_01_world335.sql
	sql/updates/world/2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_12_02_world335.sql
	sql/updates/world/2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_14_12_world_from_335_was_2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_14_14_world_from_335_was_2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_14_15_world_from_335_was_2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_15_00_world.sql
	sql/updates/world/2016_01_17_10_world.sql
	sql/updates/world/2016_01_17_11_world.sql
	sql/updates/world/2016_01_17_12_world.sql
	sql/updates/world/2016_01_17_13_world.sql
	sql/updates/world/2016_01_17_14_world.sql
	sql/updates/world/2016_01_17_15_world.sql
	sql/updates/world/2016_01_18_00_world.sql
	sql/updates/world/2016_01_19_00_world.sql
	sql/updates/world/2016_01_19_01_world.sql
	sql/updates/world/2016_01_19_02_world.sql
	sql/updates/world/2016_01_19_03_world.sql
	src/server/scripts/Spells/spell_paladin.cpp
This commit is contained in:
ariel- committed 2016-01-19 22:24:14 -03:00
commit 67bb4c0c3c
26 files changed
+1684 -793

No files matched your search

+24 -2
View File
@@ -157,6 +157,28 @@ ProcEventInfo::ProcEventInfo(Unit* actor, Unit* actionTarget, Unit* procTarget,
_damageInfo(damageInfo), _healInfo(healInfo)
{ }
SpellInfo const* ProcEventInfo::GetSpellInfo() const
{
if (_spell)
return _spell->GetSpellInfo();
if (_damageInfo)
return _damageInfo->GetSpellInfo();
if (_healInfo)
return _healInfo->GetSpellInfo();
return nullptr;
}
SpellSchoolMask ProcEventInfo::GetSchoolMask() const
{
if (_spell)
return _spell->GetSpellInfo()->GetSchoolMask();
if (_damageInfo)
return _damageInfo->GetSchoolMask();
if (_healInfo)
return _healInfo->GetSchoolMask();
return SPELL_SCHOOL_MASK_NONE;
}
Unit::Unit(bool isWorldObject) :
WorldObject(isWorldObject), m_movedPlayer(NULL), m_lastSanctuaryTime(0),
IsAIEnabled(false), NeedChangeAI(false), LastCharmerGUID(),
@@ -12556,8 +12578,8 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
Unit* actionTarget = !isVictim ? target : this;
DamageInfo damageInfo = DamageInfo(actor, actionTarget, damage, procSpell, procSpell ? SpellSchoolMask(procSpell->SchoolMask) : SPELL_SCHOOL_MASK_NORMAL, SPELL_DIRECT_DAMAGE);
HealInfo healInfo = HealInfo(damage);
ProcEventInfo eventInfo = ProcEventInfo(actor, actionTarget, target, procFlag, 0, 0, procExtra, NULL, &damageInfo, &healInfo);
HealInfo healInfo = HealInfo(actor, actionTarget, damage, procSpell, procSpell ? SpellSchoolMask(procSpell->SchoolMask) : SPELL_SCHOOL_MASK_NORMAL);
ProcEventInfo eventInfo = ProcEventInfo(actor, actionTarget, target, procFlag, 0, 0, procExtra, nullptr, &damageInfo, &healInfo);
ProcTriggeredList procTriggered;
// Fill procTriggered list