Fixed all the sheep battle problems