From 562e26ee75a50803406dae83fc01ba134a9b2be0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 29 Dec 2022 14:35:55 +0800
Subject: [PATCH] 1

---
 server/gameserver/buff/pull_to_walkable.cc | 33 ++++++++--------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/server/gameserver/buff/pull_to_walkable.cc b/server/gameserver/buff/pull_to_walkable.cc
index 1eab991e..8bc9b6ce 100644
--- a/server/gameserver/buff/pull_to_walkable.cc
+++ b/server/gameserver/buff/pull_to_walkable.cc
@@ -7,32 +7,21 @@
 
 #include "creature.h"
 #include "room.h"
+#include "mapinstance.h"
 
 void PullToWalkableBuff::Activate()
 {
-    if (!owner->CollisonDetection()) {
-        return;
-    }
-    glm::vec3 move_dir = owner->GetMoveDir();
-    if (std::abs(move_dir.x) > FLT_EPSILON ||
-        std::abs(move_dir.y) > FLT_EPSILON
-        ) {
-        Position old_pos = owner->GetPos();
-        for (int i = 1; i < 2000; i += 5) {
-            // 999
-            #if 1
-            #else
-            owner->SetPos(old_pos + move_dir * i);
-            #endif
-            if (!owner->CollisonDetection()) {
-                owner->room->grid_service->MoveCreature(owner);
-                return;
-            }
-        }
-        owner->FindLocation();
-    } else {
-        owner->FindLocation();
+    glm::vec3 center = owner->GetPos().ToGlmVec3();
+    owner->room->map_instance->Scale(center);
+    glm::vec3 point;
+    bool ok = owner->room->map_instance->FindNearestPoint(center, 2, point);
+    if (!ok) {
+        abort();
     }
+    owner->room->map_instance->UnScale(point);
+    Global::Instance()->verify_set_pos = 1;
+    owner->GetMutablePos().FromGlmVec3(point);
+    Global::Instance()->verify_set_pos = 0;
 }
 
 void PullToWalkableBuff::Deactivate()