Discard efficiency, actor/agent overlap bug fixed
Discard efficiency, actor/agent overlap bug fixed

johnb30/petrarch,johnb30/petrarch2,opcoder/zh_ptr,Sayeedsalam/spec-petrarch2,JingL1014/petrarch2,openeventdata/petrarch,pjdufour/petrarch,openeventdata/petrarch2,cnnorris/petrarch