Update Player.java

Fixed a bug in the combat formula where it would not calculate the combat level correctly if mag > ran (and the player is a mage). Also changed the prayer part a bit since it gets divided by 2 first and then floored before being divided by 4 (doing * 0.125 can cause it to be off by 1 level)
Merge pull request #53 from Meeplekins/patch-1

Combat formula bug where magic and prayer are not calculated properly.