From f976854d2d86590f44d2ebd228b1dd3f84bcd87a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 20 Nov 2019 17:57:22 +0800
Subject: [PATCH] 1

---
 server/gameserver/constant.h    |  2 +-
 server/gameserver/entity.h      |  1 -
 server/gameserver/framemaker.cc |  1 -
 server/gameserver/human.cc      | 21 ++++++++-------------
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index 882e3dd..b2345a4 100755
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -81,7 +81,7 @@ enum PropertyType_e
 enum MapObjectType_e
 {
     kMOT_Object = 1,
-    kMOT_SpawnPoint = 2
+    kMOT_SpawnPoint = 2,
 };
 
 const char* const PROJ_NAME_FMT = "game%d_gameserver";
diff --git a/server/gameserver/entity.h b/server/gameserver/entity.h
index f13b777..dc5ed66 100644
--- a/server/gameserver/entity.h
+++ b/server/gameserver/entity.h
@@ -30,7 +30,6 @@ class Entity
 
     int grid_id = 0;
     std::set<GridCell*> grid_list;
-    Entity* last_collision_door = nullptr;
 
     Entity();
     virtual ~Entity();
diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc
index d6a89c3..d540a02 100644
--- a/server/gameserver/framemaker.cc
+++ b/server/gameserver/framemaker.cc
@@ -17,7 +17,6 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(const Human* hum)
             Entity* entity = itr;
             if (entity->dead && hum->room->frame_no - entity->dead_frameno > 10) {
                 continue;
-            } else {
             }
             entity->FillMFObjectPart(msg->add_part_objects());
         }
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index fba5c11..82d18a9 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -189,20 +189,15 @@ bool Human::IsCollisionInMapService()
         case ET_Obstacle:
             {
                 if (!collider->owner->dead && TestCollision((ColliderComponent*)collider)) {
-                    if (last_collision_door != collider->owner) {
-                        Obstacle* obstacle = (Obstacle*)collider->owner;
-                        if (!obstacle->dead &&
-                            obstacle->meta->i->attack_type() == 1 &&
-                            obstacle->meta->i->drop() != 0 &&
-                            room->gas_data.gas_mode != GasInactive
-                            ) {
-                            }
-                            obstacle->BroadcastFullState();
-                        } else {
-                            Global::last_collider = collider;
-                            return true;
-                        }
+                    Obstacle* obstacle = (Obstacle*)collider->owner;
+                    if (!obstacle->dead &&
+                        obstacle->meta->i->attack_type() == 1 &&
+                        obstacle->meta->i->drop() != 0 &&
+                        room->gas_data.gas_mode != GasInactive
+                        ) {
                     }
+                    obstacle->BroadcastFullState();
+                }
             }
             break;
         default: