Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-02-17 20:31:37 +01:00
Code Issues Projects Releases Wiki Activity

Defend against trap if renderdata/ directory doesn't exist (deleted by user)

Browse Source
This commit is contained in:
Mike Primm 2011-10-29 22:25:11 +08:00 committed by mikeprimm
parent 2eb6d47d87
commit ca62003e06
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/dynmap/hdmap/HDBlockModels.java
View File

@ -293,6 +293,7 @@ public class HDBlockModels {
}
File customdir = new File(datadir, "renderdata");
String[] files = customdir.list();
if(files != null) {
for(String fn : files) {
if(fn.endsWith("-models.txt") == false)
continue;
@ -312,6 +313,7 @@ public class HDBlockModels {
}
}
}
}
/**
* Load models from file
*/

2
src/main/java/org/dynmap/hdmap/TexturePack.java
View File

@ -788,6 +788,7 @@ public class TexturePack {
File renderdir = new File(datadir, "renderdata");
String[] files = renderdir.list();
if(files != null) {
for(String fname : files) {
if(fname.endsWith("-texture.txt")) {
File custom = new File(renderdir, fname);
@ -804,6 +805,7 @@ public class TexturePack {
}
}
}
}
/**
* Load texture pack mappings from texture.txt file