Added missing null check
Returning attacks

- Attacks are now shown until they are back where they started
- Units are available again after the attack returned
- New states for attacks:
  3: Attack returned after battle
  4: Attack returned after it was cancelled