GlowstoneMC / Glowstone

A fast, customizable and compatible open source server for Minecraft: Java Edition
https://glowstone.net
Other
1.88k stars 270 forks source link

[WIP] Adds new 1.13 packets #1100

Closed einsJannis closed 3 years ago

einsJannis commented 3 years ago

I plan to add a bunch of packets if not all of them and if not too big of a task the corresponding handlers. As of 7:47 pm 11/07/2020 this pull request only contains two new packets and one half complete handler. I hope I did everything right (this is my first time contributing to an open-source project) and I wish you a nice day :)

CLAassistant commented 3 years ago

CLA assistant check
All committers have signed the CLA.

mastercoms commented 3 years ago

You should branch from 1.15, not 1.13.

einsJannis commented 3 years ago

Is there a way to do that without coping the modified files into a new branch which is branched from 1.15 and then creating a new pull request?

mastercoms commented 3 years ago

git rebase --onto 1.15 1.13 1.13-ProtocolUpdate

einsJannis commented 3 years ago

thanks bro

einsJannis commented 3 years ago

I had some issues but I think I managed to do it

mastercoms commented 3 years ago

Yep, just remember next time when you rebase onto another branch, you'll have to do a git push --force-with-lease.

einsJannis commented 3 years ago

Ok I'm kinda confused now, I thought I already rebased an pushed?

mastercoms commented 3 years ago

What seems to have happened is that you pulled the remote branch into your branch, upon being prompted due to the histories being diverged. The correct action would have been to force push, rather than merge the remote branch into your local with a pull. This added the duplicate commits, as well as the merge commit which muddies the history of this branch. I'd recommend reseting back to 442ce0af4722f17ba8969129c51a4846bdd37af9 (git reset --hard 442ce0af4722f17ba8969129c51a4846bdd37af9), then force pushing (git push -f).

einsJannis commented 3 years ago

I think I did it now

mastercoms commented 3 years ago

Yep! 🤗

aramperes commented 3 years ago

This is largely superseded by #1104 now.