aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/scripts/Outland')
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_illidan.cpp4
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp6
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp2
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp2
-rw-r--r--src/server/scripts/Outland/shadowmoon_valley.cpp16
5 files changed, 15 insertions, 15 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 10509de0266..fe2c068909d 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -754,7 +754,7 @@ public:
Trigger->GetMotionMaster()->MovePoint(0, final.x, final.y, final.z);
//Trigger->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
- me->SetUInt64Value(UNIT_FIELD_TARGET, Trigger->GetGUID());
+ me->SetTarget(Trigger->GetGUID());
DoCast(Trigger, SPELL_EYE_BLAST);
}
void SummonFlamesOfAzzinoth()
@@ -1235,7 +1235,7 @@ public:
me->InterruptNonMeleeSpells(false);
me->GetMotionMaster()->Clear(false);
me->AttackStop();
- me->SetUInt64Value(UNIT_FIELD_TARGET, IllidanGUID);
+ me->SetTarget(IllidanGUID);
MaxTimer = 0;
break;
case PHASE_TRANSFORM_SEQUENCE:
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 2d09088edc8..852f69597b9 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -356,7 +356,7 @@ public:
CAST_AI(mob_ashtongue_sorcerer::mob_ashtongue_sorcererAI, Sorcerer->AI())->ShadeGUID = me->GetGUID();
Sorcerer->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
Sorcerer->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ());
- Sorcerer->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID());
+ Sorcerer->SetTarget(me->GetGUID());
Sorcerers.push_back(Sorcerer->GetGUID());
--DeathCount;
++SorcererCount;
@@ -661,7 +661,7 @@ public:
Shade->AddThreat(me, 1000000.0f);
me->CombatStart(Shade);
Shade->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
- Shade->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID());
+ Shade->SetTarget(me->GetGUID());
if (pl) Shade->AddThreat(pl, 1.0f);
DoZoneInCombat(Shade);
EventBegun = true;
@@ -680,7 +680,7 @@ public:
case 1:
if (Creature* Shade = Unit::GetCreature(*me, ShadeGUID))
{
- me->SetUInt64Value(UNIT_FIELD_TARGET, ShadeGUID);
+ me->SetTarget(ShadeGUID);
DoCast(Shade, SPELL_AKAMA_SOUL_RETRIEVE);
EndingTalkCount = 0;
SoulRetrieveTimer = 16000;
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 97010fdefaa..d25d10cc6a7 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -182,7 +182,7 @@ class boss_alar : public CreatureScript
me->RemoveAllAuras();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->AttackStop();
- me->SetUInt64Value(UNIT_FIELD_TARGET, 0);
+ me->SetTarget(0);
me->SetSpeed(MOVE_RUN, 5.0f);
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MovePoint(0, waypoint[5][0], waypoint[5][1], waypoint[5][2]);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 7fd0641a945..ff3c3199d31 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -236,7 +236,7 @@ struct advisorbase_ai : public ScriptedAI
me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->ClearAllReactives();
- me->SetUInt64Value(UNIT_FIELD_TARGET, 0);
+ me->SetTarget(0);
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MoveIdle();
me->SetStandState(UNIT_STAND_STATE_DEAD);
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index 6edeb3563db..87a279a8113 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -782,8 +782,8 @@ public:
Illi->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return 350; break;
case 6:
Illi->CastSpell(Illi, SPELL_ONE, true);
- Illi->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID());
- me->SetUInt64Value(UNIT_FIELD_TARGET, IllidanGUID);
+ Illi->SetTarget(me->GetGUID());
+ me->SetTarget(IllidanGUID);
return 2000; break;
case 7: DoScriptText(OVERLORD_YELL_2, me); return 4500; break;
case 8: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8); return 2500; break;
@@ -792,7 +792,7 @@ public:
case 11: DoScriptText(OVERLORD_SAY_4, me, player); return 6000; break;
case 12: DoScriptText(LORD_ILLIDAN_SAY_2, Illi); return 5500; break;
case 13: DoScriptText(LORD_ILLIDAN_SAY_3, Illi); return 4000; break;
- case 14: Illi->SetUInt64Value(UNIT_FIELD_TARGET, PlayerGUID); return 1500; break;
+ case 14: Illi->SetTarget(PlayerGUID); return 1500; break;
case 15: DoScriptText(LORD_ILLIDAN_SAY_4, Illi); return 1500; break;
case 16:
if (player)
@@ -818,7 +818,7 @@ public:
Illi->setDeathState(JUST_DIED);
return 1000; break;
case 23: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); return 2000; break;
- case 24: me->SetUInt64Value(UNIT_FIELD_TARGET, PlayerGUID); return 5000; break;
+ case 24: me->SetTarget(PlayerGUID); return 5000; break;
case 25: DoScriptText(OVERLORD_SAY_6, me); return 2000; break;
case 26:
if (player)
@@ -828,7 +828,7 @@ public:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
- Yarzill->SetUInt64Value(UNIT_FIELD_TARGET, PlayerGUID);
+ Yarzill->SetTarget(PlayerGUID);
return 500; }
break;
case 28:
@@ -848,7 +848,7 @@ public:
{
Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
if (Yarzill)
- Yarzill->SetUInt64Value(UNIT_FIELD_TARGET, 0);
+ Yarzill->SetTarget(0);
return 5000; }
break;
case 31:
@@ -1193,7 +1193,7 @@ public:
me->AddUnitState(UNIT_STAT_ROOT);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
- me->SetUInt64Value(UNIT_FIELD_TARGET, 0);
+ me->SetTarget(0);
}
void EnterCombat(Unit* /*who*/){}
@@ -1226,7 +1226,7 @@ public:
case 5:
if (Player* AggroTarget = (Unit::GetPlayer(*me, AggroTargetGUID)))
{
- me->SetUInt64Value(UNIT_FIELD_TARGET, AggroTarget->GetGUID());
+ me->SetTarget(AggroTarget->GetGUID());
me->AddThreat(AggroTarget, 1);
me->HandleEmoteCommand(EMOTE_ONESHOT_POINT);
}