Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
This commit is contained in:
commit
aa6ae2773f
38 files changed
+214
-61
No files matched your search
@@ -13894,7 +13894,7 @@ void Unit::SetStunned(bool apply)
|
||||
else
|
||||
{
|
||||
if (IsAlive() && GetVictim())
|
||||
SetTarget(GetVictim()->GetGUID());
|
||||
SetTarget(EnsureVictim()->GetGUID());
|
||||
|
||||
// don't remove UNIT_FLAG_STUNNED for pet when owner is mounted (disabled pet's interface)
|
||||
Unit* owner = GetOwner();
|
||||
@@ -13949,7 +13949,7 @@ void Unit::SetFeared(bool apply)
|
||||
if (GetMotionMaster()->GetCurrentMovementGeneratorType() == FLEEING_MOTION_TYPE)
|
||||
GetMotionMaster()->MovementExpired();
|
||||
if (GetVictim())
|
||||
SetTarget(GetVictim()->GetGUID());
|
||||
SetTarget(EnsureVictim()->GetGUID());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13971,7 +13971,7 @@ void Unit::SetConfused(bool apply)
|
||||
if (GetMotionMaster()->GetCurrentMovementGeneratorType() == CONFUSED_MOTION_TYPE)
|
||||
GetMotionMaster()->MovementExpired();
|
||||
if (GetVictim())
|
||||
SetTarget(GetVictim()->GetGUID());
|
||||
SetTarget(EnsureVictim()->GetGUID());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user