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

Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp
This commit is contained in:
Vincent-Michael committed 2014-08-26 19:21:22 +02:00
commit 741f3dde2e
334 files changed
+487 -198930

No files matched your search

+1 -1
View File
@@ -1166,7 +1166,7 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, uint64* playe
}
else
{
Player* pl = getSelectedPlayer();
Player* pl = getSelectedPlayerOrSelf();
// if allowed player pointer
if (player)
*player = pl;