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

Fix issue with leaving queue #5

Merged
merged 2 commits into from
Aug 9, 2019
Merged

Fix issue with leaving queue #5

merged 2 commits into from
Aug 9, 2019

Conversation

ELdoBA
Copy link

@ELdoBA ELdoBA commented Aug 9, 2019

  • Fix issue with leaving queue, Already tested and confirmed as fixed, comment here :

Closes: #2

#3 (comment)

- Fix issue with leaving queue
@ELdoBA ELdoBA changed the title Update npc_arena1v1.cpp Fix issue with leaving queue Aug 9, 2019
@@ -279,8 +279,12 @@ class npc_1v1arena : public CreatureScript

case 3: // Leave Queue
{
uint8 arenaType = ARENA_TYPE_5v5;
if (player->InBattlegroundQueueForBattlegroundQueueType(BATTLEGROUND_QUEUE_5v5))
arenaType = ARENA_TYPE_5v5;
Copy link
Member

Choose a reason for hiding this comment

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

why this reassignment to the same value?

Copy link
Author

Choose a reason for hiding this comment

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

This PR contain code duplicate of #4

immagine

I think we could close it and focus on #4 that contains more improvements, do you agree?
@poszer, @Winfidonarleyan?

Are you serious? :D

@Helias
Copy link
Member

Helias commented Aug 9, 2019

This PR contain code duplicate of #4

immagine

I think we could close this and focus on #4 that contains more improvements, do you agree?
@poszer, @Winfidonarleyan?

@ELdoBA
Copy link
Author

ELdoBA commented Aug 9, 2019

This PR contain code duplicate of #4

immagine

I think we could close this and focus on #4 that contains more improvements, do you agree?
@poszer, @Winfidonarleyan?

Screenshot_2

@ELdoBA
Copy link
Author

ELdoBA commented Aug 9, 2019

This PR contain code duplicate of #4

immagine

I think we could close this and focus on #4 that contains more improvements, do you agree?
@poszer, @Winfidonarleyan?

And to be clear, this commit is created before other one, tested and confirmed as working one

@masterking32
Copy link

tested and working. I can correctly leave the Arena Queue clicking on NPC gossip

@Helias
Copy link
Member

Helias commented Aug 9, 2019

We could merge both PRs to give the credits to both.

@FrancescoBorzi
Copy link
Member

agree, please merge both

@milestorme
Copy link

Thank you @poszer can merge this

Copy link

@milestorme milestorme left a comment

Choose a reason for hiding this comment

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

Thank you

@FrancescoBorzi FrancescoBorzi merged commit 40968d5 into azerothcore:master Aug 9, 2019
Copy link

@milestorme milestorme left a comment

Choose a reason for hiding this comment

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

Approved

@FrancescoBorzi
Copy link
Member

for some reasons squash failed, it merged without squashing commits

@ELdoBA
Copy link
Author

ELdoBA commented Aug 9, 2019

for some reasons squash failed, it merged without squashing commits

The other PR is not needed. The module works now perfectly except Skirmish. And other PR commit wont fix it

@FrancescoBorzi
Copy link
Member

@Poszer please discuss it in the other pr, not here. I don't have time to check it now

MeGoEA pushed a commit to MeGoEA/mod-1v1-arena that referenced this pull request Aug 13, 2019
This reverts commit 40968d5, reversing
changes made to 0fe4a13.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Leave the queue
5 participants