More changes to controls still bug when attacking player