Merge branch 'master' of git@github.com:StevenRS11/DimDoors.git into 1.5udpate

Conflicts:
	StevenDimDoors/mod_pocketDim/EventHookContainer.java
	StevenDimDoors/mod_pocketDim/mod_pocketDim.java
This commit is contained in:
StevenRS11
2013-04-01 04:04:59 -04:00
14 changed files with 101 additions and 99 deletions

View File

@@ -46,16 +46,12 @@ public class BlockDimWallPerm extends Block
{
Random rand = new Random();
int size = dimHelper.instance.linksForRendering.size();
LinkData link;
if(size!=0)
LinkData link=dimHelper.instance.getRandomLinkData(false);
if(link==null)
{
link = (LinkData) dimHelper.instance.linksForRendering.get(rand.nextInt(size));
}
else
{
link =new LinkData(0,0,0,0);
link =new LinkData(0,0,0,0);
}
if(dimHelper.getWorld(0)==null)
{