Severe changes to collision entity handling. May not work, if it doesnt, we're rolling back. Also fixed an issue in objective update that was referencing the player number instead of its entity.