LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

corrected y to z in functions in nbt.py

Browse Source
This commit is contained in:
Andrew Brown
2012-02-17 20:11:02 -05:00
parent 5e0d0df719
commit d669034c4c
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
overviewer_core/nbt.py
View File

@@ -227,39 +227,39 @@ class MCRFileReader(object):
def get_chunks(self): def get_chunks(self):
"""Return an iterator of all chunks contained in this region """Return an iterator of all chunks contained in this region
file, as (x, y) coordinate tuples. To load these chunks, file, as (x, z) coordinate tuples. To load these chunks,
provide these coordinates to load_chunk().""" provide these coordinates to load_chunk()."""
for x in xrange(32): for x in xrange(32):
for y in xrange(32): for z in xrange(32):
if self._locations[x + y * 32] >> 8 != 0: if self._locations[x + z * 32] >> 8 != 0:
yield (x,y) yield (x,z)
def get_chunk_timestamp(self, x, y): def get_chunk_timestamp(self, x, z):
"""Return the given chunk's modification time. If the given """Return the given chunk's modification time. If the given
chunk doesn't exist, this number may be nonsense. Like chunk doesn't exist, this number may be nonsense. Like
load_chunk(), this will wrap x and y into the range [0, 31]. load_chunk(), this will wrap x and z into the range [0, 31].
""" """
x = x % 32 x = x % 32
y = y % 32 z = z % 32
return self._timestamps[x + y * 32] return self._timestamps[x + z * 32]
def chunk_exists(self, x, y): def chunk_exists(self, x, z):
"""Determines if a chunk exists.""" """Determines if a chunk exists."""
x = x % 32 x = x % 32
y = y % 32 z = z % 32
return self._locations[x + y * 32] >> 8 != 0 return self._locations[x + z * 32] >> 8 != 0
def load_chunk(self, x, y): def load_chunk(self, x, z):
"""Return a (name, data) tuple for the given chunk, or """Return a (name, data) tuple for the given chunk, or
None if the given chunk doesn't exist in this region file. If None if the given chunk doesn't exist in this region file. If
you provide an x or y not between 0 and 31, it will be you provide an x or z not between 0 and 31, it will be
modulo'd into this range (x % 32, etc.) This is so you can modulo'd into this range (x % 32, etc.) This is so you can
provide chunk coordinates in global coordinates, and still provide chunk coordinates in global coordinates, and still
have the chunks load out of regions properly.""" have the chunks load out of regions properly."""
x = x % 32 x = x % 32
y = y % 32 z = z % 32
location = self._locations[x + y * 32] location = self._locations[x + z * 32]
offset = (location >> 8) * 4096; offset = (location >> 8) * 4096;
sectors = location & 0xff; sectors = location & 0xff;