World handling

Improve accuracy of the dragon checking.