From 4d285b475afd94739686268f8549a0c32f7b6868 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 31 Jul 2011 22:30:02 -0500 Subject: [PATCH 1/2] Fix zoom out processing for kzed maps - used name not prefix --- src/main/java/org/dynmap/kzedmap/KzedMap.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/dynmap/kzedmap/KzedMap.java b/src/main/java/org/dynmap/kzedmap/KzedMap.java index 08ff8b3c..b0050b29 100644 --- a/src/main/java/org/dynmap/kzedmap/KzedMap.java +++ b/src/main/java/org/dynmap/kzedmap/KzedMap.java @@ -274,9 +274,9 @@ public class KzedMap extends MapType { public List baseZoomFilePrefixes() { ArrayList s = new ArrayList(); 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; } From d845ed207d59514591500bfecdc7f962ea500fb7 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 31 Jul 2011 22:40:18 -0500 Subject: [PATCH 2/2] Get name and prefix use consistent --- src/main/java/org/dynmap/flat/FlatMap.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/dynmap/flat/FlatMap.java b/src/main/java/org/dynmap/flat/FlatMap.java index d0cb9dda..c3c62497 100644 --- a/src/main/java/org/dynmap/flat/FlatMap.java +++ b/src/main/java/org/dynmap/flat/FlatMap.java @@ -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 baseZoomFilePrefixes() { ArrayList s = new ArrayList(); - 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; }