Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into npcbot-temp

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.h
更新
更新
更新
DB/Quest: Master of the Storm part 3 of 5

By dr-j, closes #10705
Replaced try/catch by non-throwing socket.close()
Prevent duplicate call to MapUpdater::deactivate causing a crash on shutdown
Remove extra qualifier to make GCC happy again
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into npcbot-temp

Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Maps/MapManager.cpp
Merge branch 'npcbot-temp' of https://github.com/shenhuyong/TrinityCore into ghbb

Conflicts:
	sql/Bots/auth_rbac.sql
	src/server/game/AI/NpcBots/bothelper.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/CharacterHandler.cpp
更新
更新