OK. AT the right thing, and add in a call to always get the right thing. Clean up patch fuzz too.
This commit is contained in:
parent
a085a9c95e
commit
71fc299ac7
3 changed files with 21 additions and 3 deletions
|
@ -114,5 +114,5 @@ public zc.* #FD:BiomeDecorator/* # All private -> protected
|
||||||
public-f tj.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final
|
public-f tj.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final
|
||||||
# Packet
|
# Packet
|
||||||
public ef.a(IZZLjava/lang/Class;)V #MD:Packet/func_73285_a #addIdClassMapping
|
public ef.a(IZZLjava/lang/Class;)V #MD:Packet/func_73285_a #addIdClassMapping
|
||||||
# World
|
# SaveHandler
|
||||||
yc.J ()Laih; #MD:World/func_72860_G #getSaveHandler
|
public ahv.b()Ljava/io/File; #MD:SaveHandler/func_75765_b
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package net.minecraftforge.common;
|
package net.minecraftforge.common;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.BitSet;
|
import java.util.BitSet;
|
||||||
import java.util.Hashtable;
|
import java.util.Hashtable;
|
||||||
|
@ -29,6 +30,7 @@ import net.minecraft.world.WorldServer;
|
||||||
import net.minecraft.world.WorldServerMulti;
|
import net.minecraft.world.WorldServerMulti;
|
||||||
import net.minecraft.world.WorldSettings;
|
import net.minecraft.world.WorldSettings;
|
||||||
import net.minecraft.world.storage.ISaveHandler;
|
import net.minecraft.world.storage.ISaveHandler;
|
||||||
|
import net.minecraft.world.storage.SaveHandler;
|
||||||
import net.minecraftforge.event.world.WorldEvent;
|
import net.minecraftforge.event.world.WorldEvent;
|
||||||
|
|
||||||
public class DimensionManager
|
public class DimensionManager
|
||||||
|
@ -311,4 +313,20 @@ public class DimensionManager
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the current root directory for the world save. Accesses getSaveHandler from the
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static File getCurrentSaveRootDirectory()
|
||||||
|
{
|
||||||
|
if (DimensionManager.getWorld(0) != null)
|
||||||
|
{
|
||||||
|
return ((SaveHandler)DimensionManager.getWorld(0).getSaveHandler()).getSaveDirectory();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
/** Array of item stacks stored in minecart (for storage minecarts). */
|
/** Array of item stacks stored in minecart (for storage minecarts). */
|
||||||
@@ -52,6 +59,25 @@
|
@@ -52,6 +59,25 @@
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public double velocityZ;
|
protected double velocityZ;
|
||||||
|
|
||||||
+ /* Forge: Minecart Compatibility Layer Integration. */
|
+ /* Forge: Minecart Compatibility Layer Integration. */
|
||||||
+ public static float defaultMaxSpeedRail = 0.4f;
|
+ public static float defaultMaxSpeedRail = 0.4f;
|
||||||
|
|
Loading…
Reference in a new issue