From 7ed27d66f913e02ccd6744666fdaa318c9cd1d8d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 27 Dec 2021 08:20:48 -0600 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: https://github.com/PaperMC/Paper/commit/e9947f8145ea1fa87d995fbf7df4868a556e78db [ci skip] sync dependency versions in paper-mojangapi with paper-api https://github.com/PaperMC/Paper/commit/692283dbe2d37d81903bca61a99ab0904be8d5fe Remove making unused copy of visible chunks in ChunkMap#processUnloads https://github.com/PaperMC/Paper/commit/22be4d5c603f4046e2e6bea3fd7e139e3085b7b4 Defensively copy chunk data in upgradeChunkTag --- gradle.properties | 2 +- patches/server/0068-Item-entity-immunities.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index bafadf9c8..4e1701b21 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT mcVersion = 1.18.1 packageVersion = 1_18_R1 -paperCommit = 464b1715bb8fb3c87b1f0f1f76d136b581794228 +paperCommit = 22be4d5c603f4046e2e6bea3fd7e139e3085b7b4 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0068-Item-entity-immunities.patch b/patches/server/0068-Item-entity-immunities.patch index 62e743d85..0927f2547 100644 --- a/patches/server/0068-Item-entity-immunities.patch +++ b/patches/server/0068-Item-entity-immunities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 0e474819c506e6d5e1731d49610c7cf472aa49c4..7f082df75ed430dafd45e2d42b9def901b002bc7 100644 +index cd85d1d97b8fbc8979100f2097e77070a840f3b1..07edfbf3bfb21f1c1cd2ce210aa3aafa0286ab1e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -2215,7 +2215,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -2209,7 +2209,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider public class TrackedEntity {