Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-28 19:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #354 from mikeprimm/master

Browse Source 
Fix zoomout processing problem on kzedmaps due to inconsistent use of name vs prefix
This commit is contained in:
mikeprimm 2011-07-31 20:46:47 -07:00
commit fdbd4ab2d1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/dynmap/flat/FlatMap.java
View File

@ -413,6 +413,10 @@ public class FlatMap extends MapType {
}
public String getName() {
return name;
}
public String getPrefix() {
return prefix;
}
@ -428,9 +432,9 @@ public class FlatMap extends MapType {
public List<String> baseZoomFilePrefixes() {
ArrayList<String> s = new ArrayList<String>();
s.add(getName() + "_128");
s.add(getPrefix() + "_128");
if(night_and_day)
s.add(getName()+"_day_128");
s.add(getPrefix()+"_day_128");
return s;
}
@ -508,7 +512,7 @@ public class FlatMap extends MapType {
@Override
public String getKey() {
return world.world.getName() + "." + map.getName();
return world.world.getName() + "." + map.getPrefix();
}
public boolean isHightestBlockYDataNeeded() { return true; }

4
src/main/java/org/dynmap/kzedmap/KzedMap.java
View File

@ -274,9 +274,9 @@ public class KzedMap extends MapType {
public List<String> baseZoomFilePrefixes() {
ArrayList<String> s = new ArrayList<String>();
for(MapTileRenderer r : renderers) {
s.add("z" + r.getName());
s.add("z" + r.getPrefix());
if(r.isNightAndDayEnabled())
s.add("z" + r.getName() + "_day");
s.add("z" + r.getPrefix() + "_day");
}
return s;
}