Fix merge conflic and typos in worldserver config file and characters.sql

This commit is contained in:
Spp committed 2012-11-09 09:03:29 +01:00
1 parent 35d63a9799
commit ccf593c673
3 files changed
+7 -6

No files matched your search

+2 -2
View File
@@ -1680,10 +1680,10 @@ void Guild::HandleBuyBankTab(WorldSession* session, uint8 tabId)
if (!tabCost)
return;
if (!player->HasEnoughMoney(tabCost)) // Should not happen, this is checked by client
if (!player->HasEnoughMoney(uint64(tabCost))) // Should not happen, this is checked by client
return;
player->ModifyMoney(-int32(tabCost));
player->ModifyMoney(-int64(tabCost));
_CreateNewBankTab();
_BroadcastEvent(GE_BANK_TAB_PURCHASED, 0);