Updated Melee Mechanics

Everything should work like it's supposed to now, except the bugs of course if there is any.