Various Updates #143

Merged
SenseiKiwi merged 14 commits from master into master 2014-03-14 19:30:44 +00:00
2 changed files with 13 additions and 1 deletions
Showing only changes of commit 01fe9cc87e - Show all commits

View File

@@ -51,7 +51,8 @@ public class BlockDimWallPerm extends Block
@Override @Override
public void onEntityWalking(World world, int x, int y, int z, Entity entity) public void onEntityWalking(World world, int x, int y, int z, Entity entity)
{ {
if (!world.isRemote && world.provider.dimensionId == properties.LimboDimensionID) if (!world.isRemote && world.provider.dimensionId == properties.LimboDimensionID
&& mod_pocketDim.worldProperties.LimboEscapeEnabled)
{ {
World overworld = DimensionManager.getWorld(0); World overworld = DimensionManager.getWorld(0);
if (overworld != null && entity instanceof EntityPlayerMP) if (overworld != null && entity instanceof EntityPlayerMP)

View File

@@ -13,6 +13,12 @@ public class DDWorldProperties
public final DimensionFilter RiftClusterDimensions; public final DimensionFilter RiftClusterDimensions;
public final DimensionFilter RiftGatewayDimensions; public final DimensionFilter RiftGatewayDimensions;
/**
* General Flags
*/
public final boolean LimboEscapeEnabled;
//Names of categories //Names of categories
private static final String CATEGORY_WORLD_GENERATION = "world generation"; private static final String CATEGORY_WORLD_GENERATION = "world generation";
@@ -33,6 +39,11 @@ public class DDWorldProperties
RiftClusterDimensions = loadFilter(config, "Rift Cluster", "Rift Clusters"); RiftClusterDimensions = loadFilter(config, "Rift Cluster", "Rift Clusters");
RiftGatewayDimensions = loadFilter(config, "Rift Gateway", "Rift Gateways"); RiftGatewayDimensions = loadFilter(config, "Rift Gateway", "Rift Gateways");
LimboEscapeEnabled = config.get(Configuration.CATEGORY_GENERAL, "Enable Limbo Escape", true,
"Sets whether players are teleported out of Limbo when walking over the Eternal Fabric that " +
"generates near the bottom of the dimension. If disabled, players could still leave through " +
"dungeons in Limbo or by dying (if Hardcore Limbo is disabled). The default value is true.").getBoolean(true);
config.save(); config.save();
} }