LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into brownan-chunkscan

Browse Source 
Conflicts:
	overviewer.py
	overviewer_core/quadtree.py
This commit is contained in:
Andrew Brown
2011-11-07 21:04:01 -05:00
parent b1c38a56f2 d59410123d
commit 636913af57
28 changed files with 20029 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
overviewer_core/world.py
View File

@@ -116,7 +116,7 @@ class World(object):
logging.debug(ex.str())
if os.path.exists(self.pickleFile):
self.persistentDataIsNew = False;
self.persistentDataIsNew = False
with open(self.pickleFile,"rb") as p:
self.persistentData = cPickle.load(p)
if not self.persistentData.get('north_direction', False):
@@ -165,7 +165,7 @@ class World(object):
def get_region_path(self, chunkX, chunkY):
"""Returns the path to the region that contains chunk (chunkX, chunkY)
"""
_, _, regionfile,_ = self.regionfiles.get((chunkX//32, chunkY//32),(None,None,None,None));
_, _, regionfile,_ = self.regionfiles.get((chunkX//32, chunkY//32),(None,None,None,None))
return regionfile
def load_from_region(self,filename, x, y):