Hendrik Leppkes:
	- Some cleanup of redundant checks, and added a workaround for the protected WorldMap issue.
	- Don't double hook.
