Updated Melee Mechanics

Everything should work like it's supposed to now, except the bugs of course if there is any.
Merge pull request #1 from MaxFF/patch-1

Accepted MaxFF's melee changes