mirror of
https://github.com/webbukkit/dynmap.git
synced 2025-02-26 08:41:33 +01:00
Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0
This commit is contained in:
commit
f075bf236c
@ -128,7 +128,7 @@ public class ColorScheme {
|
|||||||
id = -1;
|
id = -1;
|
||||||
BiomeMap[] bm = BiomeMap.values();
|
BiomeMap[] bm = BiomeMap.values();
|
||||||
for (int i = 0; i < bm.length; i++) {
|
for (int i = 0; i < bm.length; i++) {
|
||||||
if (bm[i].toString().equalsIgnoreCase(bio)) {
|
if (bm[i].getId().equalsIgnoreCase(bio)) {
|
||||||
id = i;
|
id = i;
|
||||||
break;
|
break;
|
||||||
} else if (bio.equalsIgnoreCase("BIOME_" + i)) {
|
} else if (bio.equalsIgnoreCase("BIOME_" + i)) {
|
||||||
|
@ -297,6 +297,9 @@ public class BiomeMap {
|
|||||||
public boolean isDefault() {
|
public boolean isDefault() {
|
||||||
return isDef;
|
return isDef;
|
||||||
}
|
}
|
||||||
|
public String getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return String.format("%s(%s)", id, resourcelocation);
|
return String.format("%s(%s)", id, resourcelocation);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user