1

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";

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();

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());
         }

server/gameserver/human.cc

@@ -189,7 +189,6 @@ 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 &&
@@ -198,10 +197,6 @@ bool Human::IsCollisionInMapService()
                         ) {
                     }
                     obstacle->BroadcastFullState();
-                        } else {
-                            Global::last_collider = collider;
-                            return true;
-                        }
                 }
             }
             break;