Fix emergency shields activating without being turned on
Merge pull request #6936 from GinjaNinja32/shieldfix

Fix emergency shields activating without being turned on