*Better fix to the waypoint mobs returning to spawn issue, thanks XTElite1
--HG-- branch : trunk
This commit is contained in:
commit
5b8ee23e47
3 files changed
+6
-3
No files matched your search
@@ -72,6 +72,8 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI
|
|||||||
void SetMaxPlayerDistance(float newMax) { MaxPlayerDistance = newMax; }
|
void SetMaxPlayerDistance(float newMax) { MaxPlayerDistance = newMax; }
|
||||||
float GetMaxPlayerDistance() { return MaxPlayerDistance; }
|
float GetMaxPlayerDistance() { return MaxPlayerDistance; }
|
||||||
|
|
||||||
|
bool IsEscorted() {return IsBeingEscorted;}
|
||||||
|
|
||||||
void SetCanMelee(bool usemelee) { CanMelee = usemelee; }
|
void SetCanMelee(bool usemelee) { CanMelee = usemelee; }
|
||||||
void SetDespawnAtEnd(bool despawn) { DespawnAtEnd = despawn; }
|
void SetDespawnAtEnd(bool despawn) { DespawnAtEnd = despawn; }
|
||||||
void SetDespawnAtFar(bool despawn) { DespawnAtFar = despawn; }
|
void SetDespawnAtFar(bool despawn) { DespawnAtFar = despawn; }
|
||||||
|
|||||||
@@ -123,6 +123,7 @@ class TRINITY_DLL_SPEC CreatureAI : public UnitAI
|
|||||||
|
|
||||||
// Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc)
|
// Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc)
|
||||||
//virtual void AttackedBy(Unit* attacker);
|
//virtual void AttackedBy(Unit* attacker);
|
||||||
|
virtual bool IsEscorted() {return false;}
|
||||||
|
|
||||||
// Called when creature is spawned or respawned (for reseting variables)
|
// Called when creature is spawned or respawned (for reseting variables)
|
||||||
virtual void JustRespawned() { Reset(); }
|
virtual void JustRespawned() { Reset(); }
|
||||||
|
|||||||
+3
-3
@@ -10528,9 +10528,9 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
|
|||||||
if(GetTypeId() != TYPEID_PLAYER)
|
if(GetTypeId() != TYPEID_PLAYER)
|
||||||
{
|
{
|
||||||
// Set home position at place of engaging combat for escorted creatures
|
// Set home position at place of engaging combat for escorted creatures
|
||||||
//if(((Creature*)this)->IsAIEnabled)
|
if((((Creature*)this)->IsAIEnabled && ((Creature*)this)->AI()->IsEscorted()) || ((Creature*)this)->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
|
||||||
//if (((Creature *)this)->AI()->IsEscorted())
|
((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
|
||||||
((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
|
|
||||||
if(enemy)
|
if(enemy)
|
||||||
{
|
{
|
||||||
if(((Creature*)this)->IsAIEnabled)
|
if(((Creature*)this)->IsAIEnabled)
|
||||||
|
|||||||
Reference in new issue
Block a user