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

This commit is contained in:
SenseiKiwi 2013-06-16 01:30:50 -04:00
commit af555bbac8
3 changed files with 18 additions and 4 deletions

View file

@ -72,7 +72,21 @@ public class SchematicLoader
public void init(LinkData link) public void init(LinkData link)
{ {
String filePath = dimHelper.dimList.get(link.destDimID).dungeonGenerator.schematicPath; //adding default pocket
String filePath="";
if(!dimHelper.dimList.containsKey(link.destDimID))
{
}
else if(dimHelper.dimList.get(link.destDimID).dungeonGenerator==null)
{
}
else
{
filePath = dimHelper.dimList.get(link.destDimID).dungeonGenerator.schematicPath;
}
this.schematic=filePath; this.schematic=filePath;
try try

View file

@ -180,7 +180,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
if(rand.nextInt(4)>1) if(rand.nextInt(7)>1)
{ {
return; return;
} }

View file

@ -4,12 +4,12 @@
"name": "Dimensional Doors", "name": "Dimensional Doors",
"description": "Bend and twist reality itelf, creating pocket dimensions, rifts, and much more", "description": "Bend and twist reality itelf, creating pocket dimensions, rifts, and much more",
"version": "1.4.0", "version": "1.4.0",
"credits": "Created by StevenRS11, logo by Jaitsu", "credits": "Created by StevenRS11, Coded by StevenRS11 and SenseiKiwi, logo and testing by Jaitsu",
"logoFile": "/dimdoors_logo.png", "logoFile": "/dimdoors_logo.png",
"mcversion": "", "mcversion": "",
"url": "http://www.minecraftforum.net/topic/1650007-147smpssplan-dimensional-doors-v110-physics-what-physics-updated-with-fancy-opengl/", "url": "http://www.minecraftforum.net/topic/1650007-147smpssplan-dimensional-doors-v110-physics-what-physics-updated-with-fancy-opengl/",
"updateUrl": "", "updateUrl": "",
"authors": [ "StevenRS11" ], "authors": [ "StevenRS11, SenseiKiwi" ],
"parent":"", "parent":"",
"screenshots": [], "screenshots": [],
"dependencies": [ "dependencies": [