There is now a cooldown period after battles.

After leaving battle, entities are put in a cooldown list (as a CombatantInfo) where until they are removed from that list, they cannot enter battle again.
Also minor changes regarding how CombatantInfo is organized.