Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

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 3e69a4d24d
2 changed files with 9 additions and 5 deletions
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() { public String getName() {
return name;
}
public String getPrefix() {
return prefix; return prefix;
} }
@ -428,9 +432,9 @@ public class FlatMap extends MapType {
public List<String> baseZoomFilePrefixes() { public List<String> baseZoomFilePrefixes() {
ArrayList<String> s = new ArrayList<String>(); ArrayList<String> s = new ArrayList<String>();
s.add(getName() + "_128"); s.add(getPrefix() + "_128");
if(night_and_day) if(night_and_day)
s.add(getName()+"_day_128"); s.add(getPrefix()+"_day_128");
return s; return s;
} }
@ -508,7 +512,7 @@ public class FlatMap extends MapType {
@Override @Override
public String getKey() { public String getKey() {
return world.world.getName() + "." + map.getName(); return world.world.getName() + "." + map.getPrefix();
} }
public boolean isHightestBlockYDataNeeded() { return true; } 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() { public List<String> baseZoomFilePrefixes() {
ArrayList<String> s = new ArrayList<String>(); ArrayList<String> s = new ArrayList<String>();
for(MapTileRenderer r : renderers) { for(MapTileRenderer r : renderers) {
s.add("z" + r.getName()); s.add("z" + r.getPrefix());
if(r.isNightAndDayEnabled()) if(r.isNightAndDayEnabled())
s.add("z" + r.getName() + "_day"); s.add("z" + r.getPrefix() + "_day");
} }
return s; return s;
} }