Merge remote-tracking branch 'upstream/master'

This commit is contained in:
SenseiKiwi 2013-06-15 02:19:00 -04:00
commit b174c69e5b
4 changed files with 8 additions and 3 deletions

View file

@ -106,6 +106,11 @@ public class TileEntityRift extends TileEntity
} }
count=0; count=0;
} }
else if(dimHelper.instance.getLinkDataFromCoords(xCoord, yCoord, zCoord, this.worldObj.provider.dimensionId)==null)
{
this.invalidate();
this.worldObj.setBlockToAir(xCoord, yCoord, zCoord);
}
count++; count++;
if(this.shouldClose) if(this.shouldClose)

View file

@ -137,7 +137,7 @@ public class MobObelisk extends EntityFlying implements IMob
{ {
if(this.soundTime<=0) if(this.soundTime<=0)
{ {
this.playSound("mods.DimDoors.sfx.monk", 1.7F, 1F); this.playSound("mods.DimDoors.sfx.monk", 1.5F, 1F);
this.soundTime=100; this.soundTime=100;
} }

View file

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

View file

@ -69,7 +69,7 @@ public class pocketGenerator extends ChunkProviderGenerate implements IChunkProv
{ {
if(!dimHelper.dimList.get(worldObj.provider.dimensionId).isDimRandomRift) if(!dimHelper.dimList.get(worldObj.provider.dimensionId).isDimRandomRift)
{ {
// return; return;
} }
} }
int y =0; int y =0;