Fixed another nullPtr exception
Merge branch 'master' of github.com:myran2/Adventure