diff --git a/server/gameserver/commands.cc b/server/gameserver/commands.cc index 43a99f36..63d962d8 100644 --- a/server/gameserver/commands.cc +++ b/server/gameserver/commands.cc @@ -113,7 +113,7 @@ void Player::_CMExecCommand(f8::MsgHdr* hdr, const cs::CMExecCommand& msg) if (team == GetTeam()) { team = room->GetMobaTeamB(); } - while (team->GetKillCount() <100) { + while (team->GetKillCount() < 100) { team->IncKillCount(); } if (!room->moba_over_timer.expired()) { diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index f01d7a04..89258a14 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1803,11 +1803,7 @@ void Room::UpdateGasMoving() gas_data_.pos_old = gas_data_.pos_old_bk + dir * distance; } if (gas_data_.rad_old - distance <= gas_data_.rad_new) { - #if 1 assert(gas_data_.rad_old - distance <= gas_data_.rad_new + 5); - #else - assert(gas_data_.pos_new == gas_data_.pos_old); - #endif } } if (std::abs(gas_data_.gas_progress - gas_data_.rad_new) <= 0.001f) {