Fixed across world teleport blocking, general code cleanup
Merge pull request #22 from cheddar262/master

Fixed across world teleport blocking, general code cleanup