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

Send real player entity id, implement EntityResurrectEvent, fix #1049 #1050

Merged
merged 3 commits into from
Jul 23, 2019
Merged

Send real player entity id, implement EntityResurrectEvent, fix #1049 #1050

merged 3 commits into from
Jul 23, 2019

Conversation

SHADOWDANCH
Copy link
Contributor

This pull request do such changes:

  • Now server will send real entity id to player that join server instead 0, like it is works in official mojang server.
  • For storing living entity potion effects now uses ConcurrentHashMap instead HashMap. Fixes ConcurrentModificationException while removing more then 1 potion effect #1049.
  • Implemented firing of EntityResurrectEvent and reworked "Totem of Undying" logic to work more like in vanilla.

P.S: my english is not best :D. Feel free to say in comments if i spell something wrong.

@CLAassistant
Copy link

CLAassistant commented Jul 22, 2019

CLA assistant check
All committers have signed the CLA.

@Paulomart
Copy link
Member

I would suggest splitting this PR into three separate ones. But that would be up the maintainers.

@mastercoms
Copy link
Member

They're small enough for me not to mind this time.

@SHADOWDANCH
Copy link
Contributor Author

I would suggest splitting this PR into three separate ones. But that would be up the maintainers.

I think about it too but for me this changes separated looks very small for pr.

@mastercoms
Copy link
Member

mastercoms commented Jul 22, 2019

I think about it too but for me this changes separated looks very small for pr.

The changes might be small. But, what if we approve one of your changes, but not the other? Then the whole PR is stalled for longer than it needs to be.

@mastercoms mastercoms merged commit c1fa660 into GlowstoneMC:dev Jul 23, 2019
@mastercoms
Copy link
Member

Thank you for your contribution to Glowstone!

@SHADOWDANCH SHADOWDANCH deleted the patch branch July 23, 2019 10:08
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.

ConcurrentModificationException while removing more then 1 potion effect
4 participants