Skip to content

fix breaking sf block with not unlocked item duping contents#3976

Merged
WalshyDev merged 2 commits into
Slimefun:masterfrom
iTwins:fix/dupe_with_disabled_items
Sep 26, 2023
Merged

fix breaking sf block with not unlocked item duping contents#3976
WalshyDev merged 2 commits into
Slimefun:masterfrom
iTwins:fix/dupe_with_disabled_items

Conversation

@iTwins

@iTwins iTwins commented Sep 19, 2023

Copy link
Copy Markdown
Contributor

Description

I you broke a Slimefun block with a not unlocked item the contents of the inventory of the block would still drop. This is because the block handler would still get called no matter the results of the tool handler.

Proposed changes

Move the tool handler code outside of the if (!e.isCancelled()) block. That way if the tool handler cancels the event, the block handler won't get called. This should have no side effects since ignoreCancelled is true and there is nothing that cancels the event above the changed code.

Related Issues (if applicable)

https://discord.com/channels/565557184348422174/565569196218384385/1153792378327535738

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.

@iTwins
iTwins requested a review from a team as a code owner September 19, 2023 21:38
@github-actions github-actions Bot added the ✨ Fix This Pull Request fixes an issue. label Sep 19, 2023
@github-actions

github-actions Bot commented Sep 19, 2023

Copy link
Copy Markdown
Contributor

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

@github-actions

github-actions Bot commented Sep 19, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

Slimefun preview build

A Slimefun preview build is available for testing!
Commit: 29eb3c71

https://preview-builds.walshy.dev/download/Slimefun/3976/29eb3c71

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!

JustAHuman-xD
JustAHuman-xD previously approved these changes Sep 20, 2023
View reviewed changes

@JustAHuman-xD JustAHuman-xD left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM I think? I can't think of anything that might break with this but I'm not 100% sure

J3fftw1
J3fftw1 previously approved these changes Sep 20, 2023
View reviewed changes
@iTwins
iTwins dismissed stale reviews from J3fftw1 and JustAHuman-xD via 81fb74f September 25, 2023 13:18
JustAHuman-xD
JustAHuman-xD approved these changes Sep 25, 2023
View reviewed changes

