Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/CalendarHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Tools/PlayerDump.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/worldserver/worldserver.conf.dist

3 files changed, 5 insertions, 52 deletions

diff --git a/src/server/shared/Logging/AppenderDB.cpp b/src/server/shared/Logging/AppenderDB.cpp
index c461186089c..204592720dc 100644
--- a/src/server/shared/Logging/AppenderDB.cpp
+++ b/src/server/shared/Logging/AppenderDB.cpp
@@ -25,7 +25,7 @@ AppenderDB::~AppenderDB() { }
 
 void AppenderDB::_write(LogMessage const& message)
 {
-    // Avoid infinite loop, PExecute triggers Logging with LOG_FILTER_SQL type
+    // Avoid infinite loop, PExecute triggers Logging with "sql.sql" type
     if (!enabled || !message.type.find("sql"))
         return;
 
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 9cd4e4a8cce..58c22d19df1 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -385,14 +385,14 @@ void Log::outFatal(std::string const& filter, const char * str, ...)
 
 void Log::outCharDump(char const* str, uint32 accountId, uint32 guid, char const* name)
 {
-    if (!str || !ShouldLog(LOG_FILTER_PLAYER_DUMP, LOG_LEVEL_INFO))
+    if (!str || !ShouldLog("entities.player.dump", LOG_LEVEL_INFO))
         return;
 
     std::ostringstream ss;
     ss << "== START DUMP == (account: " << accountId << " guid: " << guid << " name: " << name
        << ")\n" << str << "\n== END DUMP ==\n";
 
-    LogMessage* msg = new LogMessage(LOG_LEVEL_INFO, LOG_FILTER_PLAYER_DUMP, ss.str());
+    LogMessage* msg = new LogMessage(LOG_LEVEL_INFO, "entities.player.dump", ss.str());
     std::ostringstream param;
     param << guid << '_' << name;
 
@@ -403,7 +403,7 @@ void Log::outCharDump(char const* str, uint32 accountId, uint32 guid, char const
 
 void Log::outCommand(uint32 account, const char * str, ...)
 {
-    if (!str || !ShouldLog(LOG_FILTER_GMCOMMAND, LOG_LEVEL_INFO))
+    if (!str || !ShouldLog("commands.gm", LOG_LEVEL_INFO))
         return;
 
     va_list ap;
@@ -412,7 +412,7 @@ void Log::outCommand(uint32 account, const char * str, ...)
     vsnprintf(text, MAX_QUERY_LEN, str, ap);
     va_end(ap);
 
-    LogMessage* msg = new LogMessage(LOG_LEVEL_INFO, LOG_FILTER_GMCOMMAND, text);
+    LogMessage* msg = new LogMessage(LOG_LEVEL_INFO, "commands.gm", text);
 
     std::ostringstream ss;
     ss << account;
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index 81daee02503..e2e942d7e9b 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -28,53 +28,6 @@
 #include <string>
 #include <ace/Singleton.h>
 
-// TODO: Replace all defines in core
-#define LOG_FILTER_ACHIEVEMENTSYS "achievement"
-#define LOG_FILTER_AUCTIONHOUSE   "auctionHouse"
-#define LOG_FILTER_ARENAS         "bg.arena"
-#define LOG_FILTER_BATTLEFIELD    "bg.battlefield"
-#define LOG_FILTER_BATTLEGROUND   "bg.battleground"
-#define LOG_FILTER_PLAYER_CHATLOG "chat.log"
-#define LOG_FILTER_CALENDAR       "calendar"
-#define LOG_FILTER_CHATSYS        "chat.system"
-#define LOG_FILTER_CHEAT          "cheat"
-#define LOG_FILTER_REMOTECOMMAND  "commands.ra"
-#define LOG_FILTER_GMCOMMAND      "commands.gm"
-#define LOG_FILTER_CONDITIONSYS   "condition"
-#define LOG_FILTER_PETS           "entities.pet"
-#define LOG_FILTER_CHARACTER      "entities.player.character"
-#define LOG_FILTER_PLAYER_DUMP    "entities.player.dump"
-#define LOG_FILTER_PLAYER         "entities.player"
-#define LOG_FILTER_PLAYER_ITEMS   "entities.player.items"
-#define LOG_FILTER_PLAYER_LOADING "entities.player.loading"
-#define LOG_FILTER_PLAYER_SKILLS  "entities.player.skills"
-#define LOG_FILTER_TRANSPORTS     "entities.transport"
-#define LOG_FILTER_UNITS          "entities.unit"
-#define LOG_FILTER_VEHICLES       "entities.vehicle"
-#define LOG_FILTER_GAMEEVENTS     "gameevent"
-#define LOG_FILTER_GUILD          "guild"
-#define LOG_FILTER_LFG            "lfg"
-#define LOG_FILTER_LOOT           "loot"
-#define LOG_FILTER_MAPSCRIPTS     "maps.script"
-#define LOG_FILTER_MAPS           "maps"
-#define LOG_FILTER_GENERAL        "misc"
-#define LOG_FILTER_NETWORKIO      "network"
-#define LOG_FILTER_OPCODES        "network.opcode"
-#define LOG_FILTER_SOAP           "network.soap"
-#define LOG_FILTER_OUTDOORPVP     "outdoorpvp"
-#define LOG_FILTER_POOLSYS        "pool"
-#define LOG_FILTER_RBAC           "rbac"
-#define LOG_FILTER_TSCR           "scripts"
-#define LOG_FILTER_DATABASE_AI    "scripts.ai"
-#define LOG_FILTER_SERVER_LOADING "server.loading"
-#define LOG_FILTER_AUTHSERVER     "server.authserver"
-#define LOG_FILTER_WORLDSERVER    "server.worldserver"
-#define LOG_FILTER_SPELLS_AURAS   "spells"
-#define LOG_FILTER_SQL_DEV        "sql.dev"
-#define LOG_FILTER_SQL_DRIVER     "sql.driver"
-#define LOG_FILTER_SQL            "sql.sql"
-#define LOG_FILTER_WARDEN         "warden"
-
 #define LOGGER_ROOT "root"
 
 class Log