-
Notifications
You must be signed in to change notification settings - Fork 45
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
Velocity Support #139
base: master
Are you sure you want to change the base?
Velocity Support #139
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found some stuff I would like to be changed. I'll try see if I can find more
This should possibly be mostly in lib |
It's so small that I don't think it deserves a separate lib but possibly could move the key stuff I guess to a different crate but I probably won't do it |
This could possibly be merged after authentication is implemented? |
It really doesn't matter but I want #140 to be merged before this so I might mark this back as a draft not 100% sure |
This reverts commit 13bf0b5.
That test commit wasn't supposed to be here 😭 edit: I don't think the code test commit pushed even worked and I want to figure out how to have the API and how to parse it right now anyway minimessage stuff I think want to be in a separate pr |
This is on by default? |
Pretty much ready |
I am going to try this with two servers. |
Could you rebase your branch @GStudiosX2 on the latest master? As there was a big change to the the repo for proc macros. |
This will solve the github action failures. |
You also might want to consider squashing before merge as there is a lot of commits. |
I'm not sure why but I can't rebase so I'll just have to do a regular merge commit I think |
Isn't squashing something for when this pr is being merged by someone with merge perms? |
Well it's ment to squash commits to keep the merge commits small that it's job.
|
Well anyway the fix wasn't merged lol And I have also fucked up all rebase merges I've done that has conflicts so I'd rather not do it |
Well either way it's failing at:
|
This merge was kinda fucked git is so annoying sometimes |
Where the fuck did the commit go to fix conflicts and merge 😭 |
9826ae0
to
427bb86
Compare
I hopefully fixed the merge though I forgot to remove those 5 duplicate commits but eh idrc |
features
changes
ferrumc_net::connection::PlayerStartLoginEvent
Used by
whitelist.rs
andvelocity.rs
Other
Not sure why I added this I don't think I use it but could be for custom event errors I guess?
Kick
breaking changes
ferrumc_net::utils::state::TerminateConnectionPlayerExt
type Data: Send + Sync;
totype Data: Event;
this is so I could useis_cancelled
if there's another way please suggest changes