Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Fix CRLF and no newline in a couple of sqls

Browse Source 
* Slight change to update loop to ensure expired auctions are't left in AH.

--HG--
branch : trunk
This commit is contained in:
Paradox
2009-10-13 18:35:36 -04:00
parent 5bab3b0d09
commit 67f9dbab58
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/5866_gameobject_template.sql
View File

@@ -1 +1,2 @@
UPDATE `gameobject_template` SET `type`='10',`data0`='0',`ScriptName`='go_wg2voa_portal' WHERE (`entry`='190763');
UPDATE `gameobject_template` SET `type`='10',`data0`='0',`ScriptName`='go_wg2voa_portal' WHERE (`entry`='190763');

2
sql/updates/5868_world.sql
View File

@@ -1,4 +1,4 @@
UPDATE `gameobject_template` SET `ScriptName` = 'go_matrix_punchograph' WHERE `gameobject_template`.`entry` =142345 LIMIT 1 ;
UPDATE `gameobject_template` SET `ScriptName` = 'go_matrix_punchograph' WHERE `gameobject_template`.`entry` =142475 LIMIT 1 ;
UPDATE `gameobject_template` SET `ScriptName` = 'go_matrix_punchograph' WHERE `gameobject_template`.`entry` =142476 LIMIT 1 ;
UPDATE `gameobject_template` SET `ScriptName` = 'go_matrix_punchograph' WHERE `gameobject_template`.`entry` =142696 LIMIT 1 ;
UPDATE `gameobject_template` SET `ScriptName` = 'go_matrix_punchograph' WHERE `gameobject_template`.`entry` =142696 LIMIT 1 ;

11
src/game/AuctionHouseMgr.cpp
View File

@@ -506,7 +506,7 @@ void AuctionHouseObject::Update()
if (AuctionsMap.empty())
return;
QueryResult* result = CharacterDatabase.PQuery("SELECT id FROM auctionhouse WHERE time <= %u ORDER BY TIME ASC", (uint32)curTime);
QueryResult* result = CharacterDatabase.PQuery("SELECT id FROM auctionhouse WHERE time <= %u ORDER BY TIME ASC", (uint32)curTime+60);
if (!result)
{
@@ -530,15 +530,8 @@ void AuctionHouseObject::Update()
delete result;
vector<uint32>::iterator iter = expiredAuctions.begin();
for (uint32 count = 1;count <= 50;++count)
while (!expiredAuctions.empty())
{
// Do we have any expired auctions? If not, stop here.
if (expiredAuctions.empty())
{
count = 50;
continue;
}
// from auctionhousehandler.cpp, creates auction pointer & player pointer
AuctionEntry* auction = GetAuction(*iter);