Fix ExprDurability's Changer #6154
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
UnderscoreTud
added
the
bug
UnderscoreTud
added
the
needs testing
sovdeeth
approved these changes
Oct 30, 2023
| } | ||
| } | ||
|
|
||
| private int translate(Material material, int value) { |
There was a problem hiding this comment.
please name this better or give it some comments
it's very hard to know what it's supposed to do without reading the code inside it
Moderocky
approved these changes
Oct 30, 2023
APickledWalrus
approved these changes
Oct 31, 2023
Comment on lines
+126
to
+129
| int maxDurability = material.getMaxDurability(); | ||
| if (maxDurability == 0) | ||
| return 0; | ||
| return maxDurability - value; |
There was a problem hiding this comment.
Suggested change
| int maxDurability = material.getMaxDurability(); | |
| if (maxDurability == 0) | |
| return 0; | |
| return maxDurability - value; | |
| return Math.max(material.getMaxDurability() - value, 0); |
Would be nice :) (unless negative values are intended?)
There was a problem hiding this comment.
I would rather have the ability to go negative if I so desired than to be locked out of it and resort to reflect
There was a problem hiding this comment.
I am not actually sure if a negative durability value is valid. If they are, then this does not need to be done.
There was a problem hiding this comment.
You can certainly have an item with negative durability, it just looks stupid in game
I tested it out when I reviewed this
sovdeeth
added a commit
that referenced
this pull request
Dec 17, 2023
* Fix ExprRandomNumber using a method from Java 17 (#6022) * Fix changing remaining time of command cooldown (#6021) Update ScriptCommand.java Co-authored-by: Moderocky <admin@moderocky.com> * Bump version to 2.7.1 (#5993) Co-authored-by: Moderocky <admin@moderocky.com> * fix 3 stray INSERT VERSIONs from 2.7.0 (#6027) correct incorrect values * Fix Documentation Actions on dev/patch (#6042) * Tidy up parts of config class. (#6025) * Add Release Model Document (#6041) Add release model document Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com> Co-authored-by: Moderocky <admin@moderocky.com> * (Cherry Pick) Fix cast throwing if existing variable for command storage exists (#5942) (#6026) Fix cast throwing if existing variable for command storage exists (#5942) * Fix cast throwing if existing variable for command storage exists * Update src/main/java/ch/njol/skript/command/ScriptCommand.java --------- Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com> * (Cherry Pick) Fix NPE with invalid attributes and clean up ExprEntityAttribute (#5978) (#6023) Fix NPE with invalid attributes and clean up ExprEntityAttribute (#5978) * Avoid NPE and clean up class * Update ExprEntityAttribute.java * Update src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java * Update src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java --------- Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com> Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com> * Fix multiple aliases sections not working (#6050) * Fix error when unloading a script with multiple variables sections (#6047) * Returns the old 2.6.4 duplicate variables section behaviour. * Add an error but i don't know what it's for * Add lots of brackets to keep walrus happy :}}} * Add load tracker to prevent multiple loading. * Prevent variable data wipe, fix another bug * Support IDEs from the dark ages that don't know what a star is and think it orbits the earth or something * add a test --------- Co-authored-by: APickledWalrus <apickledwalrus@gmail.com> * Bump actions/checkout from 3 to 4 (#6029) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... * ⚒ Disable Javadocs generation for nightly docs & improvements (#6059) * Let's see if I am good at GH actions 🤞 * ops! * Use proper docs template reference when possible * Disable nightly javadocs generation with an option Each javadoc is ~50mb, which was causing the big size of the docs! while each docs generation is ~2mb only * Fix building * Revert pull changes They are not what fixed the issue, probably the old PRs aren't syncing for some reason * Update build.gradle --------- Co-authored-by: Moderocky <admin@moderocky.com> * Change the target branch of dependabot (#6063) Update dependabot.yml * ⚒ Fix stop all sounds NPE (#6067) * Bump actions/checkout from 3 to 4 (#6069) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> * Bump org.gradle.toolchains.foojay-resolver-convention from 0.5.0 to 0.7.0 (#6070) Bump org.gradle.toolchains.foojay-resolver-convention Bumps org.gradle.toolchains.foojay-resolver-convention from 0.5.0 to 0.7.0. --- updated-dependencies: - dependency-name: org.gradle.toolchains.foojay-resolver-convention dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> * Bump org.easymock:easymock from 5.1.0 to 5.2.0 (#6071) Bumps [org.easymock:easymock](https://github.com/easymock/easymock) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/easymock/easymock/releases) - [Changelog](https://github.com/easymock/easymock/blob/master/ReleaseNotes.md) - [Commits](easymock/easymock@easymock-5.1.0...easymock-5.2.0) --- updated-dependencies: - dependency-name: org.easymock:easymock dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> * Bump io.papermc.paper:paper-api from 1.20.1-R0.1-SNAPSHOT to 1.20.2-R0.1-SNAPSHOT (#6072) * Bump io.papermc.paper:paper-api Bumps io.papermc.paper:paper-api from 1.20.1-R0.1-SNAPSHOT to 1.20.2-R0.1-SNAPSHOT. --- updated-dependencies: - dependency-name: io.papermc.paper:paper-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Apply 1.20.2 to the test runner * Deprecate org.bukkit.util.Consumer usage in EntityData * Adapt against the Java Consumer instead of Bukkit's * Resolve existing method deprecation * Adapt against the Java Consumer instead of Bukkit's * Update developer note * Result in reflection for Bukkit Consumer * Resolve ThrownPotion Consumer * Result in reflection for Bukkit Consumer * Pretty else if * Add common reflective spawn method. * Use common spawn method in potion class. * Remove old suppression! * Whoops I forgot about the consumer * Don't need reflection import anymore :) * Thrown potion class --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> Co-authored-by: TheLimeGlass <seantgrover@gmail.com> Co-authored-by: Moderocky <admin@moderocky.com> * Pull request template defaults (#5665) Update pull_request_template.md * Fix EvtPlayerChunkEnter Comparison & Cleanup (#5965) Initial (cherry picked from commit 389c002) Co-authored-by: Moderocky <admin@moderocky.com> * Fixes EffSecSpawn not properly handling local variables created within the section (#6033) Communicate local variables between consumer calls thanks pickle Co-authored-by: Moderocky <admin@moderocky.com> * Remove PlayerPreprocessCommandEvent listener and clean up Commands (#5966) * Remove PPCE listener and clean up Commands * Apply suggestions from code review Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> * Update Commands.java * we hate breaking changes --------- Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> Co-authored-by: Moderocky <admin@moderocky.com> * Clean up vector classes and fix a few bugs. * More improvements * Apply suggestions from code review Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com> * Budget Expansion * Fix Logging Issues In ExpressionEntryData (#6081) Fix duplicate logging * Prepare For Release 2.7.1 (#6082) * Update Minecraft wiki links to new domain (#6078) * ⚒ Fix fake player count paper check error (#6090) * Fix Command Help (#6080) Fix issues and cleanup CommandHelp class Co-authored-by: Moderocky <admin@moderocky.com> * Bump net.kyori:adventure-text-serializer-bungeecord from 4.3.0 to 4.3.1 (#6084) Bumps [net.kyori:adventure-text-serializer-bungeecord](https://github.com/KyoriPowered/adventure-platform) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/KyoriPowered/adventure-platform/releases) - [Commits](KyoriPowered/adventure-platform@v4.3.0...v4.3.1) --- updated-dependencies: - dependency-name: net.kyori:adventure-text-serializer-bungeecord dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com> * Fix unloading/reloading a directory in the scripts effect (#6106) * Moved unloading to a common method. * Accidental double space 😬 * Force UTF-8 encoding for Gradle daemon (#6103) Co-authored-by: Moderocky <admin@moderocky.com> * Corrected Javadocs name, title (#6038) * Javadoc Title,Name * Update .gitignore Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> --------- Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com> Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> Co-authored-by: Moderocky <admin@moderocky.com> * Rebase JUnit references fix for dev/patch (#6057) * Fix options issue in functions (#6121) * Fix command permission messages (2.7.1 issue) (#6126) re-add permission handling during PPCE to get around spigot behavior. * Fix stack overflow when stringifying block inventories. (#6117) * Fix stack overflow when stringifying block inventories. * Blanket catch until a better solution is found. * Fix comparison of cyclical types (specifically comparing times) (#6128) * Add cyclical type helper. * Make time cyclical. * Add special comparison for cyclical types. * Add some tests. * Fix floating point rounding error in loop N times (#6132) Fix floating point error in loop X times. * Fix Sorted List Expression (#6102) * Fix ExprSortedList * Update src/main/java/ch/njol/skript/expressions/ExprSortedList.java Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> * Fix test Co-authored-by: Moderocky <admin@moderocky.com> --------- Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> Co-authored-by: Moderocky <admin@moderocky.com> * Fix colour codes being reset in reload message. (#6150) Fix colour codes being reset. * Fix ExprDurability's Changer (#6154) * Fix ExprDurability's changer * Change method name. * Add simple test. --------- Co-authored-by: Moderocky <admin@moderocky.com> * Catch the exception when pushing entity by non finite vector (#5765) * Fix issues with ExprDrops (#6130) * refactor ExprDrops, fix bugs, add test fixed setting drops to multiple items/experience values at once fixed null values being left in drops after removing items maintained behavior but behavior needs a big update * small cleanup * Fix JUnit test location * import shenanigans --------- Co-authored-by: Moderocky <admin@moderocky.com> * Prepare For Release (2.7.2) (#6166) * Prevent InventoryHolder -> X chaining (#6171) * Prevent InventoryHolder -> X chaining * Improve Location Comparison (#6205) * Allow asynchronous SkriptEvent#check execution (#6201) * Fix ExprSets conflicting (#6123) * Prepare for Release (2.7.3) (#6208) * Further corrections * Fix NPE issue with drops in 1.20.2 * Update StructFunction.java --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: _tud <mmbakkar06@gmail.com> Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com> Co-authored-by: Moderocky <admin@moderocky.com> Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com> Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: TheLimeGlass <seantgrover@gmail.com> Co-authored-by: DelayedGaming <72163224+DelayedGaming@users.noreply.github.com> Co-authored-by: Spongecade <spongecade.129@gmail.com> Co-authored-by: MihirKohli <55236890+MihirKohli@users.noreply.github.com> Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com> Co-authored-by: 3meraldK <48335651+3meraldK@users.noreply.github.com>
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
This PR fixes an issue where if you try to modify an
itemstack's durability, it wouldn't properly update itsItemMeta.Also cleans up the class a bit.
Target Minecraft Versions: any
Requirements: none
Related Issues: #6147