Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 04:25:26 +01:00
Code Issues Projects Releases Wiki Activity

Fix WorldGenRegion leak when converting pre-1.18 chunks (#7097)

Browse Source 
Co-authored-by: Nassim Jahnke <jahnke.nassim@gmail.com>
This commit is contained in:
Jason 2021-12-14 13:07:42 -08:00 committed by GitHub
parent 51d168752b
commit 95d881f916
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
patches/server/0831-Fix-WorldGenRegion-leak-when-converting-pre-1.18-chu.patch Normal file
View File

@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sun, 12 Dec 2021 04:43:30 -0800
Subject: [PATCH] Fix WorldGenRegion leak when converting pre-1.18 chunks
The Blender passed in here holds a WorldGenRegion which contains a list of surrounding chunks
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
index 96cb3e8cad9e7a5edd2a448ea88f2447104fbb5a..5aeaaae6f15050a2da271fe196d0a234ecafc8a1 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
@@ -410,6 +410,11 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
}
public NoiseChunk getOrCreateNoiseChunk(NoiseSampler noiseColumnSampler, Supplier<NoiseChunk.NoiseFiller> columnSampler, NoiseGeneratorSettings chunkGeneratorSettings, Aquifer.FluidPicker fluidLevelSampler, Blender blender) {
+ // Paper start - create a new one each time to avoid leaking
+ if (blender != Blender.empty()) {
+ return NoiseChunk.forChunk(this, noiseColumnSampler, columnSampler, chunkGeneratorSettings, fluidLevelSampler, blender);
+ }
+ // Paper end
if (this.noiseChunk == null) {
this.noiseChunk = NoiseChunk.forChunk(this, noiseColumnSampler, columnSampler, chunkGeneratorSettings, fluidLevelSampler, blender);
}