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

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Quests/QuestDef.cpp
This commit is contained in:
Vincent-Michael committed 2014-05-11 23:08:54 +02:00
commit cfe644b457
24 files changed
+3667 -2453

No files matched your search

@@ -785,7 +785,6 @@ void WorldSession::HandleSetTradeGoldOpcode(WorldPacket& recvPacket)
if (!my_trade)
return;
// gold can be incorrect, but this is checked at trade finished.
my_trade->SetMoney(gold);
}