13
0
geforkt von Mirrors/Paper
Commit graph

9519 Commits

Autor SHA1 Nachricht Datum
Spottedleaf
37b9630f6a Do not create unneccessary callback in ChunkTaskScheduler#scheduleChunkLoad
If the parameter has addTicket = false and onComplete = null,
then the loadCallback would do no work and as a result does
not need to be created.
2024-11-18 23:02:17 -08:00
Spottedleaf
8c5b837e05 Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.

Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.

Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.

Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.

Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-18 23:00:59 -08:00
Owen
de6173b061
Item DataComponent API (#10845)
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Co-authored-by: Bjarne Koll <git@lynxplay.dev>
2024-11-18 15:09:44 -05:00
Lulu13022002
6735c60738
Fix enderchest opening animation (#11635) 2024-11-18 20:47:52 +01:00
MiniDigger | Martin
d8b66dd93d fix: move to jline-terminal-ffm on java 22+ and fall back to jni on 21, fixes #10405
ffm requires 1) native access allowed (the jdk cracks down on undocumented native access in 22) and 2) reverting the default console back to java.base, so the internal jline doesnt take over
2024-11-18 17:01:08 +01:00
016ff29bf0 Merge remote-tracking branch 'upstream/master' into 1.21.1-update
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-11-18 13:54:21 +01:00
Nassim Jahnke
4e01ede950
Fix inverted global skip check 2024-11-18 13:46:13 +01:00
Nassim Jahnke
daf31133b5
Make logs less annoying 2024-11-18 13:06:15 +01:00
Nassim Jahnke
11d708d831
[ci skip] Add missing feature patch identifiers 2024-11-18 12:31:36 +01:00
Nassim Jahnke
575c1c4f89
Update disableGameRuleLimits casing 2024-11-18 12:24:37 +01:00
Space Walker
34804890e8
Update Alternate Current patch to 1.21.3 (#11602) 2024-11-18 10:29:51 +01:00
Josh Roy
bc4a705ce4
[ci skip] chore: change paste.gg links to mclo.gs (#11629) 2024-11-17 10:46:43 -08:00
Riley Park
4e2291e206 chore: refactor issue templates 2024-11-17 10:27:17 -08:00
Bjarne Koll
7b13d936de
Updated Upstream (Bukkit/CraftBukkit) (#11626)
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:
36b11391 Fix copy pasting in UseCooldownComponent

CraftBukkit Changes:
a71a7e1f5 SPIGOT-7957: Fix setTarget method for Breeze
5bc0a094b SPIGOT-7955: Failure teleporting players between worlds using Player#teleport() when player has attribute modifiers
2e09c7a36 SPIGOT-7953: Item cooldown must be greater than 0
8ef9079fa Increase outdated build delay
2024-11-17 16:52:44 +01:00
50cd3e49a4 Update to 1.21.3
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-11-17 00:03:48 +01:00
302edbb874 Merge remote-tracking branch 'upstream/master' into 1.21.1-update 2024-11-16 23:05:51 +01:00
Vivian Horvath
be886cf4e7
Fix Naming issue inside Add PlayerArmorChangeEvent (#11614) 2024-11-15 10:00:33 +01:00
Bjarne Koll
13f48d8320
[ci skip] Rebuild patches 2024-11-15 09:41:04 +01:00
Spottedleaf
c60af44a94 Fix experimental minecart collisions on sloped rails
We are supposed to ignore some collisions on the sloped
rail.
2024-11-14 21:01:04 -08:00
7939b74522 Update 1.21.1 Paper
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2024-11-12 23:02:31 +01:00
2da4ddea4f Merge remote-tracking branch 'upstream/master' into 1.21.3 2024-11-12 22:46:17 +01:00
Jason Penilla
661839e033
Fix and optimize getChunkCount (#11610)
It was returning ticking chunk count instead of the intended full chunk count.
We can also directly use the size of the fullChunks collection instead of iterating all chunks.
2024-11-11 12:17:36 -07:00
Barnaby
52fb26524e
Optimize custom map rendering (#11000) 2024-11-11 18:04:22 +01:00
Jake Potrebic
1ef4c0e7ff
Improve performance of RecipeMap#removeRecipe (#11547) 2024-11-10 01:26:05 +01:00
Space Walker
6da7b9e888
Update Eigencraft patch to 1.21.3 (#11553) 2024-11-10 00:52:51 +01:00
Lulu13022002
59b79c8bbb
Fix NPE with enchantable (#11557) 2024-11-09 23:26:01 +01:00
Noah
9d1c91d083
[ci skip] Fix UseCooldownComponent jd (#11565) 2024-11-09 23:24:56 +01:00
Abel
2e6eafb7e8
Improve Minecart#getMinecartMaterial (#11544)
Removes the hardcoded lookup in favour of calling the
AbstractVehicle getItemDrop method.
2024-11-09 23:22:01 +01:00
Jake Potrebic
94ea770212
Re-add exact choice shapeless support (#11546)
* Re-add exact choice shapeless support

* don't re-create maps every shapeless match

* add missing paper comment with last patch
2024-11-09 13:53:53 -08:00
Yannick Lamprecht
e47f79acd9
Configure mockito agent (#11560) 2024-11-09 22:49:07 +01:00
Gero
bcbd10804f
Call CraftPlayer#onEntityRemove for all online players (#11598) 2024-11-09 22:35:58 +01:00
Nassim Jahnke
0af4e84eff
[ci skip] Add identifying line to some larger/optimization patches 2024-11-09 21:44:55 +01:00
Nassim Jahnke
17dbf74ccf
Improve CraftEntity and CraftPlayer equals 2024-11-09 21:17:42 +01:00
Nassim Jahnke
6483ecb8a2
Updated Upstream (Bukkit/CraftBukkit)
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:
a6aba46f PR-1078: Improve Javadocs of Player#loadData() and Player#saveData()
1e2e6a18 SPIGOT-7946: API for server pause when empty seconds
54a36938 SPIGOT-7944, PR-1077: Allow nullable fields in DamageTypeTags

CraftBukkit Changes:
2702c5c8e SPIGOT-7946: API for server pause when empty seconds
485f910fc SPIGOT-7947: addPassenger doesn't work if the vehicle is a player
ecf3dff0e SPIGOT-7949: Registering a new scoreboard objective with an empty display name throws a NPE
9b048cc84 SPIGOT-7948: `Bukkit#dispatchCommand` uses the wrong `CommandListenerWrapper` for Players
7b44d4640 SPIGOT-7931: Fix sync in Anvil View when result item is taken
2024-11-09 17:01:35 +01:00
Jason Penilla
00ef8bdcb0
Fix Entity#isTicking and update Paper entity command (#11590)
fixes #10299
2024-11-09 15:41:26 +01:00
Noah van der Aa
99f4bb29ba
Fix infinite fireworks (#11592) (#11594) 2024-11-08 11:29:40 +00:00
Bjarne Koll
fcb6c72bc9
Correctly pass velocity native compressor (#11509) 2024-11-06 11:00:10 +01:00
Bjarne Koll
42a1901d3b
Correctly adopt upstream item EAR fix (#11582)
EAR 2 evaluates the entities activity on the already incremented entity
tick. This diverges from spigots behaviour and hence needed adoption for
their item ear fix.
2024-11-05 09:52:18 +00:00
Jake Potrebic
93b435dbab
[ci skip] better instructions for patch apply conflict (#11568) 2024-11-04 18:43:26 +01:00
Jake Potrebic
c6aa61ee18
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11561)
Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
b9df8e9f SPIGOT-7933: Improve custom Minecart max speed
fc496179 Fix InstrumentTest
7c0ec598 PR-1075: Make Art an interface
c389f5a4 PR-1074: Make Sound an interface

CraftBukkit Changes:
df1efc0bb SPIGOT-7945: `Bukkit#dispatchCommand` throws `UnsupportedOperationException`
285df6e85 SPIGOT-7933: Improve custom Minecart max speed
a0f3d4e50 SPIGOT-7940: Recipe book errors after reload
9e0618ec2 SPIGOT-7937: Cannot spawn minecart during world generation with minecart_improvements enabled
1eb4d28da SPIGOT-7941: Fix resistance over 4 amplify causing issues in damage
52b99158a PR-1504: Make Art an interface
e18ae35f1 PR-1502: Make Sound an interface

Spigot Changes:
e65d67a7 SPIGOT-7934: Item entities start "bouncing" under certain conditions
2024-11-04 18:42:38 +01:00
Bjarne Koll
ce0a041947
[ci skip] Rebuild patches 2024-11-03 00:37:14 +01:00
Spottedleaf
a6df4c8cdc Handle corrupt light data gracefully
First, if the light data is not marked as correct, we should not be
parsing it in the first place. This will eliminate errors from
parsing possibly different versioned light data.

Secondly, if parsing the light data throws an exception (from
the SWMRNibbleArray constructor), then we can simply mark
the returned chunk as having incorrect light data - rather than
propagating the exception and causing the chunk to be re-generated.
2024-11-02 16:33:08 -07:00
Bjarne Koll
92131adaf2
Decrease dead entity teleport warning (#11559)
Decreases the warning back to its 1.21.1 level where only teleports of
dead/invalid entities across dimensions were logged.
2024-11-01 22:25:31 +01:00
Lulu13022002
d19be64b15
Fix NPE with spark when CraftServer is not init yet (#11558) 2024-11-01 21:37:45 +01:00
Bjarne Koll
85c870e9c7
Correct update cursor (#11554)
Spigot uses a no longer valid ClientboundContainerSetSlotPacket with the
slot -1, which would update the carried stack in versions <=1.21.1 but
now leads to an IOOB.
1.21.2 instead introduced the ClientboundSetCursorItemPacket, which this
patch uses instead.
2024-11-01 15:57:23 +01:00
Bjarne Koll
a5d742637a
Correctly support RecipeChoice.empty (#11550)
The previous implementation was based off of spigots logic in
CraftRecipe#toIngredient, which is completely incorrect as
nms.Ingredient.of() is a throwing call.

Correctly insert handling for the empty() choice in the toNMSOptional
logic.
2024-11-01 11:30:40 +01:00
Jake Potrebic
16d7d73bd5
bunch more general fixes 2024-10-31 20:35:06 -07:00
Jake Potrebic
1de01302d4
re-add a dispense fix patch 2024-10-31 19:51:36 -07:00
Jake Potrebic
5c0930dfad
Fix fix recipe iterator patch 2024-10-31 19:34:10 -07:00
Nassim Jahnke
52a05907c7
Updated Upstream (Bukkit/CraftBukkit) (#11543)
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:
97c59261 PR-1073: Make Biome an interface
a38581aa Fix further javadoc errors
8271c490 Fix javadoc error
8a9ecf29 PR-1072: Fix bad naming for Vault State methods
6dd58108 PR-1071: Make Fluid an interface and add missing entry
ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones
63472efb PR-1069: Add missing winter drop experimental annotation to pale boats

CraftBukkit Changes:
7235ad7b0 PR-1501: Make Biome an interface
602904003 PR-1500: Rename implementation for Vault State methods
75f26f79f PR-1499: Make Fluid an interface and add missing entry
4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones
6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice
3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent
abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect
92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed
abfe292aa PR-1496: Use correct Fluid class on Tags type check
c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
2024-10-31 23:44:34 +01:00