diff options
| -rw-r--r-- | sql/base/auth_database.sql | 26 | ||||
| -rw-r--r-- | src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 6 |
4 files changed, 33 insertions, 5 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 943be73b20f..05e680f94eb 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -126,6 +126,32 @@ CREATE TABLE `ip_banned` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Banned IPs'; /*!40101 SET character_set_client = @saved_cs_client */; +/*Table structure for table `ip2nation` */ + +DROP TABLE IF EXISTS `ip2nation`; + +CREATE TABLE `ip2nation` ( + `ip` int(11) unsigned NOT NULL DEFAULT '0', + `country` char(2) NOT NULL DEFAULT '', + KEY `ip` (`ip`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +/*Table structure for table `ip2nationCountries` */ + +DROP TABLE IF EXISTS `ip2nationCountries`; + +CREATE TABLE `ip2nationCountries` ( + `code` varchar(4) NOT NULL DEFAULT '', + `iso_code_2` varchar(2) NOT NULL DEFAULT '', + `iso_code_3` varchar(3) DEFAULT '', + `iso_country` varchar(255) NOT NULL DEFAULT '', + `country` varchar(255) NOT NULL DEFAULT '', + `lat` float NOT NULL DEFAULT '0', + `lon` float NOT NULL DEFAULT '0', + PRIMARY KEY (`code`), + KEY `code` (`code`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + -- -- Dumping data for table `ip_banned` -- diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 4c80d268c12..94964568695 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -658,7 +658,7 @@ void AuctionEntry::SaveToDB(SQLTransaction& trans) const stmt->setUInt32(2, itemGUIDLow); stmt->setUInt32(3, owner); stmt->setInt32 (4, int32(buyout)); - stmt->setUInt64(5, uint64(expire_time)); + stmt->setUInt32(5, uint32(expire_time)); stmt->setUInt32(6, bidder); stmt->setInt32 (7, int32(bid)); stmt->setInt32 (8, int32(startbid)); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index e12e5eef238..4114dd6109f 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16910,7 +16910,9 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) PreparedQueryResult result = holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_FROM); if (!result) { - sLog->outError(LOG_FILTER_PLAYER, "Player (GUID: %u) not found in table `characters`, can't load. ", guid); + std::string name = "<unknown>"; + sObjectMgr->GetPlayerNameByGUID(guid, name); + sLog->outError(LOG_FILTER_PLAYER, "Player %s (GUID: %u) not found in table `characters`, can't load. ", name.c_str(), guid); return false; } diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 158a20d67d1..6421f9caa65 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -986,10 +986,10 @@ void Guild::BankMoveItemData::LogAction(MoveItemData* pFrom) const if (!pFrom->IsBank() && m_pPlayer->GetSession()->HasPermission(RBAC_PERM_LOG_GM_TRADE)) /// @todo Move this to scripts { sLog->outCommand(m_pPlayer->GetSession()->GetAccountId(), - "GM %s (Account: %u) deposit item: %s (Entry: %d Count: %u) to guild bank (Guild ID: %u)", - m_pPlayer->GetName().c_str(), m_pPlayer->GetSession()->GetAccountId(), + "GM %s (Guid: %u) (Account: %u) deposit item: %s (Entry: %d Count: %u) to guild bank named: %s (Guild ID: %u)", + GUID_LOPART(m_pPlayer->GetGUID()), m_pPlayer->GetName().c_str(), m_pPlayer->GetSession()->GetAccountId(), pFrom->GetItem()->GetTemplate()->Name1.c_str(), pFrom->GetItem()->GetEntry(), pFrom->GetItem()->GetCount(), - m_pGuild->GetId()); + m_pGuild->GetName().c_str(), m_pGuild->GetId()); } } |