Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into R1.4.0-improvements

Browse source
This commit is contained in:
SenseiKiwi 2013-06-25 13:55:34 -04:00
commit e0ccb59d15
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
StevenDimDoors/mod_pocketDim/RiftGenerator.java
View file

@ -18,7 +18,7 @@ public class RiftGenerator implements IWorldGenerator
public static final int MAX_CLUSTER_GENERATION_CHANCE = 10000; public static final int MAX_CLUSTER_GENERATION_CHANCE = 10000;
private static final int CLUSTER_GROWTH_CHANCE = 80; private static final int CLUSTER_GROWTH_CHANCE = 80;
private static final int MAX_CLUSTER_GROWTH_CHANCE = 100; private static final int MAX_CLUSTER_GROWTH_CHANCE = 100;
private static final int MIN_RIFT_Y = 21; private static final int MIN_RIFT_Y = 4;
private static final int MAX_RIFT_Y = 250; private static final int MAX_RIFT_Y = 250;
private static final int CHUNK_LENGTH = 16; private static final int CHUNK_LENGTH = 16;
private static final int GATEWAY_RADIUS = 4; private static final int GATEWAY_RADIUS = 4;
@ -41,6 +41,11 @@ public class RiftGenerator implements IWorldGenerator
{ {
return; return;
} }
if(dimHelper.getWorld(0)==null)
{
return;
}
int x, y, z; int x, y, z;
int attempts; int attempts;

6
StevenDimDoors/mod_pocketDim/TransientDoor.java
View file

@ -91,9 +91,10 @@ public class TransientDoor extends ExitDoor
{ {
if(dimHelper.dimList.containsKey(linkData.destDimID)) if(dimHelper.dimList.containsKey(linkData.destDimID))
{ {
dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity);
par1World.setBlock(par2, par3-1, par4, 0); par1World.setBlock(par2, par3-1, par4, 0);
par1World.setBlock(par2, par3, par4, properties.RiftBlockID); par1World.setBlock(par2, par3, par4, properties.RiftBlockID);
dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity);
} }
} }
@ -105,9 +106,10 @@ public class TransientDoor extends ExitDoor
{ {
if(dimHelper.dimList.containsKey(linkData.destDimID)) if(dimHelper.dimList.containsKey(linkData.destDimID))
{ {
dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity);
par1World.setBlock(par2, par3, par4, 0); par1World.setBlock(par2, par3, par4, 0);
par1World.setBlock(par2, par3+1, par4, properties.RiftBlockID); par1World.setBlock(par2, par3+1, par4, properties.RiftBlockID);
dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity);
} }
} }

4
StevenDimDoors/mod_pocketDim/helpers/dimHelper.java
View file

@ -906,6 +906,10 @@ public class dimHelper extends DimensionManager
public LinkData createPocket(LinkData link , boolean isGoingDown, boolean isRandomRift) public LinkData createPocket(LinkData link , boolean isGoingDown, boolean isRandomRift)
{ {
DDProperties properties = DDProperties.instance(); DDProperties properties = DDProperties.instance();
if(dimHelper.getWorld(0)==null)
{
return link;
}
if (dimHelper.getWorld(link.locDimID) == null) if (dimHelper.getWorld(link.locDimID) == null)
{ {

2
StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View file

@ -391,7 +391,7 @@ public class mod_pocketDim
@ServerStarting @ServerStarting
public void serverStarting(FMLServerStartingEvent event) public void serverStarting(FMLServerStartingEvent event)
{ {
CommandRegenPocket.instance().register(event); //CommandRegenPocket.instance().register(event);
CommandCreateDungeonRift.instance().register(event); CommandCreateDungeonRift.instance().register(event);
CommandDeleteAllLinks.instance().register(event); CommandDeleteAllLinks.instance().register(event);
CommandDeleteDimensionData.instance().register(event); CommandDeleteDimensionData.instance().register(event);