Commit Graph

18835 Commits

Author SHA1 Message Date
Bjarne Koll
a47a008ce1 Fix incorrect invulnerability damage reduction
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-11 21:35:22 +01: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
0943517953 [ci skip] better instructions for patch apply conflict (#11568) 2024-11-04 09:43:26 -08: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
e3906acf80 [ci skip] Remove leftover todo file (#11540) 2024-10-31 21:59:35 +01:00
Nassim Jahnke
f84d99ab82 Set updatingMinecraft to false 2024-10-31 18:07:14 +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
Jason Penilla
32675c228d Update Gradle wrapper to 8.10.2 2024-10-28 10:17:48 -07: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