pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-10 12:02:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into random

Browse Source
This commit is contained in:
Michael Cook (mackal) 2014-12-02 14:39:00 -05:00
commit 23698c1373
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zone/merc.cpp
View File

@ -5928,7 +5928,7 @@ Merc* Client::GetMerc() {
if(GetMercID() == 0) if(GetMercID() == 0)
{ {
if (MERC_DEBUG > 0) if (MERC_DEBUG > 0)
//Message(7, "Mercenary Debug: GetMerc 0."); Message(7, "Mercenary Debug: GetMerc 0.");
return (nullptr); return (nullptr);
} }
@ -5948,9 +5948,6 @@ Merc* Client::GetMerc() {
Message(7, "Mercenary Debug: GetMerc Owner Mismatch."); Message(7, "Mercenary Debug: GetMerc Owner Mismatch.");
return (nullptr); return (nullptr);
} }
if (MERC_DEBUG > 0)
//Message(7, "Mercenary Debug: GetMerc Success.");
return (tmp); return (tmp);
} }