Commit graph

9170 Commits

Autor SHA1 Nachricht Datum
9505258ec4 Merge pull request 'Update to 1.21.1' (#15) from 1.21.1 into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #15
Reviewed-by: Lixfel <lixfel@steamwar.de>
2024-08-27 19:21:31 +02:00
abfde9e36e steamwarci.yml aktualisiert
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-27 19:11:30 +02:00
88fd8688a9 Fix CI
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-27 14:10:58 +02:00
037a909005 Update to 1.21.1
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-27 13:57:27 +02:00
ba810f1058 Merge remote-tracking branch 'upstream/master' 2024-08-27 13:49:34 +02:00
Lixfel
66f1534cfd Fix CI
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2024-08-16 07:56:58 +02:00
Lixfel
203381a204 CI fixed?
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-16 07:49:47 +02:00
Lixfel
ba981a97c0 Fix CI (add inner jar and inner jar deployment)
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-15 12:39:52 +02:00
854824431b Fix Commits
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-15 10:55:24 +02:00
397b42d3af Fix CI
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-15 10:45:29 +02:00
Lulu13022002
11b4ac7c65
Fix disableEndCredits world config (#11261) 2024-08-14 21:26:38 +02:00
hyperdefined
9ab644ed29
Fix TooltipContext.create being wrong(#11254)
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
2024-08-14 14:39:45 +02:00
ab00a73799 Split Patches
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-13 11:50:00 +02:00
be922367c3 Merge Patches
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-13 10:44:34 +02:00
fa5a4a7c1f Fix CI
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-12 21:10:09 +02:00
b3c5a9b5bb Fix WallBlock and tested
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-12 21:09:31 +02:00
Nassim Jahnke
7c9240f4a6
Improve standard messenger logging 2024-08-12 18:42:08 +02:00
Jake Potrebic
1798e949e5
Fix BasicCommand suggestion arg count (#11241) 2024-08-12 09:40:39 +02:00
hyperdefined
4a97ba3ea8
Fix setSendViewDistance's return (#11247) 2024-08-12 09:27:27 +02:00
Jake Potrebic
f97aff74b6
[ci skip] Fix Effect javadocs (#11182) 2024-08-12 00:35:45 +02:00
Lulu13022002
098bd39092
Remove arbitrary book page limit (#11228) 2024-08-12 00:30:23 +02:00
Newwind
ab0d24aa6f
Configuration for horizontal-only item merging (#11219) 2024-08-12 00:16:20 +02:00
Jake Potrebic
dd941cc40a
Re-add patches for can-place/can-destroy API (#11238)
* Re-add patches for can-place/can-destroy API

This API is all deprecated for removal and has to be replaced
as the structure of it has too radically changed

* update patches

* add link to MaterialRerouting

* Deprecation

---------

Co-authored-by: Bjarne Koll <lynxplay101@gmail.com>
2024-08-11 13:51:37 -07:00
Jake Potrebic
1187544fb0
Fix teleport event getTo returning null (#11239) 2024-08-11 22:42:39 +02:00
Jake Potrebic
1c3c47ab0b
Correctly check enchants for ItemStack#damage (#11240) 2024-08-11 13:27:24 -07:00
9b92b0b328 Patches V2
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2024-08-11 21:51:14 +02:00
678af5b9fa Patches V1 2024-08-11 18:24:35 +02:00
191d74a113 Merge remote-tracking branch 'upstream/master' into 1.21-2 2024-08-11 17:35:38 +02:00
Lulu13022002
7d7f123e98
Fix wrong spawn reason for trial spawners (#11229) 2024-08-10 15:19:54 -07:00
Lulu13022002
1cecc24cad
Fix tag key generator output inconsistencies (#11218)
* Fix tag key generator output inconsistencies

* use NonNull instead of NotNull for generated api

---------

Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
2024-08-10 15:11:57 -07:00
Lulu13022002
70dfa467e7
Fix CraftMetaShield equality (#11232) 2024-08-10 15:08:00 +02:00
Nassim Jahnke
306d0dfdf0
Update generated code 2024-08-10 12:43:24 +02:00
Nassim Jahnke
83b6b26d39
Update to 1.21.1 2024-08-10 12:24:38 +02:00
Nassim Jahnke
b1b5d4c1e4
Check shooter in configurable projectile relative velocity patch 2024-08-10 11:55:08 +02:00
Joo200
4d7cef3418
Fix source of knockback for spigot events (#11176) 2024-08-09 22:57:55 +02:00
Bjarne Koll
77a5779e24
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11197)
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:
2ec53f49 PR-1050: Fix empty result check for Complex Recipes
10671012 PR-1044: Add CrafterCraftEvent
4d87ffe0 Use correct method in JavaDoc
ae5e5817 SPIGOT-7850: Add API for Bogged shear state
46b6d445 SPIGOT-7837: Support data pack banner patterns
d5d0cefc Fix JavaDoc error
b3c2b83d PR-1036: Add API for InventoryView derivatives
1fe2c75a SPIGOT-7809: Add ShieldMeta

CraftBukkit Changes:
8ee6fd1b8 SPIGOT-7857: Improve ItemMeta block data deserialization
8f26c30c6 SPIGOT-7857: Fix spurious internal NBT tag when deserializing BlockStateMeta
759061b93 SPIGOT-7855: Fire does not spread or burn blocks
00fc9fb64 SPIGOT-7853: AnvilInventory#getRepairCost() always returns 0
7501e2e04 PR-1450: Add CrafterCraftEvent
8c51673e7 SPIGOT-5731: PortalCreateEvent#getEntity returns null for nether portals ignited by flint and steel
d53d0d0b1 PR-1456: Fix inverted logic in CraftCrafterView#setSlotDisabled
682a678c8 SPIGOT-7850: Add API for Bogged shear state
fccf5243a SPIGOT-7837: Support data pack banner patterns
9c3bd4390 PR-1431: Add API for InventoryView derivatives
0cc6acbc4 SPIGOT-7849: Fix FoodComponent serialize with "using-converts-to" using null
2c5474952 Don't rely on tags for CraftItemMetas
20d107e46 SPIGOT-7846: Fix ItemMeta for hanging signs
76f59e315 Remove redundant clone in Dropper InventoryMoveItemEvent
e61a53d25 SPIGOT-7817: Call InventoryMoveItemEvent for Crafters
894682e2d SPIGOT-7839: Remove redundant Java version checks
2c12b2187 SPIGOT-7809: Add ShieldMeta and fix setting shield base colours

Spigot Changes:
fb8fb722 Rebuild patches
34bd42b7 SPIGOT-7835: Fix issue with custom hopper settings
2024-08-09 22:05:50 +02:00
Nassim Jahnke
4e6a2a13a3
Check for block type in SculkSensorBlock#canActivate 2024-08-07 14:34:12 +02:00
granny
042f15ffbd
[ci skip] chore: fix incorrect commit hash in PR builds (#11198)
* fix incorrect hash in PR builds

* only apply ref on pull_request triggers
2024-08-06 10:37:26 -07:00
metabrix
7e44684a1f
Fix wrong assumption about locale being null in the login phase (#11204)
Fixes #11203
2024-08-05 21:02:19 +02:00
Nassim Jahnke
5a5c3a4a24
Remove chunk unload trace debug
The issue the patch was initially added for has already been fixed and filling stacktraces can be expensive
2024-08-05 19:57:34 +02:00
Spottedleaf
df3b6544f7 ConcurrentUtil: Fix concurrent long map resize chain pull function
The function assumed that the current resize chain pointed to
the previous table, when in fact it pointed to the current table.

The function is supposed to restore the resize chain to the previous
table, previous increment, and previous index + new increment.
2024-08-01 16:55:33 -07:00
Spottedleaf
0a1be9ae87 Make loadChunksForMoveAsync use new chunk system load calls
This is to allow the call to work properly when on Folia,
as Folia does not have a main thread.
2024-07-30 19:50:14 -07:00
Jason Penilla
58c7ea3193
Preserve command node when re-registering modern commands through old API (#11184)
* Preserve command node when re-registering modern commands through old API

* make fix more targeted

mainly because it didn't work for vanilla commands :)
2024-07-30 11:42:55 -07:00
Jason Penilla
67d414a927
Allow plugin aliases to override vanilla commands (#11186)
fixes #11035
2024-07-30 11:28:05 -07:00
Spottedleaf
227544cfc7 Move TickThread changes from Moonrise patch to MCUtils
The common changes from Moonrise should be entirely in MCUtils
2024-07-30 05:32:20 -07:00
Shane Freeder
100d75a11c
Don't entirely die just because a plugin jar was bad 2024-07-29 16:54:46 +01:00
Shane Freeder
438863c4c5
Shutdown L4J cordially if the server stops before it's even started (#11172)
primarily, this allows us to ensure that appenders are flushed, console, log files
before the JVM exits to avoid issues such as error messages disappearing
2024-07-29 16:10:53 +01:00
Spottedleaf
0246a9da86 Add mob bucket items to item id to entity map in DataConverter
Mojang missed these in their mapping. Since the entity data
is used when spawning the bucketed mob, we need to have these
inside the id map to ensure that the entity data is converted
correctly if the entity id is missing.
2024-07-28 17:40:59 -07:00
Spottedleaf
3234b20ee4 Do not allow chunk unloading outside of the regular tick loop
Allowing chunk loading to occur at any point via purgeUnload()
introduces possible undesirable behavior to occur recursively
inside the chunk system.
2024-07-28 16:18:25 -07:00
Spottedleaf
50bdfc3e2c Null check tracker in Entity#resendPossiblyDesyncedEntityData
Accidentally dropped this check last commit. It is possible
that this is called while the entity is not tracked.
2024-07-28 15:49:38 -07:00