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

Mercenaries now Dismiss, Suspend, Unsuspend, and Die correctly.

Browse Source
This commit is contained in:
Trevius
2014-11-19 22:43:19 -06:00
parent 8f32a9949b
commit 6c5248b9a9
5 changed files with 134 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_packet.cpp
+12 -6
View File
@@ -9557,6 +9557,17 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
if (merchant_id == 0) {
//send info about your current merc(s)
if (GetMercID())
{
if (MERC_DEBUG > 0)
Message(7, "Mercenary Debug: SendMercPersonalInfo Request");
SendMercPersonalInfo();
}
else
{
if (MERC_DEBUG > 0)
Message(7, "Mercenary Debug: SendMercPersonalInfo Not Sent - MercID (%i)", GetMercID());
}
}
if (!RuleB(Mercs, AllowMercs)) {
@@ -9699,12 +9710,7 @@ void Client::Handle_OP_MercenaryDismiss(const EQApplicationPacket *app)
Message(7, "Mercenary Debug: Dismiss Request ( %i ) Received.", Command);
// Handle the dismiss here...
Merc* merc = GetMerc();
if (merc) {
if (CheckCanDismissMerc()) {
merc->Dismiss();
}
}
DismissMerc(GetMercInfo().mercid); // GetMercID()
}