fixed  Issue #1431, sprite fix for riot shield/energy shield inhands

fixed  Issue #1431, sprite fix for riot shield/energy shield inhands

okay being new to github I fucked up with the branches, I have a fix for  Issue #608 that is stuck in this request as well

what I did for #608 was change the layer=6 to layer=2 so it doesn't display about the player