Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 00:39:22 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Dreeam
2023-12-26 17:32:15 -05:00
parent 7809884022
commit 674a471e58
34 changed files with 135 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0120-Skip-unnecessary-mob-spawning-computations.patch
View File

@@ -13,11 +13,11 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 643143fa45c7c480e4bbd3d03e1b7cc19e2969e2..b4b6f21556717900b7ac49f8bead34a95362d4de 100644
index 0466ad371e26fb49a7a58f12f1d5e2ddafa0c6c7..8e398384000390f55bfdc081e02d04a5d17026b3 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -539,11 +539,16 @@ public class ServerChunkCache extends ChunkSource {
// Paper end - optimise chunk tick iteration
@@ -506,11 +506,16 @@ public class ServerChunkCache extends ChunkSource {
// Paper - optimise chunk tick iteration
if (this.level.getServer().tickRateManager().runsNormally()) {
+ // Gale start - MultiPaper - skip unnecessary mob spawning computations
@@ -34,7 +34,7 @@ index 643143fa45c7c480e4bbd3d03e1b7cc19e2969e2..b4b6f21556717900b7ac49f8bead34a9
if ((this.spawnFriendlies || this.spawnEnemies) && this.level.paperConfig().entities.spawning.perPlayerMobSpawns) { // don't count mobs when animals and monsters are disabled
// re-set mob counts
for (ServerPlayer player : this.level.players) {
@@ -567,7 +572,11 @@ public class ServerChunkCache extends ChunkSource {
@@ -534,7 +539,11 @@ public class ServerChunkCache extends ChunkSource {
this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
this.lastSpawnState = spawnercreature_d;
@@ -46,8 +46,8 @@ index 643143fa45c7c480e4bbd3d03e1b7cc19e2969e2..b4b6f21556717900b7ac49f8bead34a9
+ // Gale end - MultiPaper - skip unnecessary mob spawning computations
// Paper start - optimise chunk tick iteration
for (ServerPlayer player : this.level.players) {
@@ -654,7 +663,7 @@ public class ServerChunkCache extends ChunkSource {
ChunkMap playerChunkMap = this.chunkMap;
@@ -623,7 +632,7 @@ public class ServerChunkCache extends ChunkSource {
if (tick && chunk1.chunkStatus.isOrAfter(net.minecraft.server.level.FullChunkStatus.ENTITY_TICKING)) {
// Paper end - optimise chunk tick iteration
chunk1.incrementInhabitedTime(j);
@@ -56,7 +56,7 @@ index 643143fa45c7c480e4bbd3d03e1b7cc19e2969e2..b4b6f21556717900b7ac49f8bead34a9
NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
}
@@ -700,6 +709,20 @@ public class ServerChunkCache extends ChunkSource {
@@ -669,6 +678,20 @@ public class ServerChunkCache extends ChunkSource {
}
}