From 885fcc883573bfc0da6d3b79af077e0f2ccfd5e4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 16 Dec 2022 13:23:22 +0800
Subject: [PATCH] 1

---
 server/gameserver/mapinstance.cc | 9 +++++++--
 server/gameserver/movehelper.cc  | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/server/gameserver/mapinstance.cc b/server/gameserver/mapinstance.cc
index 09875d13..df3edff5 100644
--- a/server/gameserver/mapinstance.cc
+++ b/server/gameserver/mapinstance.cc
@@ -517,7 +517,7 @@ bool MapInstance::Raycast(int layer, const glm::vec3& start, const glm::vec3& en
             hit_pos_[1] = h;
             hit_pos_[2] = hit_pos_copy[2];
         } else {
-            abort();
+            //abort();
         }
         hit_result = true;
     }
@@ -580,8 +580,13 @@ bool MapInstance::GetPosHeight(const Position& pos, float& out_height)
 
     a8::XPrintf("getPosHeight:%d\n", {startRef});
     auto ret = navmesh_query_->getPolyHeight(startRef, nearestPt, &out_height);
+    #if 0
     assert(ret == DT_SUCCESS);
-
+    #endif
+    if (ret != DT_SUCCESS) {
+        out_height = pos.y;
+        return false;
+    }
     return true;
 }
 
diff --git a/server/gameserver/movehelper.cc b/server/gameserver/movehelper.cc
index 281aec97..5e591c65 100644
--- a/server/gameserver/movehelper.cc
+++ b/server/gameserver/movehelper.cc
@@ -35,7 +35,7 @@ bool MoveHelper::GetMovePosition(glm::vec3& out_pos)
                         });
             curr_point.curr_pos.y = h;
         } else {
-            abort();
+            //abort();
         }
         curr_point.curr_pos.AddVec2(dir * owner_->GetSpeed());
         owner_->SetPos(curr_point.curr_pos);
@@ -51,7 +51,7 @@ bool MoveHelper::GetMovePosition(glm::vec3& out_pos)
             new_pos.y = h;
             owner_->SetPos(new_pos);
         } else {
-            abort();
+            //abort();
         }
     }
     if (owner_->GetPos().Distance2D2(curr_point.src_pos) - curr_point.distance >= 0.0001f) {
@@ -70,7 +70,7 @@ bool MoveHelper::GetMovePosition(glm::vec3& out_pos)
             new_pos.y = h;
             owner_->SetPos(new_pos);
         } else {
-            abort();
+            //abort();
         }
         ++path_index_;
         if (path_index_ < paths_.size()) {