Let's start from scratch, shall we?

SparklyPower · Oct 31, 2023 · 4e105d3 · 4e105d3
1 parent c022a42
commit 4e105d3
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 601 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,5 @@ While our fork is mostly cherry-picked patches from other forks, we do have some
 
 * Configurable Farm Land moisture tick rate when the block is already moisturised
   * The isNearWater check is costly, especially if you have a lot of farm lands. If the block is already moistured, we can change the tick rate of it to avoid these expensive isNearWater checks.
-* Only check thundering once per world instead for every chunk
-  * For some reason the isThundering check is consuming ~3% of CPU time when profiled so, instead of checking the thunder every chunk, we can cache the result and reuse on the same chunk tick.
 
 We don't cherry-pick *everything* from other forks, only patches that I can see and think "yeah, I can see how this would improve performance" or patches that target specific performance/feature pain points in our server are cherry-picked! In fact, some patches that are used in other forks [may be actually borked](BORKED_PATCHES.md)...
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=net.sparklypower.sparklypaper
 version=1.20.2-R0.1-SNAPSHOT
 
 mcVersion=1.20.2
-paperRef=5bb30ce95b14293f5bfebf10be2fdf929eabcc01
+paperRef=1865625d958b94d82e0bd601d6d860318980c4c4
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/...ring-once-per-world-instead-for-eve.patch → ...ring-once-per-world-instead-for-eve.patch b/...ring-once-per-world-instead-for-eve.patch → ...ring-once-per-world-instead-for-eve.patch
diff --git a/...tityLookup.ArrayIterable.-init-call.patch → ...tityLookup.ArrayIterable.-init-call.patch b/...tityLookup.ArrayIterable.-init-call.patch → ...tityLookup.ArrayIterable.-init-call.patch
diff --git a/patches/server/0003-Remove-iterators-from-inventory-contains.patch b/patches/server/0003-Remove-iterators-from-inventory-contains.patch
diff --git a/patches/server/0004-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0004-Remove-streams-and-iterators-from-range-check.patch
diff --git a/patches/server/0005-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch b/patches/server/0005-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch
diff --git a/patches/server/0006-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0006-Only-check-for-spooky-season-once-an-hour.patch
diff --git a/patches/server/0007-Move-ThreadUnsafeRandom-Initialization.patch b/patches/server/0007-Move-ThreadUnsafeRandom-Initialization.patch
diff --git a/patches/server/0008-Use-thread-unsafe-random-for-mob-spawning.patch b/patches/server/0008-Use-thread-unsafe-random-for-mob-spawning.patch