mirror of
https://github.com/GTNewHorizons/Gadomancy.git
synced 2026-11-20 03:59:56 +00:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
c77555e5e4
2 files changed
+1
-13
No files matched your search
@@ -77,11 +77,7 @@ public class ChunkProviderTCOuter implements IChunkProvider {
|
||||
TileEntity te = buf.blockData[pos[3]].createTileEntity(worldObj, buf.metaBuffer[pos[3]]);
|
||||
if(te != null) {
|
||||
if(te instanceof TileEldritchLock) {
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
te.writeToNBT(compound);
|
||||
TileEntity newTe = new TileOverrideEldritchLock();
|
||||
newTe.readFromNBT(compound);
|
||||
te = newTe;
|
||||
te = new TileOverrideEldritchLock();
|
||||
}
|
||||
|
||||
worldObj.addTileEntity(te);
|
||||
|
||||
@@ -168,16 +168,12 @@ public class TCMazeHandler {
|
||||
runningSessions.get(player).closeSession(teleport);
|
||||
runningSessions.remove(player);
|
||||
}
|
||||
if (runningSessions.size() == 0) {
|
||||
//addToWorldUnloadQueue(ModConfig.dimOuterId);
|
||||
}
|
||||
}
|
||||
|
||||
public static void free(Map<CellLoc, Short> locations) {
|
||||
if (locations == null) return;
|
||||
for (CellLoc loc : locations.keySet()) {
|
||||
labyrinthCopy.remove(loc);
|
||||
//forceChunkUnloading(ws, loc.x, loc.z);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -218,10 +214,6 @@ public class TCMazeHandler {
|
||||
MazeHandler.generateEldritch(GEN, GEN.rand, l.x, l.z);
|
||||
}
|
||||
MazeHandler.labyrinth = old;
|
||||
//System.out.println("Maze BuildTime: " + (System.currentTimeMillis() - startMs) + " (ms)");
|
||||
/*System.out.println("Blocks SET: " + GEN.blockCount);
|
||||
System.out.println("Blocks OVERWRITTEN: " + GEN.blockOverwriteCount);
|
||||
System.out.println("BufferChunks CREATED: " + FakeWorldTCGeneration.ChunkBuffer.cnt);*/
|
||||
|
||||
finishBuild();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user