3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-15 02:50:09 +01:00
Commit graph

3022 Commits

Autor SHA1 Nachricht Datum
Spottedleaf
47258a7118 Move common diffs to MCUtils 2024-10-25 11:25:09 -07:00
Spottedleaf
6df21e61af Start Moonrise update
This is based on Moonrise's 1.21.2 branch, but this on
1.21.1 so some diffs cannot be applied (and this doesn't
compile).

See moonrise_update_1_21_2.txt for progress
2024-10-25 11:25:09 -07:00
Lulu13022002
3518974270
fix some issues 2024-10-25 20:09:45 +02:00
Bjarne Koll
e19f48475d
Test compile fixes 2024-10-25 19:15:40 +02:00
Bjarne Koll
0a8fd78e37
Compiler issue v5 2024-10-25 18:08:28 +02:00
Bjarne Koll
bb124f4021
Compiler issues v4 2024-10-25 17:20:41 +02:00
Bjarne Koll
918ca965d9
Compiler issues v3 2024-10-25 15:15:12 +02:00
Bjarne Koll
6fb86bb20a
Compiler issues v2 2024-10-25 14:25:28 +02:00
Bjarne Koll
0f011a31b1
Some more compile issues 2024-10-25 13:34:01 +02:00
Bjarne Koll
9c83387157
Compile issues 1 2024-10-25 13:19:23 +02:00
Bjarne Koll
b06e0b0317
Work on compile errors 2024-10-25 13:13:43 +02:00
Bjarne Koll
afbb0d88dd
1037 2024-10-25 12:28:34 +02:00
Bjarne Koll
227caac7f0
Wrong attempt at Tag lifecycle 2024-10-25 12:06:49 +02:00
Bjarne Koll
6a315742d9
1020 2024-10-25 00:08:35 +02:00
Bjarne Koll
7616ebccd8
1000 2024-10-24 23:03:27 +02:00
Bjarne Koll
35e01d7a80
Update work 989 2024-10-24 22:29:29 +02:00
Shane Freeder
fe142cdcd5
Anti Xray 2024-10-24 20:10:38 +01:00
Shane Freeder
d67e55d367
Checkpoint 2024-10-24 19:40:24 +01:00
Bjarne Koll
9047541397
Upstream update 2024-10-24 19:29:35 +02:00
Bjarne Koll
fc05430719
963 2024-10-24 17:20:12 +02:00
Bjarne Koll
b2375286c9
Readd wrongly removed diff 2024-10-24 16:31:09 +02:00
Owen1212055
7d4cce94ae
Patch 2024-10-24 10:02:45 -04:00
Owen1212055
89bf08158b
Patch 2024-10-24 09:53:28 -04:00
Owen1212055
26f7b4c72e
Patch 2024-10-24 09:25:36 -04:00
Bjarne Koll
80de05ff33
Patch me this, patch me that 2024-10-24 12:22:30 +02:00
Bjarne Koll
457d03534d
Patches, patches, patches 2024-10-24 10:42:29 +02:00
Noah van der Aa
5d19e2b332
good luck americans 2024-10-24 00:42:38 +02:00
Noah van der Aa
5a6011c08c
MOOOOOOOOOOOOOORE 2024-10-24 00:32:21 +02:00
Noah van der Aa
dd87f9fe83
fix gruesome copyright violation 2024-10-24 00:11:28 +02:00
Noah van der Aa
4baf9ab44d
MOOOOOOOOOOORE 2024-10-24 00:08:29 +02:00
Noah van der Aa
d52e2d241d
MOOOOOOOORE 2024-10-23 23:35:21 +02:00
Noah van der Aa
1dc142534d
MOOOOORE 2024-10-23 23:12:09 +02:00
Noah van der Aa
cb79de80c4
moooore 2024-10-23 22:52:43 +02:00
Shane Freeder
6456b5dea8
A bunch more 637 2024-10-23 21:10:14 +01:00
Shane Freeder
cbf64163ba
A bunch of patches 2024-10-23 20:43:06 +01:00
Bjarne Koll
4db250389e
Work work work work 2024-10-23 20:50:46 +02:00
Bjarne Koll
0bb4d1d660
553 2024-10-23 20:15:25 +02:00
Bjarne Koll
2810f50ca2
503 2024-10-23 19:46:06 +02:00
Bjarne Koll
f5177aa121
Some more work 2024-10-23 17:58:11 +02:00
Bjarne Koll
1f8b53733f
440 2024-10-23 17:13:43 +02:00
Bjarne Koll
09b625eccf
400 2024-10-23 16:57:39 +02:00
Owen1212055
6bfc6db99e
Patch 2024-10-23 10:08:40 -04:00
Owen1212055
af125d26a9
Patch 2024-10-23 10:04:01 -04:00
Owen1212055
aa37f7250d
Patches 2024-10-23 09:54:09 -04:00
Bjarne Koll
5e262c1691
298 2024-10-23 15:02:51 +02:00
Bjarne Koll
f677393a88
Skip Improve-exact-choice-recipe-ingredients for now 2024-10-23 14:12:17 +02:00
Bjarne Koll
8851d25a4d
Fluid Flowing ifLoaded patch 2024-10-23 13:13:00 +02:00
Bjarne Koll
a400929816
242 2024-10-23 12:32:08 +02:00
Bjarne Koll
7c04a31c9f
Update projectile launch to 1.21.2 2024-10-23 12:02:36 +02:00
Bjarne Koll
dc5af4848a
Breakpoint before projectile mess 2024-10-23 11:04:00 +02:00
Bjarne Koll
9d63c814c2
Work work work 2024-10-23 00:02:50 +02:00
Bjarne Koll
f1649d702b
Work it 2024-10-22 23:30:51 +02:00
Bjarne Koll
9e92fed7a2
More work? 2024-10-22 22:38:26 +02:00
Bjarne Koll
152e82ceec
Some work 2024-10-22 22:00:33 +02:00
Noah van der Aa
6b27267fb7
oops 2024-10-22 20:09:28 +02:00
Noah van der Aa
3585434382
first 100! 2024-10-22 20:04:31 +02:00
Noah van der Aa
d280061a1a
First batch of server patches 2024-10-22 19:28:57 +02:00
Noah van der Aa
2ef589c820
okaaay let's go 2024-10-22 18:23:19 +02:00
Lulu13022002
d348cb88a9
Restrict BlockProjectileSource#launchProjectile
Spigot recently revamped their CraftBlockProjectileSource impl to make use of
the the ProjectileItem logic. During this move however, a couple of types were
added which do not provide a sensible ProjectileItem implementation.

