Added a per-world MapStorage feature that provides a method to store …

…data files associated with a specific world, as well as fixes the issue with villagers loosing there village. {Where villagers wouldn't go inside at night}

common/forge_at.cfg

@@ -82,4 +82,5 @@ default id.e # ChunkProviderServer/field_73247_e
 # PlayerManager
 default ib.a(IIZ)Lic; # PlayerManager/func_72690_a getOrCreateChunkWatcher
 # World
-public-f xe.C # net/minecraft/src/World/field_72982_D villageCollectionObj
+public-f xe.C # World/field_72982_D villageCollectionObj
+public xe.H # World/field_72993_I activeChunkSet

common/net/minecraftforge/common/WorldSpecificSaveHandler.java

@@ -0,0 +1,45 @@
+package net.minecraftforge.common;
+
+import java.io.File;
+
+import net.minecraft.src.IChunkLoader;
+import net.minecraft.src.IPlayerFileData;
+import net.minecraft.src.ISaveHandler;
+import net.minecraft.src.MinecraftException;
+import net.minecraft.src.NBTTagCompound;
+import net.minecraft.src.WorldInfo;
+import net.minecraft.src.WorldProvider;
+import net.minecraft.src.WorldServer;
+
+//Class used internally to provide the world specific data directories. 
+
+public class WorldSpecificSaveHandler implements ISaveHandler
+{
+    private WorldServer world;
+    private ISaveHandler parent;
+    private File dataDir;
+
+    public WorldSpecificSaveHandler(WorldServer world, ISaveHandler parent)
+    {
+        this.world = world;
+        this.parent = parent;
+        dataDir = new File(world.getChunkSaveLocation(), "data");
+        dataDir.mkdirs();
+    }
+
+    @Override public WorldInfo loadWorldInfo() { return parent.loadWorldInfo(); }
+    @Override public void checkSessionLock() throws MinecraftException { parent.checkSessionLock(); }
+    @Override public IChunkLoader getChunkLoader(WorldProvider var1) { return parent.getChunkLoader(var1); }
+    @Override public void saveWorldInfoWithPlayer(WorldInfo var1, NBTTagCompound var2) { parent.saveWorldInfoWithPlayer(var1, var2); }
+    @Override public void saveWorldInfo(WorldInfo var1){ parent.saveWorldInfo(var1); }
+    @Override public IPlayerFileData getSaveHandler() { return parent.getSaveHandler(); }
+    @Override public void flush() { parent.flush(); }
+    @Override public String getSaveDirectoryName() { return parent.getSaveDirectoryName(); }
+
+    @Override
+    public File getMapFileFromName(String name)
+    {
+        System.out.println(new File(dataDir, name + ".dat"));
+        return new File(dataDir, name + ".dat");
+    }
+}