apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Mazes #117

Merged
StevenRS11 merged 101 commits from mazes into DevBranch 2013-12-29 07:03:48 +00:00
Conversation 0 Commits 101 Files Changed 373 +2 -5
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a0d0f6e19b - Show all commits

2
src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java
View File

@@ -194,7 +194,6 @@ public class TileEntityRift extends TileEntity
if (count2 > 40) if (count2 > 40)
{ {
this.invalidate(); this.invalidate();
worldObj.setBlockToAir(xCoord, yCoord, zCoord);
if (dimension.getLink(xCoord, yCoord, zCoord) != null) if (dimension.getLink(xCoord, yCoord, zCoord) != null)
{ {
if(!this.worldObj.isRemote) if(!this.worldObj.isRemote)
@@ -202,6 +201,7 @@ public class TileEntityRift extends TileEntity
dimension.deleteLink(xCoord, yCoord, zCoord); dimension.deleteLink(xCoord, yCoord, zCoord);
} }
worldObj.playSound(xCoord, yCoord, zCoord, "mods.DimDoors.sfx.riftClose", (float) .7, 1, true); worldObj.playSound(xCoord, yCoord, zCoord, "mods.DimDoors.sfx.riftClose", (float) .7, 1, true);
worldObj.setBlockToAir(xCoord, yCoord, zCoord);
} }
} }
count2++; count2++;

1
src/main/java/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
View File

@@ -25,7 +25,6 @@ import StevenDimDoors.mod_pocketDim.util.Pair;
import StevenDimDoors.mod_pocketDim.util.Point4D; import StevenDimDoors.mod_pocketDim.util.Point4D;
import StevenDimDoors.mod_pocketDim.items.ItemDimensionalDoor; import StevenDimDoors.mod_pocketDim.items.ItemDimensionalDoor;
@SuppressWarnings("deprecation")
public class PocketBuilder public class PocketBuilder
{ {
public static final int MIN_POCKET_SIZE = 5; public static final int MIN_POCKET_SIZE = 5;

4
src/main/java/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java
View File

@@ -42,7 +42,6 @@ public class PocketGenerator extends ChunkProviderGenerate
public Chunk provideChunk(int chunkX, int chunkZ) public Chunk provideChunk(int chunkX, int chunkZ)
{ {
byte[] var3 = new byte[32768]; byte[] var3 = new byte[32768];
Chunk chunk = new Chunk(worldObj, var3, chunkX, chunkZ); Chunk chunk = new Chunk(worldObj, var3, chunkX, chunkZ);
if(!chunk.isTerrainPopulated) if(!chunk.isTerrainPopulated)
@@ -50,14 +49,13 @@ public class PocketGenerator extends ChunkProviderGenerate
chunk.isTerrainPopulated = true; chunk.isTerrainPopulated = true;
spawner.registerChunkForPopulation(worldObj.provider.dimensionId, chunkX, chunkZ); spawner.registerChunkForPopulation(worldObj.provider.dimensionId, chunkX, chunkZ);
} }
return chunk; return chunk;
} }
@Override @Override
public Chunk loadChunk(int var1, int var2) public Chunk loadChunk(int var1, int var2)
{ {
return super.loadChunk(var1, var2); return this.provideChunk(var1, var2);
} }
@Override @Override