Defend against trap if renderdata/ directory doesn't exist (deleted by user)
This commit is contained in:
parent
0cedeac3eb
commit
2012c63921
2 changed files with 29 additions and 25 deletions
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue