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

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Martijn Muijsers
2023-08-21 22:36:08 +02:00
parent a50e9c9e4e
commit 0995eaa49d
41 changed files with 134 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0126-Skip-unnecessary-mob-spawning-computations.patch
View File

@@ -13,7 +13,7 @@ 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 041f188b742ad819e2460e8ca5ab7f44412dbf9b..3c9ff57cf8cf7e7bfca234e460ff869165bd40d3 100644
index 6c77db5edce2101847234f65bd10c5841fd5bd4f..075c476cdf02ece97c5e0032726ae1b560825ce1 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -543,10 +543,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -33,7 +33,7 @@ index 041f188b742ad819e2460e8ca5ab7f44412dbf9b..3c9ff57cf8cf7e7bfca234e460ff8691
if ((this.spawnFriendlies || this.spawnEnemies) && this.chunkMap.playerMobDistanceMap != null) { // don't count mobs when animals and monsters are disabled
// re-set mob counts
for (ServerPlayer player : this.level.players) {
@@ -560,13 +565,16 @@ public class ServerChunkCache extends ChunkSource {
@@ -570,13 +575,16 @@ public class ServerChunkCache extends ChunkSource {
this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
this.lastSpawnState = spawnercreature_d;
@@ -52,7 +52,7 @@ index 041f188b742ad819e2460e8ca5ab7f44412dbf9b..3c9ff57cf8cf7e7bfca234e460ff8691
// Paper - only shuffle if per-player mob spawning is disabled
// Paper - moved natural spawn event up
@@ -596,7 +604,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -606,7 +614,7 @@ public class ServerChunkCache extends ChunkSource {
if ((true || this.level.isNaturalSpawningAllowed(chunkcoordintpair)) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, false)) { // Paper - optimise anyPlayerCloseEnoughForSpawning // Paper - the chunk is known ticking
chunk1.incrementInhabitedTime(j);
@@ -61,7 +61,7 @@ index 041f188b742ad819e2460e8ca5ab7f44412dbf9b..3c9ff57cf8cf7e7bfca234e460ff8691
NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
}
@@ -657,6 +665,20 @@ public class ServerChunkCache extends ChunkSource {
@@ -667,6 +675,20 @@ public class ServerChunkCache extends ChunkSource {
}
}