Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c2e2281 Initial 1.18 update
PaperMC/Paper@12efc3f Fixes
PaperMC/Paper@60af9b0 moar fixes
PaperMC/Paper@19f9520 1.18.2 compiles successfuly now
PaperMC/Paper@f4eb08a Readd 'Fix entity type tags suggestions in selectors'
PaperMC/Paper@706c98a Update Datafixer
PaperMC/Paper@02e2402 Update README
PaperMC/Paper@c984991 Fix mc dev fix by removing it
PaperMC/Paper@490517d fixed flat bedrock patch
PaperMC/Paper@9da236f re-add config for stronghold seed patch
PaperMC/Paper@9a73213 Adventure 4.10.0
PaperMC/Paper@37436ac Move comment up
PaperMC/Paper@c6fc144 Fix unload stall
PaperMC/Paper@fbe43d6 clean up patch changes
PaperMC/Paper@3526f22 move patch relying on TraceUtil to after its creation
PaperMC/Paper@fd74326 update reobf-mappings-patch.tiny
PaperMC/Paper@5071d50 clean up view distance api diff
PaperMC/Paper@cc45a35 move decompile fixes to start of git history
PaperMC/Paper@146ac7b address failing mob goals test
PaperMC/Paper@b9037a5 fix issue resulting from kenny's apatch addiction
PaperMC/Paper@126ca73 Add TODO for leaf
PaperMC/Paper@ab8a139 Configure javadoc overview and doc-files copying
PaperMC/Paper@0859f59 1_18_R2
PaperMC/Paper@14add2b Updated Upstream (CraftBukkit)
PaperMC/Paper@178802a Fix various 1.18.2 update issues (#7523)
PaperMC/Paper@b1afebb Force close world loading screen on join (#7529)
PaperMC/Paper@d3caeeb Fix early registry access in xray patch
PaperMC/Paper@c6ea84c Drop unneeded desync patch
PaperMC/Paper@12d89fe Revert chunk postprocessing back to 1.18.1 logic
PaperMC/Paper@90788a5 clean up prepareTickingChunk diff
PaperMC/Paper@d33cdcf Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@753bf2c Update paperweight to 1.3.5
PaperMC/Paper@15b6b3d Add StructuresLocateEvent as replacement for StructureLocateEvent (#7524)
PaperMC/Paper@c09365a Fix deadlock on watchdog crash (#7535)
PaperMC/Paper@719daa8 Updated Upstream (CraftBukkit)
PaperMC/Paper@b9f26bb Add printPaperVersion task
PaperMC/Paper@63aa4d3 Clarify exception messages for invalid view distances (#7510)
PaperMC/Paper@0ee6dda Add javadoc linking for adventure-text-minimessage (#7538)
PaperMC/Paper@b6616c8 Fix falling block spawn methods
PaperMC/Paper@6d47843 replace bungeecord-chat dependency with deprecated version (#7539)
PaperMC/Paper@42a9c37 Move Adventure patch up
This commit is contained in:
lexikiq
2022-03-04 18:40:31 -05:00
parent cad9362f3d
commit 9b316cd4b3
8 changed files with 17 additions and 17 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add SoundEvent
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 8e87aca16879d7dd1dc0bd17d3215fca40b547cd..8013aa65752e15217b5ae99e012fb745205b9853 100644
index b5b56d4549e97abbbe9e91d881b9bca8428f1eec..1f0624e96f17fd16658dc244aaf15d56da8243ab 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1510,12 +1510,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -37,10 +37,10 @@ index e74c13e7aaa144fcd07036de70e80bebf0be698a..397d2c48c57a58c32b96c712d1c9682a
@Override
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index f5852341161b0d632e22af9b3e625ca1e786bd63..e3783298e50d8b75a00f7ad7ca1e7a7b8209e6d9 100644
index 02dc93c394d37c9a84aa4a58d80615c403c54fb9..85d6690bf0a96654a4fb596a8e5d8e1afc01bbc5 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -967,7 +967,7 @@ public abstract class PlayerList {
@@ -974,7 +974,7 @@ public abstract class PlayerList {
if (flag2 && !isLocAltered) {
BlockState data = worldserver1.getBlockState(blockposition);
worldserver1.setBlock(blockposition, data.setValue(RespawnAnchorBlock.CHARGE, data.getValue(RespawnAnchorBlock.CHARGE) - 1), 3);