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

Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/scripts/Commands/cs_reload.cpp
This commit is contained in:
Vincent-Michael committed 2014-04-25 23:42:40 +02:00
commit 1390621f4d
66 files changed
+388 -332

No files matched your search

+1 -2
View File
@@ -1376,8 +1376,7 @@ public:
}
else
{
Position pos;
transport->GetPosition(&pos);
Position pos = transport->GetPosition();
handler->PSendSysMessage("Transport %s is %s", transport->GetName().c_str(), transport->GetGoState() == GO_STATE_READY ? "stopped" : "moving");
handler->PSendSysMessage("Transport position: %s", pos.ToString().c_str());
return true;