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

Grouping with Mercenaries is considerably less buggy.

Browse Source
This commit is contained in:
Trevius
2014-11-22 00:22:12 -06:00
parent b5c6b47639
commit c5a90adb39
12 changed files with 595 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_process.cpp
+2 -3
View File
@@ -245,7 +245,6 @@ bool Client::Process() {
if(GetMercInfo().MercTemplateID != 0 && GetMercInfo().IsSuspended)
{
//CheckMercSuspendTimer();
if(p_timers.Expired(&database, pTimerMercSuspend, false))
{
CheckMercSuspendTimer();
@@ -746,9 +745,9 @@ bool Client::Process() {
{
entity_list.MessageGroup(this, true, 15, "%s left the zone.", GetName());
mygroup->MemberZoned(this);
if (GetMerc() && GetMerc()->HasGroup() && GetMerc()->GetGroup() == mygroup)
if (GetMerc() && GetMerc()->HasGroup())
{
mygroup->DelMember(GetMerc());
GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
}
}