Defiant/Competitive + Intimidate/StickyWeb fix
Merge pull request #1029 from Fuzzysqurl/parasect

Defiant/Competitive + Intimidate/StickyWeb fix