pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-18 03:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for forage crash

Browse Source
This commit is contained in:
KimLS 2014-09-07 22:41:42 -07:00
parent b392d16808
commit a3b54e5cae
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/database.cpp
View File

@ -319,7 +319,7 @@ bool Database::DeleteAccount(const char* name) {
} }
bool Database::SetLocalPassword(uint32 accid, const char* password) { bool Database::SetLocalPassword(uint32 accid, const char* password) {
std::string query = StringFormat("UPDATE account SET password=MD5('%s') where id=%i;", password, accid); std::string query = StringFormat("UPDATE account SET password=MD5('%s') where id=%i;", EscapeString(password).c_str(), accid);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);

4
zone/forage.cpp
View File

@ -356,11 +356,13 @@ void Client::GoFish()
inst = m_inv.GetItem(MainCursor); inst = m_inv.GetItem(MainCursor);
} }
if(inst) {
std::vector<EQEmu::Any> args; std::vector<EQEmu::Any> args;
args.push_back(inst); args.push_back(inst);
parse->EventPlayer(EVENT_FISH_SUCCESS, this, "", inst->GetID(), &args); parse->EventPlayer(EVENT_FISH_SUCCESS, this, "", inst->GetID(), &args);
} }
} }
}
else else
{ {
//chance to use bait when you dont catch anything... //chance to use bait when you dont catch anything...
@ -470,10 +472,12 @@ void Client::ForageItem(bool guarantee) {
inst = m_inv.GetItem(MainCursor); inst = m_inv.GetItem(MainCursor);
} }
if(inst) {
std::vector<EQEmu::Any> args; std::vector<EQEmu::Any> args;
args.push_back(inst); args.push_back(inst);
parse->EventPlayer(EVENT_FORAGE_SUCCESS, this, "", inst->GetID(), &args); parse->EventPlayer(EVENT_FORAGE_SUCCESS, this, "", inst->GetID(), &args);
} }
}
int ChanceSecondForage = aabonuses.ForageAdditionalItems + itembonuses.ForageAdditionalItems + spellbonuses.ForageAdditionalItems; int ChanceSecondForage = aabonuses.ForageAdditionalItems + itembonuses.ForageAdditionalItems + spellbonuses.ForageAdditionalItems;
if(!guarantee && MakeRandomInt(0,99) < ChanceSecondForage) { if(!guarantee && MakeRandomInt(0,99) < ChanceSecondForage) {