From 240778da53a45cb94d6fa27e830e741b8bd02480 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 27 Dec 2022 13:06:15 +0800
Subject: [PATCH] 1

---
 server/gameserver/entity.cc | 33 ---------------------------------
 server/gameserver/entity.h  |  2 --
 2 files changed, 35 deletions(-)

diff --git a/server/gameserver/entity.cc b/server/gameserver/entity.cc
index f61e9834..223bfc99 100644
--- a/server/gameserver/entity.cc
+++ b/server/gameserver/entity.cc
@@ -52,24 +52,6 @@ bool Entity::TestCollision(Room* room, Entity* b)
     return false;
 }
 
-ColliderComponent* Entity::TestCollisionAndGetCollider(Room* room, Entity* b)
-{
-    PerfMonitor::Instance()->test_times++;
-    if (b->IsDead(room)) {
-        return nullptr;
-    }
-    OnPreCollision(room);
-    b->OnPreCollision(room);
-    for (auto& a_collider : colliders_) {
-        for (auto& b_collider : b->colliders_) {
-            if (a_collider->Intersect(b_collider)) {
-                return b_collider;
-            }
-        }
-    }
-    return nullptr;
-}
-
 bool Entity::TestCollision(Room* room, ColliderComponent* b)
 {
     if (b->owner->IsDead(room)) {
@@ -85,21 +67,6 @@ bool Entity::TestCollision(Room* room, ColliderComponent* b)
     return false;
 }
 
-ColliderComponent* Entity::TestCollisionAndGetCollider(Room* room, ColliderComponent* b)
-{
-    if (b->owner->IsDead(room)) {
-        return nullptr;
-    }
-    OnPreCollision(room);
-    b->owner->OnPreCollision(room);
-    for (auto& a_collider : colliders_) {
-        if (a_collider->Intersect(b)) {
-            return a_collider;
-        }
-    }
-    return nullptr;
-}
-
 bool Entity::TestCollisionEx(Room* room, const a8::Vec2& aabb_pos, AabbCollider& aabb_box)
 {
     OnPreCollision(room);
diff --git a/server/gameserver/entity.h b/server/gameserver/entity.h
index 94e86be0..9eb95b71 100644
--- a/server/gameserver/entity.h
+++ b/server/gameserver/entity.h
@@ -51,9 +51,7 @@ class Entity
     { return subtype == entity_subtype_;}
     int GetGridId() const { return grid_id_; }
     bool TestCollision(Room* room, Entity* b);
-    ColliderComponent* TestCollisionAndGetCollider(Room* room, Entity* b);
     bool TestCollision(Room* room, ColliderComponent* b);
-    ColliderComponent* TestCollisionAndGetCollider(Room* room, ColliderComponent* b);
     bool TestCollisionEx(Room* room, const a8::Vec2& aabb_pos, AabbCollider& aabb_box);
     void BroadcastFullState(Room* room);
     void BroadcastDeleteState(Room* room);