remove lava / water blocking
Reorg in to seperate classes in prep for IRC work.
Tidy up world identification in eventhandlers.