pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-14 03:38:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from EQEmu/master

Browse Source 
Sync
This commit is contained in:
Kemmler
2013-05-05 05:16:33 -07:00
parent 1e1434730c e1c2657b11
commit 1f8c17a07d
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/merc.cpp
+2 -1
View File
@@ -275,7 +275,8 @@ void Merc::CalcItemBonuses(StatBonuses* newbon) {
if(equipment[i] == 0)
continue;
const Item_Struct * itm = database.GetItem(equipment[i]);
AddItemBonuses(itm, newbon);
if(itm)
AddItemBonuses(itm, newbon);
}
//Power Source Slot
zone/net.cpp
+8 -4
View File
@@ -284,9 +284,11 @@ int main(int argc, char** argv) {
}
parse = new QuestParserCollection();
PerlXSParser *pxs = new PerlXSParser();
Parser *ps = new Parser();
parse->RegisterQuestInterface(pxs, "pl");
#ifdef EMBPERL
PerlXSParser *pxs = new PerlXSParser();
parse->RegisterQuestInterface(pxs, "pl");
#endif
Parser *ps = new Parser();
//parse->RegisterQuestInterface(ps, "qst");
@@ -473,7 +475,9 @@ int main(int argc, char** argv) {
entity_list.Clear();
safe_delete(parse);
safe_delete(pxs);
#ifdef EMBPERL
safe_delete(pxs);
#endif
safe_delete(ps);
safe_delete(mmf);