pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-03 21:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix issue with spawning Mercs (#3327)

Browse Source
This commit is contained in:
Aeadoin 2023-04-29 18:45:35 -04:00 committed by GitHub
parent 958549b407
commit db916e946e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/merc.cpp
View File

@ -4302,7 +4302,7 @@ Merc* Merc::LoadMerc(Client *c, MercTemplate* merc_template, uint32 merchant_id,
const NPCType* npc_type_to_copy = nullptr; const NPCType* npc_type_to_copy = nullptr;
if (c) { if (c) {
const NPCType* npc_type_to_copy = content_db.GetMercType(merc_template->MercNPCID, merc_template->RaceID, c->GetLevel()); npc_type_to_copy = content_db.GetMercType(merc_template->MercNPCID, merc_template->RaceID, c->GetLevel());
} }
if(npc_type_to_copy != nullptr) if(npc_type_to_copy != nullptr)