Commit graph

3408 commits

Author SHA1 Message Date
Spottedleaf
c9731fc93d Change MinecraftServer#pluginsBlockingSleep to be Set
A plugin should not be allowed to be added twice or more, as this
would require two or more remove calls to unset the pause block.
2024-11-25 10:13:34 -08:00
Glicz
c64c011b1e [ci skip] fix compile issues caused by b52fea4 (#11664) 2024-11-25 11:18:05 +01:00
Jake Potrebic
b52fea44fe [ci skip] use more jspecify in server 2024-11-24 19:26:32 -08:00
Lulu13022002
8e2102c70b Fix painting variant builder (#11660) 2024-11-24 20:12:08 +01:00
Bjarne Koll
bbe32f42f0 Call ProjectileHitEvent for entity hits (#11652)
A simple bugfix replacing a new vanilla call to
Projectile#hitTargetOrDeflectSelf with the bukkit replacement to call
the event.
2024-11-23 23:13:10 +01:00
kokiriglade
d5c1214b8e Painting variant registry modification API (#11648) 2024-11-23 22:10:54 +00:00
Bjarne Koll
34989c63b0 Correctly damage tick wolf after armor block (#11653)
Spigot incorrectly returns false in Wolf#actuallyHurt if the armor
absorbed the damage causing the entity to not get damage invuln ticks.
Resolve this by correctly reverting to the "always true" return value as
the event is not cancelled.
2024-11-23 23:05:54 +01:00
Jake Potrebic
564005cc5f Configurable Entity Despawn Time (#11454)
* Configurable Entity Despawn Time

Co-authored-by: Kevin Raneri <kevin.raneri@gmail.com>

* Rebase

* Rebase

* rebase

* throw exceptions for this map

---------

Co-authored-by: Kevin Raneri <kevin.raneri@gmail.com>
2024-11-23 13:27:37 -08:00
Bjarne Koll
e598ee5d08 Correctly mirror vanilla non-exact ingredients (#11651) 2024-11-23 20:37:38 +01:00
Jake Potrebic
0dc6316e04 Support tags for more SimpleRegistry (#11607) 2024-11-23 11:26:51 -08:00
Nassim Jahnke
857931f5cc Make TypedKey an actual Key (#11641) 2024-11-23 20:21:24 +01:00
Lulu13022002
00e253fdf9 Fix jukebox component (#11642) 2024-11-23 20:09:34 +01:00
Jake Potrebic
c72a463cb5 Run 'freeze' listeners before tag events (#11606) 2024-11-23 10:52:00 -08:00
Abel
89bd3e5c99 Add API to allow/disallow tick sleeping (#11611) 2024-11-22 12:53:01 +01:00
Abel
9badea8a55 Add API to check if the server is sleeping (#11605) 2024-11-22 12:22:20 +01:00
Lulu13022002
22792d7987 Check for AbstractBoat instead of Boat in EAR ignore list 2024-11-21 18:37:49 +01:00
Nassim Jahnke
7fc75401ca [ci skip] Fix typos 2024-11-21 17:57:18 +01:00
Nassim Jahnke
e5b723ada2 Update spark 2024-11-21 10:43:07 +01:00
Lulu13022002
a44e23c205 Fix NPE when EntityResurrectEvent is uncancelled (#11636) 2024-11-19 12:21:31 +01:00
Bjarne Koll
938559b3e0 Fix incorrect invulnerability damage reduction (#11599)
Fixes incorrect spigot handling of the invulnerability damage
reduction applied when an already invulnerable entity is damaged with a
larger damage amount than the initial damage.
Vanilla still damages entities even if invulnerable if the damage to be
applied is larger than the previous damage taken. In that case, vanilla
applies the difference between the previous damage taken and the
proposed damage.

Spigot's damage modifier API takes over the computation of damage
reducing effects, however spigot invokes this handling with the initial
damage before computing the difference to the previous damage amount.
This leads to the reduction values to generally be larger than expected,
as they are computed on the not-yet-reduced value.
Spigot applies these reductions after calling the EntityDamageEvent and
*then* subtracts the previous damage point, leading to the final damage
amount being smaller than expected.

This patch cannot simply call the EntityDamageEvent with the reduced
damage, as that would lead to EntityDamageEvent#getDamage() returning
the already reduced damage, which breaks its method contract.
Instead, this patch makes use of the DamageModifier API, implementing
the last-damage-reduction as a DamageModifier.
2024-11-19 11:54:58 +01:00
Nassim Jahnke
f13d2012fe Add PlayerItemGroupCooldownEvent (#11625) 2024-11-19 11:33:06 +01:00
Lulu13022002
5ada2514df Fix drops for shearing mushroom cow (#11632) 2024-11-19 11:14:19 +01:00
Lulu13022002
1cc1ee1676 Fix drops for shearing bogged (#11628) 2024-11-19 11:05:54 +01:00
Bjarne Koll
a8904bbf98 [ci skip] Rebuild patches 2024-11-19 09:59:20 +01:00
Spottedleaf
c4ea377273 Add missing NotNull annotation for getChunksAtAsync cb param 2024-11-18 22:58:46 -08:00
Spottedleaf
70ccc97b36 Fix non block ticking chunks not sending block/light updates
Needed to redirect the getTickingChunk call in
broadcastChangedChunks to use the chunk to send method.
2024-11-18 22:48:40 -08:00
Spottedleaf
f7086a34b5 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 22:47:09 -08:00
Spottedleaf
989fd77808 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 22:34:32 -08:00
Owen1212055
76403d796b 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
33bafcbf2d Fix enderchest opening animation (#11635) 2024-11-18 20:47:52 +01:00
MiniDigger | Martin
9dcfb32d11 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-17 20:31:50 +01:00
Nassim Jahnke
0500ee7896 Fix inverted global skip check 2024-11-18 13:46:13 +01:00
Nassim Jahnke
a403e97804 Make logs less annoying 2024-11-18 13:06:15 +01:00
Nassim Jahnke
35c2de4fd0 [ci skip] Add missing feature patch identifiers 2024-11-18 12:31:36 +01:00
Nassim Jahnke
95022a668f Update disableGameRuleLimits casing 2024-11-18 12:24:37 +01:00
Space Walker
47f0eb6fb7 Update Alternate Current patch to 1.21.3 (#11602) 2024-11-18 10:29:51 +01:00
Bjarne Koll
7c03ce11ef 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
Vivian Horvath
5a9b3c9e23 Fix Naming issue inside Add PlayerArmorChangeEvent (#11614) 2024-11-15 09:00:33 +00:00
Bjarne Koll
b2cf880b79 [ci skip] Rebuild patches 2024-11-15 09:41:04 +01:00
Spottedleaf
d0a2d92713 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
Jason Penilla
41085fc8b9 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
0ad6de76cb Optimize custom map rendering (#11000) 2024-11-11 17:04:22 +00:00
Jake Potrebic
73d496ea84 Improve performance of RecipeMap#removeRecipe (#11547) 2024-11-09 16:26:05 -08:00
Space Walker
d399542266 Update Eigencraft patch to 1.21.3 (#11553) 2024-11-10 00:52:51 +01:00
Lulu13022002
16f8d0f984 Fix NPE with enchantable (#11557) 2024-11-09 23:26:01 +01:00
Noah
bbc8fc8fec [ci skip] Fix UseCooldownComponent jd (#11565) 2024-11-09 23:24:56 +01:00
Abel
89d6bc1a93 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
9ce7eb4087 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
17f433aa38 Configure mockito agent (#11560) 2024-11-09 22:49:07 +01:00
Gero
f58c7cc474 Call CraftPlayer#onEntityRemove for all online players (#11598) 2024-11-09 22:35:58 +01:00
Nassim Jahnke
468c86ed14 [ci skip] Add identifying line to some larger/optimization patches 2024-11-09 21:44:55 +01:00
Nassim Jahnke
4d8a84c459 Improve CraftEntity and CraftPlayer equals 2024-11-09 21:17:42 +01:00
Nassim Jahnke
ec93ec97e6 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
13a6161350 Fix Entity#isTicking and update Paper entity command (#11590)
fixes #10299
2024-11-09 07:41:26 -07:00
Noah van der Aa
02cdc61bbc Fix infinite fireworks (#11592) (#11594) 2024-11-08 12:29:40 +01:00
Bjarne Koll
60bed7385b Correctly pass velocity native compressor (#11509) 2024-11-06 11:00:10 +01:00
Bjarne Koll
422cd8d65d 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 10:52:18 +01:00
Jake Potrebic
071b776261 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 09:42:38 -08:00
Bjarne Koll
75993b6fb4 [ci skip] Rebuild patches 2024-11-03 00:37:14 +01:00
Spottedleaf
8480d09670 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
03d2a7f64e 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
46b6f65764 Fix NPE with spark when CraftServer is not init yet (#11558) 2024-11-01 21:37:45 +01:00
Bjarne Koll
2597e370e2 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
69b9c693b5 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
2b04a0a412 bunch more general fixes 2024-10-31 20:35:06 -07:00
Jake Potrebic
dbdce60ac9 re-add a dispense fix patch 2024-10-31 19:51:36 -07:00
Jake Potrebic
a4c7496404 Fix fix recipe iterator patch 2024-10-31 19:34:10 -07:00
Nassim Jahnke
29b207245f 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
Noah van der Aa
5af7b3afbb Correctly clear explosion density cache(#11541) 2024-10-31 22:30:18 +01:00
Bjarne Koll
c18eaf9bee Only expose velocity relative tp flags to API (#11532)
Since 1.21.2, vanilla split relative teleportation flags into position
and delta/velocity flags into separate enum entries.
This highlighted a design flaw in the paper api addition for teleport
flags, which just simply mirrored internals while also only being able
to apply the delta/velocity part of a flag, given the teleport target is
always absolute in the API.

This patch proposes to simply no longer expose the non-velocity related
flags to the API, instead marking the entire Relative enum as being
purely velocity related, as non-velocity related flags are not useful to
callers. This was done over simply exposing all internal flags, as
another vanilla change to the internal enum would result in the same
breakage.

The newly proposed API *only* promises that the passed flags prevent the
loss of velocity in the specific axis/context, which should be
independent enough of vanillas specific implementation of this feature.
2024-10-31 17:25:52 +01:00
Lulu13022002
d9fcd64770 get previous redstone level from the right state for experimental wires 2024-10-31 16:48:37 +01:00
Bjarne Koll
d1ca62a9d0 Correctly cancel consumption of consumable
See: #11534
2024-10-31 12:44:02 +01:00
Jason Penilla
ec53bd41e7 Allow using old ender pearl behavior & apply ender pearl exploit patch (#11524)
When enabled, ender pearls will not load chunks and will save to the world instead of the player.

Also changes the exploit config to be default false, as it only makes sense when legacy behavior is enabled.
2024-10-30 10:09:05 -07:00
Noah van der Aa
bafaa407e4 Add Friction API to minecarts 2024-10-30 17:31:33 +01:00
Lulu13022002
5e3ea5c8f9 don't resend effects when PlayerItemConsumeEvent is cancelled 2024-10-30 17:07:49 +01:00
Lulu13022002
f88986a2c2 fix "is_freezing" damage type tag 2024-10-30 14:55:46 +01:00
Nassim Jahnke
46b5013fc3 Use target pitch in teleport (generally the same thing) 2024-10-30 14:31:03 +01:00
Nassim Jahnke
7dc7d6ef96 Fix item gravity on inactive items, remove dumb active skipping 2024-10-30 14:06:43 +01:00
Nassim Jahnke
666560fcdd Fix portal exit resulting in bad teleport transition 2024-10-29 22:35:10 +01:00
Jason Penilla
6455fa4a8b Avoid issues with certain tasks not processing during sleep (#11526) 2024-10-29 12:46:33 -07:00
Lulu13022002
e50219c8fd cleanup bugfix patch 2024-10-29 16:54:40 +01:00
Lulu13022002
25b6464c5e remove some leftovers 2024-10-29 15:33:42 +01:00
Owen1212055
303d82e48c Use new ClientboundPlayerRotationPacket for setting player rotation 2024-10-28 12:14:00 -04:00
granny
5364f9e7a0 Remove leftover missed timings calls (#11527)
* remove leftover timings calls

* remove unused imports
2024-10-28 00:03:55 -07:00
Jason Penilla
c72370d2c0 Use declaration order for state holder property iteration
Mostly an aesthetic change for serialization, should not have any impact on performance or correctness.
2024-10-27 18:29:34 -07:00
Jason Penilla
8f7bce1e31 Execute spark tasks during tick sleep (#11525) 2024-10-27 14:00:06 -07:00
Jason Penilla
ad03975163 Fix unused parameter in PlayerList#remove 2024-10-27 12:09:27 -07:00
Jason Penilla
0360c9a5fa Remove unnecessary AT 2024-10-27 11:26:21 -07:00
Lulu13022002
b501e56e80 Fix NPE and StackOverflowError for dispensers 2024-10-27 18:47:50 +01:00
Nassim Jahnke
eb6f344912 Remove timings impl 2024-10-27 18:11:15 +01:00
Bjarne Koll
966c80c18f Update material tags and entity effect 2024-10-27 12:20:17 +01:00
Nassim Jahnke
a937f3ebd3 Another one 2024-10-27 12:02:26 +01:00
Nassim Jahnke
99e72f052b Add back per player mob spawning
Also removes the `info.mobCategoryCounts.mergeInt` call that - at least from what I can tell - has been wrongly counting spawned mobs twice. The runner passed via `info::afterSpawn` already counts up that exact number in the same exact places (where `j`, the return value used here, is incremented)
2024-10-27 11:56:51 +01:00
Nassim Jahnke
88aa8528c9 More patches 2024-10-27 10:26:44 +01:00
Nassim Jahnke
ba24f1b59d Readd last API patch (with TODO) 2024-10-27 09:43:00 +01:00
Nassim Jahnke
909afb02ee Delete some old patches 2024-10-27 09:24:59 +01:00
Jake Potrebic
1bae0a3107 re-add improve perf of mass crafts 2024-10-26 12:50:32 -07:00
Lulu13022002
20093331cf fix DamageTypeTags init 2024-10-26 19:41:56 +02:00
Lulu13022002
a3a0e46862 fix item meta 2024-10-26 19:11:37 +02:00
Nassim Jahnke
3cf764645b Apply more patches 2024-10-26 17:49:28 +02:00