Bugfixed battle