From 57e85b09cc19870b3e5f4f515d11909d42fe3c4e Mon Sep 17 00:00:00 2001 From: Kevin Raneri Date: Mon, 29 May 2023 18:33:05 -0400 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@90a0835 Fix incremental player saving patch PaperMC/Paper@f9f9079 Pull a few Folia patches --- gradle.properties | 2 +- .../0040-Reduce-entity-fluid-lookups-if-no-fluids.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3c24822..279f72b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ org.gradle.vfs.watch=false group=gg.pufferfish.pufferfish version=1.19.4-R0.1-SNAPSHOT mcVersion=1.19.4 -paperRef=bcd8dc2c1189293c4fc0b57048f0f0668c1b7e60 +paperRef=f9f90791e43f396ed12be5e0e8867691fc87dbe7 diff --git a/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch index 36ca065..5359c3f 100644 --- a/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch +++ b/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch @@ -116,7 +116,7 @@ index b4207874c7f0664d8e361adf8e4d32dd54047f50..9c12585057813acc698843782d3bc4f0 if (vec3d.length() > 0.0D) { if (k1 > 0) { diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java -index 1b80a91fa36c59a31b57ef7ef4a68eacbb0f17f5..b5e118456af6421ae3f85cb8232dc97a8b2d46b7 100644 +index 854865f28bcae0fb0c17717c914687f78e951e21..c6297917e94f5a8b4b1447b2c29c44b806ccaff6 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java @@ -27,6 +27,7 @@ public class LevelChunkSection { @@ -143,7 +143,7 @@ index 1b80a91fa36c59a31b57ef7ef4a68eacbb0f17f5..b5e118456af6421ae3f85cb8232dc97a } this.updateKnownBlockInfo(x | (z << 4) | (y << 8), iblockdata1, state); // Paper -@@ -260,6 +263,7 @@ public class LevelChunkSection { +@@ -261,6 +264,7 @@ public class LevelChunkSection { if (fluid.isRandomlyTicking()) { this.tickingFluidCount = (short) (this.tickingFluidCount + 1); }