The commit restricts the API once again to types that represent useful
ProjectileItems, removing support for the trident, enderpearl and breeze variant
of the windcharge.
2024-10-21 18:17:45 +02:00
Shane Freeder
14a48cda40
Some small touchups to the GUI (#11505)
As noted on the issue, the method here can blow up in
certain cases, the GUI logic already handles "the mouse is missing",
and so, we'll just catch this and move on.

Misc fix - There is probably an issue report for this somewhere,
but, the details section utilised the bukkit singleton to try to get
the TPS from the server. We already have the MinecraftServer instance
passed into us, and so we'll just get the information directly from there instead.

Fixes: #11494
2024-10-21 01:10:10 +02:00
Shane Freeder
260c3bbec0
Always send Banner patterns to the client (#11506)
The mojang client will not remove patterns from a Banner when none
are sent inside of an update packet, given that this is not an expected
flow for them, this is not all too surprising. So, we shall resort to always
sending the patterns over the network for update packets.

Fixes: #11487
2024-10-21 01:02:00 +02:00
Bjarne Koll
3b9db2b194
Updated Upstream (Bukkit/CraftBukkit) (#11501)
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:
bb4e97c6 Add support for Java 23
bc6874dd Bump asm to 9.7.1
50e8a00b PR-1064: Add specific getTopInventory methods for InventoryView derivatives
758b0a0f SPIGOT-7911: Fix Location#isWorldLoaded() for re-loaded worlds
133a64a7 Improve Registry#getOrThrow messages
be0f5957 PR-1058: Add tests for Minecraft registry <-> Bukkit fields
d1b31df2 PR-1062: Clarify BeaconView documentation
3fab4384 PR-1060: Cache Material to BlockType and ItemType conversion
967a7301 SPIGOT-7906: Increase YAML nesting limit to 100
6ecf033d SPIGOT-7899: Smithing recipes don't require inputs

CraftBukkit Changes:
0a7bd6c81 PR-1493: Improve reroute performance and add some tests
54941524c Add support for Java 23
f4d957fff SPIGOT-7915: Fix World#getKeepSpawnInMemory() using Spawn Radius rather than Spawn Chunk Radius
ded183674 Fix HIDE_ENCHANTS flag in items without enchantments
308785a0a Bump asm to 9.7.1 and re-add ClassReader to ClassWriter
72ce823cd PR-1487: Add specific getTopInventory methods for InventoryView derivatives
11a5e840c SPIGOT-7907, PR-1484: Improve merchant recipe item matching behavior to more closely align with older versions
45b66f7e4 SPIGOT-7909: Always set HIDE_ENCHANTS flag to item if flag is set
963459791 Increase outdated build delay
fc5b2d75f SPIGOT-7910: Fix launching breeze wind charge from API and improve dispenser launch API
c7d6428f2 SPIGOT-7856, PR-1483: End platform not dropping items after replacing blocks
2a5572b52 SPIGOT-7780, PR-1482: Cannot edit chunks during unload event
527041ab5 SPIGOT-7902, PR-1477: Fix CraftMetaPotion#hasCustomEffects() does not check if customEffects (List) is empty
5529a1769 Implement base methods for tags
30fbdbaaf Improve Registry#getOrThrow messages
6b71a7322 PR-1475: Add tests for Minecraft registry <-> Bukkit fields
5f24c255c SPIGOT-7908: Mark junit-platform-suite-engine as test scope
e4c92ef65 PR-1473: Change tests to use suites, to run tests in different environments and feature flags
d25e1e722 PR-1481: Fix BeaconView#set[X]Effect(null)
d69a05362 PR-1480: Fix PerMaterialTest#isEdible test running for legacy materials
bb3284a89 PR-1479: Use custom #isBlock method in legacy init instead of the one in Material, since it relies on legacy being init
98c57cbbe SPIGOT-7904: Fix NPE for PlayerItemBreakEvent
f35bae9ec Fix missing hasJukeboxPlayable
8a6f8b6d8 SPIGOT-7881: CTRL+Pick Block saves position data into item
7913b3be7 SPIGOT-7899: Smithing recipes don't require inputs
2024-10-21 00:06:54 +02:00
Shane Freeder
755a7753af
[ci skip] rebuild patches 2024-10-17 21:24:12 +01:00
Spottedleaf
aebbdc9e9a Add proper async player disconnections
Blocking can cause performance problems
2024-10-16 07:00:40 -07:00
Pedro
4430e96e1b
Add AnvilView#bypassEnchantmentLevelRestriction (#11475) 2024-10-12 23:10:05 +02:00
Lulu13022002
b16c0ae023
Add offline PDC API (#8117) 2024-10-12 21:38:18 +02:00
TonytheMacaroni
57c75a4b67
Fix CraftMagicNumbers#getTag (#11484) 2024-10-09 21:58:13 +01:00
Nassim Jahnke
7cd4f2c15f
Check if leash tag has a uuid 2024-10-03 17:10:27 +02:00
Jake Potrebic
709f0f2919
Use components properly in ProfileWhitelistVerifyEvent (#11456) 2024-10-02 14:32:05 +02:00
Nassim Jahnke
69ffbec34a
Fix hex color check 2024-10-02 13:49:39 +02:00
Jake Potrebic
e7e1ab56ca
Finish converting most of the undeprecated api to jspecify 2024-09-30 16:02:52 -07:00
Jake Potrebic
ba3c29b92e
Finish converting all events to jspecify annotations 2024-09-29 19:13:41 -07:00
Bjarne Koll
ea00be3aaa
Do not NPE on uuid resolution in player profile (#11449)
Band-aid fix for the player profile api resolution for a profile with
name but without uuid. The real solution is a proper refactoring of the
completeFromCache and complete method internally, however this needs
further consideration regarding existing faulty behaviour around name
lookups from uuid-only profiles.
2024-09-30 00:26:44 +02:00
Axionize
b410fe8697
Configurable per-world void damage offset/damage(#11436) 2024-09-30 00:06:13 +02:00
Noah van der Aa
e3c8a8eef1
Add PlayerInsertLecternBookEvent [1.20 port] (#7305)
* Add PlayerInsertLecternBookEvent

* Rebase

Additionally, moves the event call higher up and removes the lectern
block state clone from the event.

* jSpecify

* Shrink correctly

* style fixups

* move methods

* rename param to cancel

* fix javadocs

* more javadoc fixes

* fix co-author on patch from yesterday

* last fix

---------

Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
Co-authored-by: Bjarne Koll <lynxplay101@gmail.com>
2024-09-29 14:28:48 -07:00
Jake Potrebic
6d7a438fad
Call bucket events for cauldrons (#7486) 2024-09-29 00:04:11 +02:00
Esoteric Enderman
355b1cbaf6
Add API for explosions to damage the explosion cause (#11180)
This intends to give plugin developers more control over explosions created using the World#createExplosion method, specifically by adding the option for explosions to damage the explosion cause (not the default behavior, and previously impossible to do, as far as I know). This is done by overloading existing methods with an extra `excludeSourceFromDamage` parameter.

Co-authored-by: Bjarne Koll <lynxplay101@gmail.com>
2024-09-28 21:32:56 +02:00
Tamion
7b03141498
Add startingBrewTime (#11406)
* add startingBrewTime

* casting

* requests

* comments and fix setBrewTime

* a

* b

* move to own class

* rename

* missing Paper comment

* missing experimentals

* rebased

---------

Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
2024-09-28 12:14:20 -07:00
Jake Potrebic
e17eb6be0c
Improve entity effect API (#11444) 2024-09-28 20:05:45 +02:00
Jake Potrebic
b7ab22dee1
Fix console completions on invalid commands (#7603) 2024-09-27 11:05:15 -07:00
masmc05
8f56db871b
Add enchantWithLevels with tag specification (#11438)
* Add enchantWithLevels with tag specification

* Finalise

---------

Co-authored-by: Bjarne Koll <lynxplay101@gmail.com>
2024-09-27 11:04:57 -07:00
Jake Potrebic
f33611cbc3
fix ItemStack#removeEnchantments creating non-stackable items (#11442) 2024-09-27 10:58:11 -07:00
Jake Potrebic
dd6d1842bb
Remove redundant fillUsableCommands call (#11425) 2024-09-27 18:49:18 +02:00
Brokkonaut
01c4820450
Call EntityDropItemEvent when a container item drops its contents (#11441) 2024-09-27 18:27:14 +02:00
Stefano
627cc64eea
Adjust HAProxy's existance to log for console masters (#11433) 2024-09-27 18:19:29 +02:00
Jake Potrebic
20ec62255d
use correct types for preloading CraftRegistry
also add a check in CraftRegistryEntry constructor to
make sure preload class isn't in net.minecraft package
2024-09-26 14:20:09 -07:00
Jake Potrebic
1bc02e6b23
Fix tag lifecycle event handlers not disabling /reload 2024-09-24 19:33:30 -07:00
Jake Potrebic
9b1ee0d87d
Add missing key files and cleanup registry definition order 2024-09-23 17:36:32 -07:00
Jake Potrebic
acdd6d35ad
make MenuType implement FeatureDependant 2024-09-23 15:03:52 -07:00
Jake Potrebic
4514c71a7f
Only call EntityPortalExitEvent if entity is actually in a portal 2024-09-22 14:36:17 -07:00
Jake Potrebic
e8297c4cca
Expand out datapack API (#10828)
* Expand out datapack API

* add getTitle

* better enable check
2024-09-22 14:28:45 -07:00
Nassim Jahnke
2f50b87277
Fixup command precprocess cancellation (#11424) 2024-09-22 21:25:37 +02:00
Oliver Janka
1cb2bf466f
Add velocity forwarding secret env override (#10127)
Previously, the velocity forwarding secret could only be configured via
the configuration option in the global paper configuration.
This makes configuring/passing such a value rather difficult for
containerized/orchestrated servers as these configuration files are
usually part of the server data volume itself and hence cannot be
sourced from a secret.

This commit enables administrators to define the PAPER_VELOCITY_SECRET
environment variable, which will override any potentially configured
velocity secret.
2024-09-22 20:25:27 +02:00
Lulu13022002
1ed64f8270
Update launchProjectile API (#11300) 2024-09-21 21:19:02 +02:00
Bjarne Koll
5bcb2ff9e4
Correctly launch WindCharges (#11418)
The launch API on LivingEntity only respected the WindCharge type, not
its near-clone BreezeWindCharge.

This commit correctly accounts for BreezeWindCharge in
CraftLivingEntity.
2024-09-21 20:08:31 +02:00
Newwind
d61175421d
Disable pretty printing for advancement saving (#11419) 2024-09-21 20:01:22 +02:00
Bjarne Koll
9c450388e1
Return null in getRegistry(Class) for unknown type (#11422)
The Bukkit#getRegistry(Class) method contract specifies that it returns
null for unknown registry types. The current implementation however
requires the passed class to be mappable to a known registry key.

For types like Material, which have a SimpleRegistry in bukkit's
Registry interface, no server side registry exists and such the type
cannot be mapped to a registry key.

The commit correctly returns null for types that are not mappable to a
registry key instead of throwing a NullPointerException.
2024-09-21 19:57:08 +02:00
Bjarne Koll
c5a10665b8
Remove wall-time / unused skip tick protection (#11412)
Spigot still maintains some partial implementation of "tick skipping", a
practice in which the MinecraftServer.currentTick field is updated not
by an increment of one per actual tick, but instead set to
System.currentTimeMillis() / 50. This behaviour means that the tracked
tick may "skip" a tick value in case a previous tick took more than the
expected 50ms.

To compensate for this in important paths, spigot/craftbukkit
implements "wall-time". Instead of incrementing/decrementing ticks on
block entities/entities by one for each call to their tick() method,
they instead increment/decrement important values, like
an ItemEntity's age or pickupDelay, by the difference of
`currentTick - lastTick`, where `lastTick` is the value of
`currentTick` during the last tick() call.

These "fixes" however do not play nicely with minecraft's simulation
distance as entities/block entities implementing the above behaviour
would "catch up" their values when moving from a non-ticking chunk to a
ticking one as their `lastTick` value remains stuck on the last tick in
a ticking chunk and hence lead to a large "catch up" once ticked again.

Paper completely removes the "tick skipping" behaviour (See patch
"Further-improve-server-tick-loop"), making the above precautions
completely unnecessary, which also rids paper of the previous described
incompatibility with non-ticking chunks.
2024-09-19 16:36:07 +02:00
Shane Freeder
5c82955733
Only mark decorations dirty if a removal actually occurs (#11413)
* Only mark decorations dirty if a removal actually occurs

Vanilla calls this method blindly inside of a loop which erroniously marks
map data files as being dirty even if nothing has actually changed.

* Merge into existing patch

---------

Co-authored-by: Bjarne Koll <lynxplay101@gmail.com>
2024-09-19 16:27:33 +02:00
4real
2aaf4369b6
Validate slot in PlayerInventory#setSlot (#11399) 2024-09-17 16:57:32 +02:00