mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-17 13:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
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
This commit is contained in:
granny 2022-01-05 23:28:44 -08:00
parent 29b24bca6a
commit 695f09c664
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -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

11
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@ -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<net.minecraft.server.level.ServerPlayer> 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();
}