added call to Player.reset() in Combat.java