Fix line_of_sight (AGAIN)
Merge remote-tracking branch 'upstream/master' into dynamic
Dont crash server on errors