Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 13:15:30 +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

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

@ -293,20 +293,22 @@ public class HDBlockModels {
} }
File customdir = new File(datadir, "renderdata"); File customdir = new File(datadir, "renderdata");
String[] files = customdir.list(); String[] files = customdir.list();
for(String fn : files) { if(files != null) {
if(fn.endsWith("-models.txt") == false) for(String fn : files) {
continue; if(fn.endsWith("-models.txt") == false)
File custom = new File(customdir, fn); continue;
if(custom.canRead()) { File custom = new File(customdir, fn);
try { if(custom.canRead()) {
in = new FileInputStream(custom); try {
loadModelFile(in, custom.getPath()); in = new FileInputStream(custom);
} catch (IOException iox) { loadModelFile(in, custom.getPath());
Log.severe("Error loading " + custom.getPath()); } catch (IOException iox) {
} finally { Log.severe("Error loading " + custom.getPath());
if(in != null) { } finally {
try { in.close(); } catch (IOException iox) {} if(in != null) {
in = null; try { in.close(); } catch (IOException iox) {}
in = null;
}
} }
} }
} }

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

@ -788,17 +788,19 @@ public class TexturePack {
File renderdir = new File(datadir, "renderdata"); File renderdir = new File(datadir, "renderdata");
String[] files = renderdir.list(); String[] files = renderdir.list();
for(String fname : files) { if(files != null) {
if(fname.endsWith("-texture.txt")) { for(String fname : files) {
File custom = new File(renderdir, fname); if(fname.endsWith("-texture.txt")) {
if(custom.canRead()) { File custom = new File(renderdir, fname);
try { if(custom.canRead()) {
in = new FileInputStream(custom); try {
loadTextureFile(in, custom.getPath()); in = new FileInputStream(custom);
} catch (IOException iox) { loadTextureFile(in, custom.getPath());
Log.severe("Error loading " + custom.getPath() + " - " + iox); } catch (IOException iox) {
} finally { Log.severe("Error loading " + custom.getPath() + " - " + iox);
if(in != null) { try { in.close(); } catch (IOException x) {} in = null; } } finally {
if(in != null) { try { in.close(); } catch (IOException x) {} in = null; }
}
} }
} }
} }