*Fix "Endless Hunger" Script ... npc should not move into wall

--HG--
branch : trunk
This commit is contained in:
BroodWyrm
2009-06-18 21:51:12 +02:00
parent 8c141bc9ac
commit bcc2148e2c
2 changed files with 8 additions and 7 deletions
@@ -210,8 +210,8 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
anchor->GetPosition(targ_x,targ_y,targ_z); anchor->GetNearPoint2D(targ_x,targ_y,1,anchor->GetAngle(m_creature));
anchor->DealDamage(anchor,anchor->GetHealth()); //anchor->DealDamage(anchor,anchor->GetHealth());
m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN_SELF); m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN_SELF);
m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN); m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN);
@@ -275,10 +275,11 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
} }
} }
} }
if(dist == 99) if(dist == 99)
return; return;
Creature* trigger = m_creature->SummonCreature(29521,x,y,z,0,TEMPSUMMON_MANUAL_DESPAWN,100); Creature* trigger = m_creature->FindNearestCreature(29521,30);
if(trigger) if(trigger)
{ {
if(GameObject* go_prison = GameObject::GetGameObject((*m_creature),nearest_prison)) if(GameObject* go_prison = GameObject::GetGameObject((*m_creature),nearest_prison))
@@ -296,10 +296,10 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI
void Reset() void Reset()
{ {
m_creature->AddUnitMovementFlag(MOVEMENTFLAG_FLYING + MOVEMENTFLAG_HOVER); m_creature->AddUnitMovementFlag(MOVEMENTFLAG_FLYING + MOVEMENTFLAG_HOVER);
m_creature->SetSpeed(MOVE_SWIM , 0.1f); m_creature->SetSpeed(MOVE_SWIM , 1.0f);
m_creature->SetSpeed(MOVE_RUN , 0.1f); m_creature->SetSpeed(MOVE_RUN , 1.0f);
m_creature->SetSpeed(MOVE_WALK , 0.1f); m_creature->SetSpeed(MOVE_WALK , 1.0f);
m_creature->SetSpeed(MOVE_FLIGHT , 0.1f); //m_creature->SetSpeed(MOVE_FLIGHT , 1.0f);
m_creature->GetPosition(x,y,z); m_creature->GetPosition(x,y,z);
DoTeleportTo(x+1,y,z+30); DoTeleportTo(x+1,y,z+30);