Fixes #4087 and some cleanup #4088
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Your Pull Request was automatically labelled as: "✨ Fix" |
|
cc: @JustAHuman-xD |
When a block is broken we don't want to allow users to still use the inventory. This allows for them to pull items out along with blocks being dropped (if the block implements that).
This fix is in 2 parts, the main part is just preventing the inventory from being opened if the block is queued for deletion. The second smaller part is just closing the inventory for all viewers on break. We would do this during cleanup but that was a tick later, we want it done in this tick and to prevent opening before the cleaning up is ran.
WalshyDev
force-pushed
the
fix/dupe-issue-4087
branch
from
7185349
to
d80af21
Compare
|
Slimefun preview buildA Slimefun preview build is available for testing! https://preview-builds.walshy.dev/download/Slimefun/4088/1839ddca
|
src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeMap.java
Show resolved
Hide resolved
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
Show resolved
Hide resolved
J3fftw1
approved these changes
Jan 13, 2024
Sfiguz7
approved these changes
Jan 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Per #4087 if you can get into the inventory of a broken block you can easily dupe items (take them out of the inv before cleanup - 500ms by default and from block drops).
We want to fix that and there's also just some general cleanup
Proposed changes
There are 2 parts to this fix, the first is disabling opening the inventory if the block is broken. The second is closing the inventory on block create (rather than an SF tick later). Created a pretty long test to validate this behaviour and fully verified it through debugger.
I also did a bit of cleanup, and commented out
checkForSensitiveBlocksrather than the code in the function so we don't have random unused code. Moved @nonnull annotations in BiomeMap as vscode was freaking out over it being in the middle of generics.Related Issues (if applicable)
Fixes #4087
Checklist
NonnullandNullableannotations to my methods to indicate their behaviour for null values