Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c50fc3a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7480)
PaperMC/Paper@2a4aef3 Mark ChatRender#render as ApiStatus.Override
PaperMC/Paper@f5b9e07 Add GameEvent tags (#6439)
PaperMC/Paper@b173c3e Use access transformers for player profile API (#7468)
PaperMC/Paper@286bd1b 1.18 misc performance dev branch (#7368)
PaperMC/Paper@5bb4549 Fix entity armor not showing on death animation (#7355)
PaperMC/Paper@7b8e0c3 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@36a1650 Furnace RecipesUsed API (#7399)
PaperMC/Paper@392acfd Configurable sculk sensor listener range (#6443)
PaperMC/Paper@b757019 Add missing block data mins and maxes (#6790)
PaperMC/Paper@9cab01e [ci skip] Update Gradle wrapper to 7.4
PaperMC/Paper@cdb893b Add mid-tick task execution to block ticking
PaperMC/Paper@854f3d3 Put world into worldlist before initing the world
PaperMC/Paper@db81163 Execute mid tick tasks during tile entity ticking
PaperMC/Paper@501834e Fix custom inventory holders (#6199)
PaperMC/Paper@04a337a Add some missing deprecations to the adventure patch (#7500)
PaperMC/Paper@b6dad9c Fix desync on teleporting entity on first tick (#7183)
PaperMC/Paper@2a55e35 Option to have default CustomSpawners in custom worlds (#7493)
PaperMC/Paper@bfa50ad Custom Potion Mixes (#6744)
PaperMC/Paper@7f65b0b Add DataConverter to StructureCheck, for structure lookups
PaperMC/Paper@30cb7d0 ignore excessive vel for Minecarts (Fixes #7515)
This commit is contained in:
lexikiq
2022-03-01 16:27:37 -05:00
parent e237cc3aa9
commit 9aa2e4da7e
9 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0001-Build-changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 028f6a1795ceb99d1760c73b0980238677b4b8bc..0466c22ca2325d090a5763c6b940252c32815a85 100644
index 4662952bd0a389fe77e00ede9ab4a57f33522794..39a1d297feef86c9427a605b1ff2b7fa3fae370e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,8 +18,8 @@ repositories {
@@ -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 eab93e1e3712c0a01cac187bf5944818c813d665..b0cf1f901fc0798e858be395ef349a42a7b3954a 100644
index c847a2b935130a293d9ac4c196c9cff27470649b..b624314d1c21be56b85764eb3fe3c76db63f7589 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1709,7 +1709,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1719,7 +1719,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -117,7 +117,7 @@ index eab93e1e3712c0a01cac187bf5944818c813d665..b0cf1f901fc0798e858be395ef349a42
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 f0629cac377b29246e990a01d60601270cbd77bd..ba750e735bb856532a74dde2ef7dba32d4c970d1 100644
index 51f67a2944034552d57b939ef29e0249e74383b9..bb3c7383d774dec2951cf29ea516d242de25a15f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper