[committed] Duel Group Patch

[Hiatus]

http://www.dolserver.net/storm/tracker/?issue=4234

Duel should end if players group up and try to attack eachother

[Graveen]

Accepted, thank you, soon in SVN !

[rdsandersjr]

Updated Tracker ticket to fix completed. Added notes, waiting for svn submission

[Xaves]

Well, is the .path file the latest code ? If yes, it bugs. What if the player doesnt have a group ? Nullexception...
The easiest way to fix it would be to look wether the player has a group or not, if yes cancel duel.
Also I think, it would be best to call this in the group.addmember method.

Just my 2 cents

[Tolakram]

I fixed it. Right now Duels do not work correctly because of the unprotected Group check.

Code: Select all

// Duel should end if players join group and trys to attack
if (ad.Attacker.Group != null && ad.Attacker.Group.IsInTheGroup(ad.Target))
{
DuelStop();
}

[Xaves]

Well, on live servers you couldnt duel with anyone that is in a group (look at the /duel challenge there it also asks for the player not having a group), that means the isinthegroup is not needed, thus it would be better to simply put it in the addmember in the group class.

Adding it to the attack doesnt make any sense to me anyways ... What if they stop attacking ? Then they are still dueling (for the server at least).

Code: Select all

public virtual bool AddMember(GameLiving living)
{
lock (m_groupMembers)
{
if (m_groupMembers.Contains(living))
return false;
m_groupMembers.Add(living);
}

living.Group = this;
living.GroupIndex = (byte)(MemberCount - 1);

UpdateGroupWindow();
// update icons of joined player to everyone in the group
UpdateMember(living, true, false);
// updae all icons for just joined player
GamePlayer p = living as GamePlayer;
if (p != null)
{
p.Out.SendGroupMembersUpdate(true);
if (p.DuelTarget != null)
p.DuelStop();
}

SendMessageToGroupMembers(living.Name + " has joined the group.", eChatType.CT_System, eChatLoc.CL_SystemWindow);
GameEventMgr.Notify(GroupEvent.MemberJoined, this, new MemberJoinedEventArgs(living));
return true;
}

[Graveen]

On live, iirc you are in duel until an offensive action in pve, rvr or logoff. Not sure if there is not also a timer