Prevent things unaffected by efficiency from gaining efficiency
Merge branch 'bugfix/unaffectedEfficiency' into develop