Fix player drawing from correct discard stack

Now the player will be able to draw from the correct discard stack. However, there are still two discard-related issues I haven't tackled:

1) The player is given the option to not draw from deck even if all discard stacks are empty.
2) The player can draw an empty discard stack.