Fix NPEs relating combat checks and world changing. Fixes #976, #979