Fixed issues pointed out by Shauren.
Merge branch 'redirect' of https://github.com/raczman/TrinityCore into redirect

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/World/World.cpp