diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 2af7893..c8023b9 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -774,8 +774,10 @@ void Room::FindLocationWithAabb(Entity* target, const a8::Vec2& aabb_pos, AabbCo
     a8::Vec2 new_pos_dir = new_pos - old_pos;
     new_pos_dir.Normalize();
     float distance = (new_pos - old_pos).Norm();
-    for (int i = distance; i < 10000000; i += 5) {
+    for (int i = distance; i < 100000; i += 5) {
         a8::Vec2 pos = old_pos + new_pos_dir * i;
+        new_x = pos.x;
+        new_y = pos.y;
 
         Entity* building = nullptr;
         std::set<GridCell*> new_grid_list;