From b5c6b4763921ff54eacb6a2fd5191aa7de0f3c36 Mon Sep 17 00:00:00 2001
From: Trevius <weissres@gmail.com>
Date: Wed, 19 Nov 2014 22:52:49 -0600
Subject: [PATCH] Minor Merc Correction.

---
 zone/client_packet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index 76ec7b9f2..d8f23f8f7 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -9557,7 +9557,7 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
 	if (merchant_id == 0) {
 
 		//send info about your current merc(s)
-		if (GetMercID())
+		if (GetMercInfo().mercid)
 		{
 			if (MERC_DEBUG > 0)
 				Message(7, "Mercenary Debug: SendMercPersonalInfo Request");
@@ -9566,7 +9566,7 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
 		else
 		{
 			if (MERC_DEBUG > 0)
-				Message(7, "Mercenary Debug: SendMercPersonalInfo Not Sent - MercID (%i)", GetMercID());
+				Message(7, "Mercenary Debug: SendMercPersonalInfo Not Sent - MercID (%i)", GetMercInfo().mercid);
 		}
 	}