Updated Upstream (CraftBukkit/Spigot) #7580
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
kennytv
commented
Mar 11, 2022
| org.spigotmc.SlackActivityAccountant activityAccountant = this.level.getServer().slackActivityAccountant; | ||
| activityAccountant.startActivity(0.5); | ||
| - int targetSize = (int) (this.toDrop.size() * ChunkMap.UNLOAD_QUEUE_RESIZE_FACTOR); | ||
| + int targetSize = Math.min(this.toDrop.size() - 100, (int) (this.toDrop.size() * ChunkMap.UNLOAD_QUEUE_RESIZE_FACTOR)); // Paper - Make more aggressive |
There was a problem hiding this comment.
With Spigot's change here being gone, the Vanilla behavior is aggressive enough: at least 200 and at least down to a size of 2000 (so always at least 10%)
|
|
||
| - int k = Math.max(0, this.unloadQueue.size() - 2000); | ||
| + int k = Math.max(0, Math.min(100, this.unloadQueue.size() - (int) (this.unloadQueue.size() * UNLOAD_QUEUE_RESIZE_FACTOR))); // Paper - Target this queue as well | ||
| + int k = Math.max(100, this.unloadQueue.size() - 2000); // Paper - Unload more than just up to queue size 2000 |
There was a problem hiding this comment.
The patch made it actually less aggressive for large unloadQueues with k being a decrementing counter, not a target size. so now it's at least 100 and at least down to 2000
electronicboy
approved these changes
Mar 12, 2022
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 74c0831 SPIGOT-6962: Call EntityChangeBlockEvent when when FallingBlockEntity starts to fall 64db512 SPIGOT-6959: Make /loot command ignore empty items for spawn Spigot Changes: ffceeae3 SPIGOT-6956: Drop unload queue patch as attempt at fixing stop issue
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 881e06e5 PR-725: Add Item Unlimited Lifetime APIs CraftBukkit Changes: e19ddab PR-1011: Add Item Unlimited Lifetime APIs 34d40b0 SPIGOT-2942: give command fires PlayerDropItemEvent, cancelling it causes Item Duplication
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 2d76083 Increase outdated build delay
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 9ed7e4f SPIGOT-6138, SPIGOT-6415: Don't call CreatureSpawnEvent after cross-dimensional travel fc4ad81 SPIGOT-6895: Trees grown with applyBoneMeal() don't fire the StructureGrowthEvent 59733a2 SPIGOT-6961: Actually return a copy of the ItemMeta
Owen1212055
pushed a commit
to Owen1212055/Paper
that referenced
this pull request
Mar 13, 2022
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 881e06e5 PR-725: Add Item Unlimited Lifetime APIs CraftBukkit Changes: 74c0831 SPIGOT-6962: Call EntityChangeBlockEvent when when FallingBlockEntity starts to fall 64db512 SPIGOT-6959: Make /loot command ignore empty items for spawn 2d76083 Increase outdated build delay 9ed7e4f SPIGOT-6138, SPIGOT-6415: Don't call CreatureSpawnEvent after cross-dimensional travel fc4ad81 SPIGOT-6895: Trees grown with applyBoneMeal() don't fire the StructureGrowthEvent 59733a2 SPIGOT-6961: Actually return a copy of the ItemMeta Spigot Changes: ffceeae3 SPIGOT-6956: Drop unload queue patch as attempt at fixing stop issue e19ddab PR-1011: Add Item Unlimited Lifetime APIs 34d40b0 SPIGOT-2942: give command fires PlayerDropItemEvent, cancelling it causes Item Duplication
AsP3X
added a commit
to AsP3X/papermc
that referenced
this pull request
Mar 15, 2022
TASK: updated to latest build [#250] #13 Version update to the latest PaperMC build: - [#250] [[a5be178](PaperMC/Paper@a5be178)] Use correct toX/Y/Z in player move packet handling - [#249] [[c8e49cc](PaperMC/Paper@c8e49cc)] Add get/set wait time for fish hooks. ([#5595](PaperMC/Paper#5595)) - [#248] | - [[1ce3555](PaperMC/Paper@1ce3555)] [ci-skip] Fix typo in feature request issue template ([#7593](PaperMC/Paper#7593)) | - [[b65b48f](PaperMC/Paper@b65b48f)] [ci skip] Update gradle wrapper - [#247] [[1358d1e](PaperMC/Paper@1358d1e)] Updated Upstream (CraftBukkit/Spigot) ([#7580](PaperMC/Paper#7580)) - [#246] [[ab03538](PaperMC/Paper@ab03538)] Fix colors in some console messages - [#245] [[87927e1](PaperMC/Paper@87927e1)] Fix CreativeCategory API ([#7586](PaperMC/Paper#7586)) - [#244] [[bfa33d9](PaperMC/Paper@bfa33d9)] Various improvements to console color formatting ([#7560](PaperMC/Paper#7560)) - [#243] [[dc96bba](PaperMC/Paper@dc96bba)] Ensure the item sent isn't air ([#7584](PaperMC/Paper#7584)) - [#242] [[aab1f8a](PaperMC/Paper@aab1f8a)] Fix swamp hut cat generation deadlock - [#241] [[ea1efef](PaperMC/Paper@ea1efef)] Remove Patches ([#7541](PaperMC/Paper#7541)) - [#240] [[1790528](PaperMC/Paper@1790528)] More projectile API ([#5731](PaperMC/Paper#5731)) - [#239] [[d714682](PaperMC/Paper@d714682)] Add more entity api ([#7564](PaperMC/Paper#7564)) - [#238] [[657d163](PaperMC/Paper@657d163)] Prevent despawned navigators being readded ([#7574](PaperMC/Paper#7574)) - [#237] | - [[b55ba19](PaperMC/Paper@b55ba19)] Update README for new docs ([#7561](PaperMC/Paper#7561)) | - [[4423e12](PaperMC/Paper@4423e12)] Update docs link in paper.yml ([#7562](PaperMC/Paper#7562)) | - [[7a21333](PaperMC/Paper@7a21333)] Fix setting the view distance to 32 ([#7503](PaperMC/Paper#7503)) - [#236] [[718fab1](PaperMC/Paper@718fab1)] Add CPU name and JVM vendor info in timings ([#7490](PaperMC/Paper#7490)) - [#235] [[e0b3f3f](PaperMC/Paper@e0b3f3f)] Adventure 4.10.1 - [#234] [[c34fb09](PaperMC/Paper@c34fb09)] Add ghast api ([#7554](PaperMC/Paper#7554)) - [#233] [[d9bf5e7](PaperMC/Paper@d9bf5e7)] Add method to set noclip on arrows ([#7263](PaperMC/Paper#7263)) - [#232] [[7b9c30f](PaperMC/Paper@7b9c30f)] Fix scoreboard objective name length limit
kashike
added
upstream: spigot
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.
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
881e06e5 PR-725: Add Item Unlimited Lifetime APIs
CraftBukkit Changes:
74c0831 SPIGOT-6962: Call EntityChangeBlockEvent when when FallingBlockEntity starts to fall
64db512 SPIGOT-6959: Make /loot command ignore empty items for spawn
2d76083 Increase outdated build delay
Spigot Changes:
ffceeae3 SPIGOT-6956: Drop unload queue patch as attempt at fixing stop issue
e19ddab PR-1011: Add Item Unlimited Lifetime APIs
34d40b0 SPIGOT-2942: give command fires PlayerDropItemEvent, cancelling it causes Item Duplication