diff --git a/overviewer_core/tileset.py b/overviewer_core/tileset.py index cfdf8dea..25d332e6 100644 --- a/overviewer_core/tileset.py +++ b/overviewer_core/tileset.py @@ -671,11 +671,11 @@ def _set_map_size(self): # Y has 4 times as many chunks as tiles, then halved since this is # a radius yradius = 2 * 2**p - # The +32 on the y bounds is because chunks are very tall, and in + # The +64 on the y bounds is because chunks are very tall, and in # rare cases when the bottom of the map is close to a border, it # could get cut off if xradius >= bounds.maxcol and -xradius <= bounds.mincol and \ - yradius >= bounds.maxrow + 32 and -yradius <= bounds.minrow: + yradius >= bounds.maxrow + 64 and -yradius <= bounds.minrow: break self.treedepth = p self.xradius = xradius diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 1df921b6..a71ceb6b 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -1307,7 +1307,7 @@ def __init__(self, regiondir, rel): 'minecraft:chiseled_tuff_bricks': (12670, 0), 'minecraft:tuff_brick_stairs': (12671, 0), 'minecraft:tuff_brick_slab': (12672, 0), - + 'minecraft:conduit': (1255, 0), 'minecraft:sniffer_egg': (1256, 0), 'minecraft:turtle_egg': (1257, 0), @@ -1362,9 +1362,9 @@ def __init__(self, regiondir, rel): 'minecraft:light': (99999, 1), 'minecraft:moving_piston': (99999, 2), 'minecraft:structure_void': (99999, 4), - + } - + colors = [ 'white', 'orange', 'magenta', 'light_blue', 'yellow', 'lime', 'pink', 'gray', @@ -1500,7 +1500,7 @@ def _get_block(self, palette_entry): colors = ['white', 'orange', 'magenta', 'light_blue', 'yellow', 'lime', 'pink', 'gray', 'light_gray', 'cyan', 'purple', 'blue', 'brown', 'green', 'red', 'black'] - + coral_list = [ 'tube', 'brain', 'bubble', 'fire', 'horn'] key = palette_entry['Name'] @@ -2656,15 +2656,12 @@ def iterate_newer_chunks(self, filemtime): yield x,z,mtime class CroppedRegionSet(RegionSetWrapper): - - MARGIN = 5 - def __init__(self, rsetobj, xmin, zmin, xmax, zmax): super(CroppedRegionSet, self).__init__(rsetobj) - self.xmin = (xmin // 16) + self.MARGIN - self.xmax = (xmax // 16) - self.MARGIN - self.zmin = (zmin // 16) + self.MARGIN - self.zmax = (zmax // 16) - self.MARGIN + self.xmin = xmin//16 + self.xmax = xmax//16 + self.zmin = zmin//16 + self.zmax = zmax//16 def __repr__(self): return "" % self.regiondir