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

Fixes duplication glitch with explosive tools in combination with itemsadder #3940

Merged
merged 7 commits into from
Sep 6, 2023

Conversation

J3fftw1
Copy link
Contributor

@J3fftw1 J3fftw1 commented Aug 8, 2023

Description

This PR resolves a duplication glitch with the Items adder plugin and Slimefun.

Proposed changes

Disable blockbreak when its a custom block from items adder.

Related Issues (if applicable)

Resolves #3836

Checklist

  • I have fully tested the proposed changes and promise that they will not break everything into chaos.
  • I have also tested the proposed changes in combination with various popular addons and can confirm my changes do not break them.
  • I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.16.* - 1.20.*).
  • I followed the existing code standards and didn't mess up the formatting.
  • I did my best to add documentation to any public classes or methods I added.
  • I have added Nonnull and Nullable annotations to my methods to indicate their behaviour for null values
  • I added sufficient Unit Tests to cover my code.

@github-actions github-actions bot added the ✨ Fix This Pull Request fixes an issue. label Aug 8, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Your Pull Request was automatically labelled as: "✨ Fix"
Thank you for contributing to this project! ❤️

@J3fftw1
Copy link
Contributor Author

J3fftw1 commented Aug 8, 2023

keeping this on draft for now.
Looking into a way to allow itemsadder blocks to be broken as well.
Comment is standing out in PluginBugs/Issues-ItemsAdder#2777

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Slimefun preview build

A Slimefun preview build is available for testing!
Commit: 26543907

https://preview-builds.walshy.dev/download/Slimefun/3940/26543907

Note: This is not a supported build and is only here for the purposes of testing.
Do not run this on a live server and do not report bugs anywhere but this PR!

@100petr
Copy link
Contributor

100petr commented Aug 8, 2023

I tried the PR and the fix is as lone wrote PluginBugs/Issues-ItemsAdder#2777 (comment) - itemsadder blocks are skipped. Vanilla blocks are destroyed, itemsadder blocks are not and nothing drops from them.

@J3fftw1 J3fftw1 marked this pull request as ready for review August 8, 2023 15:46
@J3fftw1 J3fftw1 requested a review from a team as a code owner August 8, 2023 15:46
@J3fftw1
Copy link
Contributor Author

J3fftw1 commented Aug 8, 2023

Sadly there doesnt seem to be away for us to actually drop the itemsadder block. This will be a sufficient fix for now. I do want to look into this more but that will be a follow up PR.

Copy link
Member

@TheBusyBiscuit TheBusyBiscuit left a comment

Choose a reason for hiding this comment

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

This will cause a ClassNotFoundException on every server that does not use ItemsAdder :NotLikeThis:

@J3fftw1 J3fftw1 added the Build tested Used to indicate the PR preview build has been tested by one of the team label Sep 3, 2023
JustAHuman-xD
JustAHuman-xD previously approved these changes Sep 3, 2023
Copy link
Contributor

@JustAHuman-xD JustAHuman-xD left a comment

Choose a reason for hiding this comment

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

LGTM (as much as it can, im not familiar with itemsadder api so 🤷, but the code itself is fine)

@iTwins
Copy link
Contributor

iTwins commented Sep 3, 2023

Don't know if it's possible, but if it is wouldn't the 'right' place to handle this be in the integrations package?

@J3fftw1
Copy link
Contributor Author

J3fftw1 commented Sep 4, 2023

Don't know if it's possible, but if it is wouldn't the 'right' place to handle this be in the integrations package?

good catch

Copy link
Member

@Sfiguz7 Sfiguz7 left a comment

Choose a reason for hiding this comment

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

Same as above, trusting the API to be correct I don't see any issues

@Sfiguz7 Sfiguz7 self-assigned this Sep 6, 2023
Copy link
Contributor

@JustAHuman-xD JustAHuman-xD left a comment

Choose a reason for hiding this comment

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

LGTM same as sfiguz

@Sfiguz7 Sfiguz7 merged commit d683a63 into Slimefun:master Sep 6, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build tested Used to indicate the PR preview build has been tested by one of the team ✨ Fix This Pull Request fixes an issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Duplication glitch with Explosive Pickaxe
6 participants