mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed some unnecessary database queries.

Browse source 
Removed unnecessary database queries in some command handlers.
Replaced them with access to cached data or queries for only the needed data.
Move database access in gossip select code to less often called place.
This commit is contained in:
hunuza 2008-11-02 15:58:24 +01:00 • committed by tomrus88
parent 004bdf1d3c
commit 79cb959991
2 changed files with 50 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/Creature.cpp
View file

@ -821,18 +821,20 @@ void Creature::OnGossipSelect(Player* player, uint32 option)
return; return;
} }
uint32 textid=GetGossipTextId( action, zoneid);
if(textid==0)
textid=GetNpcTextId();
switch (gossip->Action) switch (gossip->Action)
{ {
case GOSSIP_OPTION_GOSSIP: case GOSSIP_OPTION_GOSSIP:
{
uint32 textid = GetGossipTextId(action, zoneid);
if (textid == 0)
textid=GetNpcTextId();
player->PlayerTalkClass->CloseGossip(); player->PlayerTalkClass->CloseGossip();
player->PlayerTalkClass->SendTalking( textid ); player->PlayerTalkClass->SendTalking(textid);
break; break;
}
case GOSSIP_OPTION_SPIRITHEALER: case GOSSIP_OPTION_SPIRITHEALER:
if( player->isDead() ) if (player->isDead())
CastSpell(this,17251,true,NULL,NULL,player->GetGUID()); CastSpell(this,17251,true,NULL,NULL,player->GetGUID());
break; break;
case GOSSIP_OPTION_QUESTGIVER: case GOSSIP_OPTION_QUESTGIVER:

81
src/game/Level3.cpp
View file

@ -1988,9 +1988,39 @@ bool ChatHandler::HandleAddItemSetCommand(const char* args)
sLog.outDetail(GetMangosString(LANG_ADDITEMSET), itemsetId); sLog.outDetail(GetMangosString(LANG_ADDITEMSET), itemsetId);
QueryResult *result = WorldDatabase.PQuery("SELECT entry FROM item_template WHERE itemset = %u",itemsetId); bool found = false;
for (uint32 id = 0; id < sItemStorage.MaxEntry; id++)
{
ItemPrototype const *pProto = sItemStorage.LookupEntry<ItemPrototype>(id);
if (!pProto)
continue;
if(!result) if (pProto->ItemSet == itemsetId)
{
found = true;
ItemPosCountVec dest;
uint8 msg = plTarget->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, pProto->ItemId, 1 );
if (msg == EQUIP_ERR_OK)
{
Item* item = plTarget->StoreNewItem( dest, pProto->ItemId, true);
// remove binding (let GM give it to another player later)
if (pl==plTarget)
item->SetBinding( false );
pl->SendNewItem(item,1,false,true);
if (pl!=plTarget)
plTarget->SendNewItem(item,1,true,false);
}
else
{
pl->SendEquipError( msg, NULL, NULL );
PSendSysMessage(LANG_ITEM_CANNOT_CREATE, pProto->ItemId, 1);
}
}
}
if (!found)
{ {
PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND,itemsetId); PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND,itemsetId);
@ -1998,35 +2028,6 @@ bool ChatHandler::HandleAddItemSetCommand(const char* args)
return false; return false;
} }
do
{
Field *fields = result->Fetch();
uint32 itemId = fields[0].GetUInt32();
ItemPosCountVec dest;
uint8 msg = plTarget->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, itemId, 1 );
if( msg == EQUIP_ERR_OK )
{
Item* item = plTarget->StoreNewItem( dest, itemId, true);
// remove binding (let GM give it to another player later)
if(pl==plTarget)
item->SetBinding( false );
pl->SendNewItem(item,1,false,true);
if(pl!=plTarget)
plTarget->SendNewItem(item,1,true,false);
}
else
{
pl->SendEquipError( msg, NULL, NULL );
PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemId, 1);
}
}while( result->NextRow() );
delete result;
return true; return true;
} }
@ -4680,16 +4681,18 @@ bool ChatHandler::HandleAddQuest(const char* args)
} }
// check item starting quest (it can work incorrectly if added without item in inventory) // check item starting quest (it can work incorrectly if added without item in inventory)
QueryResult *result = WorldDatabase.PQuery("SELECT entry FROM item_template WHERE startquest = '%u' LIMIT 1",entry); for (uint32 id = 0; id < sItemStorage.MaxEntry; id++)
if(result)
{ {
Field* fields = result->Fetch(); ItemPrototype const *pProto = sItemStorage.LookupEntry<ItemPrototype>(id);
uint32 item_id = fields[0].GetUInt32(); if (!pProto)
delete result; continue;
PSendSysMessage(LANG_COMMAND_QUEST_STARTFROMITEM, entry,item_id); if (pProto->StartQuest == entry)
SetSentErrorMessage(true); {
return false; PSendSysMessage(LANG_COMMAND_QUEST_STARTFROMITEM, entry, pProto->ItemId);
SetSentErrorMessage(true);
return false;
}
} }
// ok, normal (creature/GO starting) quest // ok, normal (creature/GO starting) quest