Stops constructs from hitting themselves
adding span class everywhere + fix attack messages
Merge pull request #3598 from phil235/ConstructHitFix

Stops constructs from hitting themselves