Starting work on separating battles from the server

Starting work on issue #789
Probably fixed #203 for server plugins, but need to test if it works