nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-30 00:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Gargoyle dk being feared/confused properly

Browse Source
This commit is contained in:
Yehonal
2016-08-07 12:37:54 +02:00
parent 88700a7c8c
commit 10699894e8
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/scripts/Pet/pet_dk.cpp
View File

@@ -94,8 +94,17 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript
Unit* owner = me->GetOwner(); Unit* owner = me->GetOwner();
if (owner && owner->GetTypeId() == TYPEID_PLAYER && (!me->GetVictim() || me->GetVictim()->IsImmunedToSpell(sSpellMgr->GetSpellInfo(51963)) || !me->IsValidAttackTarget(me->GetVictim()) || !owner->CanSeeOrDetect(me->GetVictim()))) if (owner && owner->GetTypeId() == TYPEID_PLAYER && (!me->GetVictim() || me->GetVictim()->IsImmunedToSpell(sSpellMgr->GetSpellInfo(51963)) || !me->IsValidAttackTarget(me->GetVictim()) || !owner->CanSeeOrDetect(me->GetVictim())))
{ {
Unit* selection = owner->ToPlayer()->GetSelectedUnit(); Unit* ghoulTarget = ObjectAccessor::GetUnit(*me, GetGhoulTargetGUID());
if (selection && selection != me->GetVictim() && me->IsValidAttackTarget(selection)) Unit* dkTarget = owner->ToPlayer()->GetSelectedUnit();
if (ghoulTarget && ghoulTarget != me->GetVictim() && me->IsValidAttackTarget(ghoulTarget))
{
me->GetMotionMaster()->Clear(false);
SwitchTargetAndAttack(ghoulTarget);
return;
}
if (dkTarget && dkTarget != me->GetVictim() && me->IsValidAttackTarget(dkTarget))
{ {
me->GetMotionMaster()->Clear(false); me->GetMotionMaster()->Clear(false);
SetGazeOn(selection); SetGazeOn(selection);
@@ -237,8 +246,11 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript
MySelectNextTarget(); MySelectNextTarget();
_selectionTimer = 0; _selectionTimer = 0;
} }
if (_initialCastTimer >= 2000 && !me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_LOST_CONTROL) && me->GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_CONTROLLED) == NULL_MOTION_TYPE) // check start timer and if not casting
me->CastSpell(me->GetVictim(), 51963, false); if(_initialCastTimer >= 2000 && !me->HasUnitState(UNIT_STATE_CASTING))
if (!(me->HasAuraType(SPELL_AURA_MOD_FEAR) || me->HasAuraType(SPELL_AURA_MOD_ROOT) || me->HasAuraType(SPELL_AURA_MOD_CONFUSE) || me->HasAuraType(SPELL_AURA_MOD_STUN)))
if (_initialCastTimer >= 2000 && !me->HasUnitState(UNIT_STATE_LOST_CONTROL) && me->GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_CONTROLLED) == NULL_MOTION_TYPE)
me->CastSpell(me->GetVictim(), 51963, false);
} }
else else
{ {