Skip to content
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.

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

Core/LFG: Readd to queue if proposal denied #16279

Merged
merged 1 commit into from
Apr 11, 2016

Conversation

dmpaul26
Copy link
Contributor

Fixed the issue where if a player declines to join a dungeon when matched, the rest of the matched players were added to the back of the queue. Players now return to the front of the queue.

Also should apply to 6.x
#14331

@dmpaul26 dmpaul26 changed the title LFG Readd to queue if proposal denied [LFG] Readd to queue if proposal denied Jan 16, 2016
@jackpoz
Copy link
Contributor

jackpoz commented Jan 16, 2016

Please cleanup your commit history, squashing the 3 commits in 1 .

@@ -51,6 +51,7 @@ enum LfgUpdateType
LFG_UPDATETYPE_PROPOSAL_FAILED = 8,
LFG_UPDATETYPE_PROPOSAL_DECLINED = 9,
LFG_UPDATETYPE_GROUP_FOUND = 10,
LFG_UPDATETYPE_READDED_TO_QUEUE = 11,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this confirmed to have the value of 11?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The client does not list this value explicitly - however sending anything other than 1, 6 and 10 makes it display "You have been readded to front" text

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there are a lot of client enums that do that

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kinda went out on a limb, but it fit perfectly in the enum as if that was what was missing. The code functions without it, though.

@dmpaul26
Copy link
Contributor Author

Done. Struggled figuring out how to do it.

@Rushor Rushor changed the title [LFG] Readd to queue if proposal denied [3.3.5][6.x][LFG] Readd to queue if proposal denied Feb 2, 2016
@dmpaul26
Copy link
Contributor Author

Is this PR waiting for something else?

@Aokromes
Copy link
Member

Spp told me if you have any sniff where that type 11 is show.

@dmpaul26
Copy link
Contributor Author

Thanks for looking into this. My fault, I thought I removed the type 11. I don't have a sniff for it. I took everything involving it out, should be good to go.

@Shauren
Copy link
Member

Shauren commented Mar 17, 2016

Could you do one last change? Please rewrite the commit message - pull request title is not visible in commit log after merge

@dmpaul26
Copy link
Contributor Author

Good point, done. Or, more descriptive?

@nawuko
Copy link
Contributor

nawuko commented Mar 18, 2016

I assume something like "Core/LFG: Readd to queue if proposal denied" would be the trinitycore standard. But dont quote me on that.

Great work 👍

@ghost
Copy link

ghost commented Mar 18, 2016

Good point. When ever I write a commit message in GitExt, I make sure to use some form of category labeling like Core/LFG at the beginning (in most of my cases lately, it has been Core/Scripts) followed by a colon and a short and to-the-point title. I Prefer keeping it as close as possible to the PR title here in the issue tracker when I write the commit message. I also make sure to write a description 2 lines below (1 blank line between the commit title and the commit message content). I have seen some of the TC developers deviating from this form, but it depends on how well you want your commit described.

@Aokromes Aokromes changed the title [3.3.5][6.x][LFG] Readd to queue if proposal denied Core/LFG: Readd to queue if proposal denied Mar 18, 2016
@ghost
Copy link

ghost commented Apr 7, 2016

So is this just waiting on @dmpaul26 to update the name to something like "Core/LFG: Readd to queue if proposal denied" or what?

@Shauren
Copy link
Member

Shauren commented Apr 7, 2016

@Saben65 no, its waiting for a TDB release (indirectly), more precisely for this TODO list to get smaller #15819

@@ -117,7 +117,7 @@ std::string LFGQueue::GetDetailedMatchRoles(GuidList const& check) const
return o.str();
}

void LFGQueue::AddToQueue(ObjectGuid guid)
void LFGQueue::AddToQueue(ObjectGuid guid, bool reAdd)
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AddToQueue(ObjectGuid guid, bool reAdd /*= false*/);

@Shauren Shauren merged commit bdeeab1 into TrinityCore:3.3.5 Apr 11, 2016
DDuarte pushed a commit that referenced this pull request Apr 16, 2016
@ghost
Copy link

ghost commented May 2, 2016

i think this is bugging the current system right now. allways 1 dps or 1 tank or 1 healer missing. (without using multiple roles)

@dmpaul26
Copy link
Contributor Author

dmpaul26 commented May 2, 2016

This PR couldn't really cause that, unless I misunderstood what you meant.

@ghost
Copy link

ghost commented May 2, 2016

Well, after someone denys the "entering dungeon" that happens. so i'm guessing this could be a possible cause. Not saying that actually is, just guessing.

Aokromes pushed a commit to Aokromes/TrinityCore that referenced this pull request May 12, 2016
@ghost
Copy link

ghost commented Jun 16, 2016

is possible you're trying to "readd" offline members?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants