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

@@ -104,10 +104,10 @@ index ece77f5ea4b14bbed7c070131b3251ea86764538..71bf426f7fb58fff6739bb1332d1286d
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0a0bc8c45cb70073cb94dee25b5e54fb98bf9c8e..780a88c7fcab402f1908ee1959f907e52d998a2e 100644
index 07c382f30ed3736ed15b5b71f48dc4a1de958242..6994038e8371a7d506d5f4c5abdf3b441f329231 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1685,7 +1685,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1683,7 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -117,7 +117,7 @@ index 0a0bc8c45cb70073cb94dee25b5e54fb98bf9c8e..780a88c7fcab402f1908ee1959f907e5
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5a6290e5d7b82dbc069d159ea53292e4dbc94d03..3336f223f9f0c6207471de15326f40d2ddc1dae2 100644
index 7343bd96a4a15f4abc081e565175db8df930a470..22619586b0d821123ed7bfb14744cfb27567522c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper