Update combat/Combat.java