Merge branch '4.3.4' of http://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
This commit is contained in:
commit
f3f00d5435
3 files changed
+1
-5
No files matched your search
@@ -472,7 +472,6 @@ CREATE TABLE `creature_questitem` (
|
||||
`CreatureEntry` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`Idx` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`ItemId` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`CreatureEntry`,`Idx`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
@@ -1155,7 +1154,6 @@ CREATE TABLE `gameobject_questitem` (
|
||||
`GameObjectEntry` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`Idx` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`ItemId` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`GameObjectEntry`,`Idx`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -382,7 +382,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
||||
AH->etime = etime;
|
||||
AH->auctionHouseEntry = auctionHouseEntry;
|
||||
|
||||
TC_LOG_INFO("network", "CMSG_AUCTION_SELL_ITEM: Player %s (guid %d) is selling item %s entry %u (guid %d) with count %u with initial bid %u with buyout %u and with time %u (in sec) in auctionhouse %u",
|
||||
TC_LOG_INFO("network", "CMSG_AUCTION_SELL_ITEM: Player %s (guid %d) is selling item %s entry %u (guid %d) with count %u with initial bid " UI64FMTD " with buyout " UI64FMTD " and with time %u (in sec) in auctionhouse %u",
|
||||
_player->GetName().c_str(), _player->GetGUID().GetCounter(), newItem->GetTemplate()->Name1.c_str(), newItem->GetEntry(), newItem->GetGUID().GetCounter(), newItem->GetCount(), bid, buyout, auctionTime, AH->GetHouseId());
|
||||
sAuctionMgr->AddAItem(newItem);
|
||||
auctionHouse->AddAuction(AH);
|
||||
|
||||
@@ -488,8 +488,6 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
Map* map = object->GetMap();
|
||||
|
||||
object->Relocate(x, y, z, object->GetOrientation());
|
||||
object->SaveToDB();
|
||||
|
||||
|
||||
Reference in new issue
Block a user