lchen59 paulkim6 fix bugs with battle logic

- null pointer exceptions