diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 13c2e97..eba10ae 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -298,10 +298,7 @@ bool Human::IsCollision() switch (entity->entity_type) { case ET_Obstacle: { - if ( - (last_collision_door == nullptr || last_collision_door != entity) && - TestCollision(entity) - ){ + if (TestCollision(entity)){ objects.push_back(entity); } } diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 89aee9b..c268a34 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -250,8 +250,8 @@ void Room::CreateAndroid(int robot_num) hum->robot_meta = robot_meta; hum->entity_uniid = AllocUniid(); { - hum->pos.x = 200 + rand() % 1400; - hum->pos.y = 300 + rand() % 1500; + hum->pos.x = 200 + rand() % 500; + hum->pos.y = 300 + rand() % 300; hum->attack_dir = hum->pos; hum->attack_dir.Normalize(); hum->attack_dir.Rotate(a8::RandAngle());