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

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
This commit is contained in:
Vincent-Michael
2013-09-22 15:31:21 +02:00
26 changed files with 960 additions and 51 deletions

View File

@@ -2072,6 +2072,9 @@ void Guild::HandleMemberDepositMoney(WorldSession* session, uint64 amount, bool
bool Guild::HandleMemberWithdrawMoney(WorldSession* session, uint64 amount, bool repair)
{
// clamp amount to MAX_MONEY_AMOUNT, Players can't hold more than that anyway
amount = std::min(amount, uint64(MAX_MONEY_AMOUNT));
if (m_bankMoney < amount) // Not enough money in bank
return false;