From c40d70c2f868f876c144d6859dfbf2fee53ad520 Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Sun, 25 Aug 2013 16:49:34 +1000 Subject: [PATCH] Fix save handler corruption with new worlds. --- codechicken/multipart/TickScheduler.scala | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/codechicken/multipart/TickScheduler.scala b/codechicken/multipart/TickScheduler.scala index 73af56e..123b7b4 100644 --- a/codechicken/multipart/TickScheduler.scala +++ b/codechicken/multipart/TickScheduler.scala @@ -19,6 +19,7 @@ import java.io.FileOutputStream import net.minecraft.nbt.CompressedStreamTools import java.io.DataInputStream import java.io.FileInputStream +import net.minecraft.world.storage.SaveHandler /** * Used for scheduling delayed callbacks to parts. @@ -74,10 +75,10 @@ object TickScheduler extends WorldExtensionInstantiator def saveDir():File = { - val base = DimensionManager.getCurrentSaveRootDirectory - if(world.provider.dimensionId == 0) - return base - return new File(base, world.provider.getSaveFolder) + if(world.provider.dimensionId == 0)//Calling DimensionManager.getCurrentSaveRootDirectory too early breaks game saves, we have a world reference, use it + return world.getSaveHandler.asInstanceOf[SaveHandler].getWorldDirectory + + return new File(DimensionManager.getCurrentSaveRootDirectory, world.provider.getSaveFolder) } def saveFile():File = new File(saveDir, "multipart.dat")