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.

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

Jump to bottom

Fixes issues with end crystals, block's inventory drops by explosions and LoginPacket's protocol check #260

Merged
merged 4 commits into from
May 16, 2020
Merged

Fixes issues with end crystals, block's inventory drops by explosions and LoginPacket's protocol check #260

merged 4 commits into from
May 16, 2020

Conversation

joserobjr
Copy link
Member

This PR pulls NukkitX#1425, NukkitX#1431 and NukkitX#1439 to 1.2.0.2-PN

DaMatrix and others added 3 commits May 16, 2020 19:36
@DaMatrix @joserobjr
fix a stack overflow when setting off end crystals near to each other…
4aca132 
… (NukkitX#1425)

* fix a stack overflow when setting off end crystals near to each other

(cherry picked from commit 9fea122)

* whoops i broke this in my cherry-pick

(cherry picked from commit f8e9e30)
@PetteriM1 @joserobjr
Check SUPPORTED_PROTOCOLS instead of CURRENT_PROTOCOL in LoginPacket …
4cc8e07 
…decode (NukkitX#1431)

(cherry picked from commit a25d4bf)
@PetteriM1 @joserobjr
Fix drops of block entity inventory contents on explosion (NukkitX#1439)
9007495 
(cherry picked from commit da12de6)
@joserobjr joserobjr added the Type: bug Something isn't working label May 16, 2020
@joserobjr joserobjr added this to the 1.2.0.2-PN milestone May 16, 2020
@joserobjr joserobjr self-assigned this May 16, 2020
@joserobjr joserobjr added the Resolution: resolved The issue has been addressed or the request has been accepted label May 16, 2020
@joserobjr joserobjr merged commit 1a98359 into snapshot/v1.2.0.x May 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@joserobjr joserobjr

Labels
Resolution: resolved The issue has been addressed or the request has been accepted Type: bug Something isn't working
Projects
None yet
Milestone
1.2.0.2-PN
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@joserobjr @DaMatrix @PetteriM1