Skip to content

Commit ce28817

Browse files
authored
Merge pull request #52 from dshadowwolf/v3
Fix a logic bug
2 parents 8f4faa8 + 15f1c1f commit ce28817

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/main/java/com/mcmoddev/orespawn/api/plugin/PluginLoader.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,11 @@ public void scanResources(PluginData pd) {
108108
InputStream reader = null;
109109
Path target = Paths.get(".","orespawn","os3",String.format("%s.json", pd.modId));
110110
tName = String.format("%s.json", pd.modId);
111-
if( target.toFile().exists() ) {
112-
// the file we were going to copy out to already exists!
113-
walk.close();
114-
return;
111+
if( !target.toFile().exists() ) {
112+
reader = Files.newInputStream(p);
113+
FileUtils.copyInputStreamToFile(reader, target.toFile());
114+
IOUtils.closeQuietly(reader);
115115
}
116-
117-
reader = Files.newInputStream(p);
118-
FileUtils.copyInputStreamToFile(reader, target.toFile());
119-
IOUtils.closeQuietly(reader);
120116
}
121117
}
122118
walk.close();

src/main/java/com/mcmoddev/orespawn/impl/os3/SpawnBuilderImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ public SpawnBuilderImpl() {
3232
@Override
3333
public FeatureBuilder newFeatureBuilder(@Nullable String featureName) {
3434
this.featureGen = new FeatureBuilderImpl();
35-
if( OreSpawn.FEATURES.getFeature(featureName) != null ) {
36-
this.featureGen.setGenerator(featureName);
35+
if( OreSpawn.FEATURES.getFeature(featureName) == null ) {
36+
this.featureGen.setGenerator("default");
37+
return this.featureGen;
3738
}
3839

40+
this.featureGen.setGenerator(featureName);
3941
return this.featureGen;
4042
}
4143

0 commit comments

Comments
 (0)