[Fixed] No melee attacks can be performed while holding jedi weapons
0005232

Change-Id: I2151baefb8a653ceb4eddbd82fca2bf09860b9e1
Merge "[Fixed] No melee attacks can be performed while holding jedi weapons 0005232" into unstable