R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cache_upgraded_structures leaking open input streams

Browse Source
This commit is contained in:
embeddedt 2023-10-09 08:36:35 -04:00
parent b1e91686da
commit 40b04cbded
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_upgraded_structures/StructureManagerMixin.java
View File

@ -14,6 +14,7 @@ import org.spongepowered.asm.mixin.Shadow;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.util.Optional; import java.util.Optional;
@Mixin(StructureTemplateManager.class) @Mixin(StructureTemplateManager.class)
@ -29,8 +30,8 @@ public class StructureManagerMixin {
@Overwrite @Overwrite
private Optional<StructureTemplate> loadFromResource(ResourceLocation id) { private Optional<StructureTemplate> loadFromResource(ResourceLocation id) {
ResourceLocation arg = new ResourceLocation(id.getNamespace(), "structures/" + id.getPath() + ".nbt"); ResourceLocation arg = new ResourceLocation(id.getNamespace(), "structures/" + id.getPath() + ".nbt");
try { try(InputStream stream = this.resourceManager.open(arg)) {
return Optional.of(CachingStructureManager.readStructure(id, this.fixerUpper, this.resourceManager.open(arg))); return Optional.of(CachingStructureManager.readStructure(id, this.fixerUpper, stream));
} catch(FileNotFoundException e) { } catch(FileNotFoundException e) {
return Optional.empty(); return Optional.empty();
} catch(IOException e) { } catch(IOException e) {