From 47a2b61505b840dfb86ed61339c08f712751528e Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Thu, 5 Jun 2025 01:15:10 +0200 Subject: [PATCH 1/2] Revert "Fix WorldClient leak (#28)" This reverts commit d50ec43d768c475bd734efa12dde80a99a4d4784. --- src/main/scala/codechicken/multipart/MultipartHelper.scala | 1 + .../codechicken/multipart/handler/MultipartSaveLoad.scala | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/scala/codechicken/multipart/MultipartHelper.scala b/src/main/scala/codechicken/multipart/MultipartHelper.scala index 3d2d0e7..6b85dc1 100644 --- a/src/main/scala/codechicken/multipart/MultipartHelper.scala +++ b/src/main/scala/codechicken/multipart/MultipartHelper.scala @@ -41,6 +41,7 @@ object MultipartHelper { if (!tag.getString("id").equals("savedMultipart")) return null + MultipartSaveLoad.loadingWorld = world return TileMultipart.createFromNBT(tag) } diff --git a/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala b/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala index 71eee74..5fa299f 100644 --- a/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala +++ b/src/main/scala/codechicken/multipart/handler/MultipartSaveLoad.scala @@ -7,13 +7,16 @@ import net.minecraft.world.chunk.Chunk import net.minecraft.world.ChunkPosition import codechicken.multipart.{MultipartHelper, TileMultipart} import codechicken.lib.asm.ObfMapping +import net.minecraft.world.World import scala.collection.mutable import codechicken.multipart.MultipartHelper.IPartTileConverter import scala.collection.JavaConversions._ -/** Hack due to lack of TileEntityLoadEvent in forge */ +/** Hack due to lack of TileEntityLoadEvent in forge + */ object MultipartSaveLoad { val converters = mutable.MutableList[IPartTileConverter[_]]() + var loadingWorld: World = _ class TileNBTContainer extends TileEntity { var tag: NBTTagCompound = _ @@ -56,6 +59,7 @@ object MultipartSaveLoad { } def loadTiles(chunk: Chunk) { + loadingWorld = chunk.worldObj val iterator = chunk.chunkTileEntityMap .asInstanceOf[Map[ChunkPosition, TileEntity]] .entrySet From baf333a8ca249bd36c0c24156033323b0fbcbf9a Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Thu, 5 Jun 2025 01:43:53 +0200 Subject: [PATCH 2/2] fix world memory leak without breaking stuff (hopefully) --- .../multipart/handler/MultipartEventHandler.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala b/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala index 42a61f2..67e16a8 100644 --- a/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala +++ b/src/main/scala/codechicken/multipart/handler/MultipartEventHandler.scala @@ -30,8 +30,11 @@ object MultipartEventHandler { @SubscribeEvent def worldUnLoad(event: WorldEvent.Unload) { MultipartSPH.onWorldUnload(event.world) - if (event.world.isRemote) + if (event.world.isRemote) { TileCache.clear() + } else { + MultipartSaveLoad.loadingWorld = null + } } @SubscribeEvent