@JustAHuman-xD JustAHuman-xD left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@WalshyDev
WalshyDev merged commit 57a9fc6 into Slimefun:master Sep 26, 2023
@iTwins
iTwins deleted the fix/dupe_with_disabled_items branch September 26, 2023 15:56
StarWishsama pushed a commit to SlimefunGuguProject/Slimefun4 that referenced this pull request Dec 4, 2023
@ybw0014 @J3fftw1
@WalshyDev @iTwins @renovate @TheBusyBiscuit @JustAHuman-xD @Alessio-Colombo @StarWishsama
Merge upstream (#44)
39fe312 
* e2e testing initial

* Setup matrix

* Download tester

* Jeff's changes

* capitalized Chosen

* Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.1

* fix breaking sf block with not unlocked item duping contents (Slimefun#3976)

* [CI skip] Update actions/setup-java action to v3.13.0

* [CI skip] Update dependency me.clip:placeholderapi to v2.11.4

* [CI skip] Update actions/checkout action to v4

* [CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.5.0c-r5

* [CI skip] Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.6.0

* [CI skip] Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.10.0.2594

* [CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.16

* [CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.16

* [CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.224

* [CI skip] Update dependency org.mockito:mockito-core to v5.6.0

* updated dough version (Slimefun#3991)

* [CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.6.1

* [CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.17

* [CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.17

* [CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.225

* [CI skip] Update dependency org.jacoco:jacoco-maven-plugin to v0.8.11

* [CI skip] Update actions/checkout action to v4.1.1

* [CI skip] Update thollander/actions-comment-pull-request action to v2.4.3

* [CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.2.1

* [CI skip] Update dependency me.clip:placeholderapi to v2.11.5

* Update .github/workflows/e2e-testing.yml

* Update .github/workflows/e2e-testing.yml

* Update .github/workflows/e2e-testing.yml

* Update .github/workflows/e2e-testing.yml

* Add MultiBlockCraftEvent (Updated version of Slimefun#3439) (Slimefun#3928)

* fix taking damage on head collision while wearing elytra cap (Slimefun#3760)

* Remove Lore Check from Slimefun Guide (Slimefun#3969)

* don't consume bookbinder inputs if the output is worse than the input (Slimefun#3925)

Co-authored-by: Jeroen <j.teriele1@students.uu.nl>

* Update .github/workflows/e2e-testing.yml

* Update .github/workflows/e2e-testing.yml

* fix heads showing as steve (Slimefun#4027)

* fix: clean up issues after merging

* chore(style): apply code style

---------

Co-authored-by: Jeffrey <jeffrey@kosse.me>
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
Co-authored-by: iTwins <teriele.jeroen@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jeroen <48769316+iTwins@users.noreply.github.com>
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com>
Co-authored-by: Jeroen <j.teriele1@students.uu.nl>
Co-authored-by: Alessio Colombo <37039432+Sfiguz7@users.noreply.github.com>
StarWishsama pushed a commit to SlimefunGuguProject/Slimefun4 that referenced this pull request Jan 1, 2024
@ybw0014 @J3fftw1
@WalshyDev @iTwins @renovate @TheBusyBiscuit @JustAHuman-xD @Alessio-Colombo
Merge upstream (#44)
074ac0d 
* e2e testing initial

* Setup matrix

* Download tester

* Jeff's changes

* capitalized Chosen

* Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.1

* fix breaking sf block with not unlocked item duping contents (Slimefun#3976)

* [CI skip] Update actions/setup-java action to v3.13.0

* [CI skip] Update dependency me.clip:placeholderapi to v2.11.4

* [CI skip] Update actions/checkout action to v4

* [CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.5.0c-r5

* [CI skip] Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.6.0

* [CI skip] Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.10.0.2594

* [CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.16

* [CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.16

* [CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.224

* [CI skip] Update dependency org.mockito:mockito-core to v5.6.0

* updated dough version (Slimefun#3991)

* [CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.6.1

* [CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.17

* [CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.17

* [CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.225

* [CI skip] Update dependency org.jacoco:jacoco-maven-plugin to v0.8.11

* [CI skip] Update actions/checkout action to v4.1.1

* [CI skip] Update thollander/actions-comment-pull-request action to v2.4.3

* [CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.2.1

* [CI skip] Update dependency me.clip:placeholderapi to v2.11.5

* Update .github/workflows/e2e-testing.yml

* Update .github/workflows/e2e-testing.yml

* Update .github/workflows/e2e-testing.yml

* Update .github/workflows/e2e-testing.yml

* Add MultiBlockCraftEvent (Updated version of Slimefun#3439) (Slimefun#3928)

* fix taking damage on head collision while wearing elytra cap (Slimefun#3760)

* Remove Lore Check from Slimefun Guide (Slimefun#3969)

* don't consume bookbinder inputs if the output is worse than the input (Slimefun#3925)

Co-authored-by: Jeroen <j.teriele1@students.uu.nl>

* Update .github/workflows/e2e-testing.yml

* Update .github/workflows/e2e-testing.yml

* fix heads showing as steve (Slimefun#4027)

* fix: clean up issues after merging

* chore(style): apply code style

---------

Co-authored-by: Jeffrey <jeffrey@kosse.me>
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
Co-authored-by: iTwins <teriele.jeroen@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jeroen <48769316+iTwins@users.noreply.github.com>
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com>
Co-authored-by: Jeroen <j.teriele1@students.uu.nl>
Co-authored-by: Alessio Colombo <37039432+Sfiguz7@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@WalshyDev WalshyDev WalshyDev approved these changes
@JustAHuman-xD JustAHuman-xD JustAHuman-xD approved these changes
+1 more reviewer
@J3fftw1 J3fftw1 J3fftw1 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

✨ Fix This Pull Request fixes an issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@iTwins @WalshyDev @J3fftw1 @JustAHuman-xD