From 695f09c6642d3fe7260519982340c7b1241915dc Mon Sep 17 00:00:00 2001 From: granny Date: Wed, 5 Jan 2022 23:28:44 -0800 Subject: [PATCH] Updated Upstream (Paper & Pufferfish) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@20c131b [ci skip] Add forums to readme (#7286) PaperMC/Paper@55a1756 Fix saving configs with more long comments (#7248) Pufferfish Changes: pufferfish-gg/Pufferfish@bb3bdb9 Adjust mob spawn count calculation as paper slightly changed how this works --- gradle.properties | 2 +- patches/server/0001-Pufferfish-Server-Changes.patch | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index 88a5182bb..c3b57ab5c 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 = 5e30e19e20670b2eac42aacb02dda82d56995bad +paperCommit = 55a1756ade7b8fa348aaad9debe967365022a6d3 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 83afa5435..9887377df 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -3530,18 +3530,9 @@ index 4247dcb003626535dbb997f48ad9f61380bd17e9..90aa1d75b5c23e5ee27ceae9f6ef90de } diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 302803aa25b713cb087bdb2991cb0803dfe6005b..434bdc40ddd92700211076965d97a473706e7351 100644 +index 302803aa25b713cb087bdb2991cb0803dfe6005b..58bdbd1ad4e87d5e16d23ae437bd231394da7dfc 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -@@ -170,7 +170,7 @@ public final class NaturalSpawner { - int difference = k1 - currEntityCount; - - if (world.paperConfig.perPlayerMobSpawns) { -- int minDiff = Integer.MAX_VALUE; -+ int minDiff = gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning ? difference : Integer.MAX_VALUE; // Pufferfish - optimize mob spawning - final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet inRange = world.getChunkSource().chunkMap.playerMobDistanceMap.getObjectsInRange(chunk.getPos()); - if (inRange != null) { - final Object[] backingSet = inRange.getBackingSet(); @@ -431,12 +431,12 @@ public final class NaturalSpawner { return spawnGroup == MobCategory.MONSTER && world.getBlockState(pos.below()).is(Blocks.NETHER_BRICKS) && structureAccessor.getStructureAt(pos, StructureFeature.NETHER_BRIDGE).isValid(); }