pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merc logic fix for heal spells - allows mercs to select fast healing spells as a 'standard' healing spell & new rule for unsuspend

Browse Source
This commit is contained in:
E Spause
2017-03-13 06:26:48 -04:00
parent 67a95b59a7
commit 79f9433dfa
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/merc.cpp
+10 -1
View File
@@ -5468,7 +5468,7 @@ void Client::SuspendMercCommand() {
Merc* merc = Merc::LoadMerc(this, &zone->merc_templates[GetMercInfo().MercTemplateID], 0, true);
if(merc)
{
SpawnMerc(merc, true);
SpawnMerc(merc, false);
Log.Out(Logs::General, Logs::Mercenaries, "SuspendMercCommand Successful Unsuspend for %s.", GetName());
}
else
@@ -5482,6 +5482,15 @@ void Client::SuspendMercCommand() {
{
Merc* CurrentMerc = GetMerc();
if (!RuleB(Mercs, AllowMercSuspendInCombat))
{
if (!CheckCanSpawnMerc(GetMercInfo().MercTemplateID))
{
return;
}
}
if(CurrentMerc && GetMercID())
{
CurrentMerc->Suspend();