Skip to content

fix: Properly clear party when disbanding #2483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pandinocoder merged 1 commit into from
Jan 17, 2025
Merged

fix: Properly clear party when disbanding #2483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions Intersect.Server.Core/Entities/Player.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5254,23 +5254,28 @@ public void LeaveParty()
WarpToLastOverworldLocation(false);
}

Party ??= new List<Player>();
Party ??= [];
if (Party.Count < 1 || !Party.Contains(this))
{
return;
}

var currentParty = Party.ToList();
currentParty.Remove(this);
var remainingPartyMembers = Party.Except([this]).ToList();

string partyMessage = currentParty.Count > 1
? Strings.Parties.MemberLeft.ToString(Name)
: Strings.Parties.Disbanded;
var partyIsDisbanding = remainingPartyMembers.Count <= 1;
string partyMessage = partyIsDisbanding ? Strings.Parties.Disbanded : Strings.Parties.MemberLeft.ToString(Name);

var playersToNotify = remainingPartyMembers.ToArray();

if (partyIsDisbanding)
{
remainingPartyMembers = [];
}

// Update all members of the party with the new list
foreach (var partyMember in currentParty)
foreach (var partyMember in playersToNotify)
{
partyMember.Party = currentParty.ToList();
partyMember.Party = remainingPartyMembers.ToList();
PacketSender.SendParty(partyMember);
PacketSender.SendChatMsg(
partyMember,
Expand All @@ -5280,7 +5285,7 @@ public void LeaveParty()
);
}

Party = new List<Player>();
Party = [];
PacketSender.SendParty(this);
PacketSender.SendChatMsg(this, Strings.Parties.Left, ChatMessageType.Party, CustomColors.Alerts.Error);
}
Expand Down Expand Up @@ -7672,7 +7677,7 @@ public bool TryAddToInstanceController()
pair => pair.Key?.Id ?? Guid.Empty, pair => pair.Value
);

[JsonIgnore, NotMapped] public List<Player> Party = new List<Player>();
[JsonIgnore, NotMapped] public List<Player> Party { get; set; } = [];

[JsonIgnore, NotMapped] public Player PartyLeader => Party.FirstOrDefault();

Expand Down
Loading