From 8b3590c52b651cce71ccdd3817ab1f4b04d9ca0a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 22 Nov 2019 14:31:01 +0800
Subject: [PATCH] 1

---
 server/gameserver/android.ai.cc |  6 ------
 server/gameserver/human.cc      | 27 ---------------------------
 server/gameserver/human.h       |  1 -
 3 files changed, 34 deletions(-)

diff --git a/server/gameserver/android.ai.cc b/server/gameserver/android.ai.cc
index e60b44f..62b5449 100644
--- a/server/gameserver/android.ai.cc
+++ b/server/gameserver/android.ai.cc
@@ -89,12 +89,6 @@ void AndroidAI::DoMove()
         for (int i = 0; i < speed; ++i) {
             a8::Vec2 old_pos = hum->pos;
             hum->pos = hum->pos + hum->move_dir;
-            if (hum->IsCollisionInMapService()) {
-                hum->pos = old_pos;
-                if (i == 0) {
-                }
-                break;
-            }
             hum->room->grid_service.MoveHuman(hum);
         }
     }
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 3e43578..8f822e6 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -162,30 +162,6 @@ void Human::RecalcSelfCollider()
     #endif
 }
 
-bool Human::IsCollisionInMapService()
-{
-    #if 0
-    if (room->OverBorder(pos, meta->p->radius())){
-        return true;
-    }
-
-    std::set<ColliderComponent*> colliders;
-    room->map_service.GetColliders(pos.x, pos.y, colliders);
-
-    Global::last_collider = nullptr;
-    for (ColliderComponent* collider : colliders) {
-        #if 0
-        switch (collider->owner->entity_type) {
-            break;
-        default:
-            break;
-        }
-        #endif
-    }
-    #endif
-    return false;
-}
-
 void Human::SyncAroundPlayers(const char* file, int line, const char* func)
 {
     for (auto& cell : grid_list) {
@@ -586,9 +562,6 @@ void Human::_UpdateMove(int speed)
     for (int i = 0; i < speed; ++i) {
         a8::Vec2 old_pos = pos;
         pos = pos + move_dir;
-        if (IsCollisionInMapService()) {
-            pos = old_pos;
-        }
         room->grid_service.MoveHuman(this);
     }
 }
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index 6c1c558..1eb696a 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -66,7 +66,6 @@ class Human : public Entity
     virtual void GetAabbBox(AabbCollider& aabb_box);
     void FillMFTeamData(cs::MFTeamData* team_data);
     void RecalcSelfCollider();
-    bool IsCollisionInMapService();
     void SyncAroundPlayers(const char* file, int line, const char* func);
     void BeKill(int killer_id, const std::string& killer_name);
     void AddToNewObjects(Entity* entity);