Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
Vincent-Michael committed 2013-08-11 18:37:31 +02:00
commit f506ee3077
15 files changed
+228 -79

No files matched your search

+1 -1
View File
@@ -506,7 +506,7 @@ public:
static bool HandleDebugSendQuestInvalidMsgCommand(ChatHandler* handler, char const* args)
{
uint32 msg = atol((char*)args);
QuestFailedReason msg = static_cast<QuestFailedReason>(atol((char*)args));
handler->GetSession()->GetPlayer()->SendCanTakeQuestResponse(msg);
return true;
}