Merge branch 'master' into Playerbot
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -87,6 +87,7 @@ public:
|
|||||||
|
|
||||||
Milliseconds GetMarkRepeatTimer()
|
Milliseconds GetMarkRepeatTimer()
|
||||||
{
|
{
|
||||||
|
++_markCounter;
|
||||||
Milliseconds timer = 45000ms - (5000ms * _markCounter);
|
Milliseconds timer = 45000ms - (5000ms * _markCounter);
|
||||||
if (timer <= 10000ms)
|
if (timer <= 10000ms)
|
||||||
return 10000ms;
|
return 10000ms;
|
||||||
@@ -160,7 +161,7 @@ public:
|
|||||||
{
|
{
|
||||||
Unit* target = GetTarget();
|
Unit* target = GetTarget();
|
||||||
|
|
||||||
if (target->GetPower(POWER_MANA) < aurEff->GetBaseAmount())
|
if ((int32)target->GetPower(POWER_MANA) < aurEff->GetBaseAmount())
|
||||||
{
|
{
|
||||||
target->CastSpell(target, SPELL_MARK_DAMAGE, true, nullptr, aurEff);
|
target->CastSpell(target, SPELL_MARK_DAMAGE, true, nullptr, aurEff);
|
||||||
// Remove aura
|
// Remove aura
|
||||||
|
|||||||
Reference in New Issue
Block a user