From 54ce0293423b4286fe62cbadc3b1441cae5f78eb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Aug 2011 02:31:40 +0100
Subject: if an NPC move to target is above the terrain then make it fly to
 destination

---
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/World')

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 2215495..30e81fc 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
             lock (m_avatars)
             {
-                if (m_avatars.ContainsKey(presence.UUID))
+                if (m_avatars.ContainsKey(presence.UUID) && presence.MovingToTarget)
                 {
                     double distanceToTarget = Util.GetDistanceTo(presence.AbsolutePosition, presence.MoveToPositionTarget);
 //                            m_log.DebugFormat(
@@ -72,8 +72,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     // Check the error term of the current position in relation to the target position
                     if (distanceToTarget <= ScenePresence.SIGNIFICANT_MOVEMENT)
                     {
-//                        m_log.DebugFormat("[NPC MODULE]: Stopping movement of npc {0} {1}", presence.Name, presence.UUID);
-                        // We are close enough to the target for now
+                        m_log.DebugFormat("[NPC MODULE]: Stopping movement of npc {0}", presence.Name);
+                        // We are close enough to the target
                         presence.Velocity = Vector3.Zero;
                         presence.AbsolutePosition = presence.MoveToPositionTarget;
                         presence.ResetMoveToTarget();
@@ -86,6 +86,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     }
                     else
                     {
+                        m_log.DebugFormat(
+                            "[NPC MODULE]: Updating npc {0} at {1} for next movement to {2}",
+                            presence.Name, presence.AbsolutePosition, presence.MoveToPositionTarget);
+
                         Vector3 agent_control_v3 = new Vector3();
                         presence.HandleMoveToTargetUpdate(ref agent_control_v3, presence.Rotation);
                         presence.AddNewMovement(agent_control_v3, presence.Rotation);
-- 
cgit v1.1