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

Don't use cached server resources if they got closed somehow

Browse Source 
Related: #46
This commit is contained in:
embeddedt 2023-03-24 10:50:47 -04:00
parent b623b3fa96
commit 5e81a49dc8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/embeddedt/modernfix/mixin/perf/reuse_datapacks/MinecraftMixin.java
View File

@ -37,16 +37,21 @@ public class MinecraftMixin implements ICachingResourceClient {
@Redirect(method = "makeServerStem", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/ServerResources;loadResources(Ljava/util/List;Lnet/minecraft/commands/Commands$CommandSelection;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
private CompletableFuture<ServerResources> useCachedResources(List<PackResources> list, Commands.CommandSelection arg, int i, Executor executor, Executor executor2) {
if(cachedResources != null) {
if(cachedDataPackConfig.equals(loadingDataPackConfig)) {
ModernFix.LOGGER.warn("Reusing loaded server resources from previous world");
return CompletableFuture.completedFuture(cachedResources);
if(cachedResources.getResourceManager().getNamespaces().size() > 0) {
if (cachedDataPackConfig.equals(loadingDataPackConfig)) {
ModernFix.LOGGER.warn("Reusing loaded server resources from previous world");
return CompletableFuture.completedFuture(cachedResources);
} else {
ModernFix.LOGGER.warn("Discarding cached server resources, datapack configs have changed");
ModernFix.LOGGER.warn("Old: {}", "[" + String.join(", ", cachedDataPackConfig) + "]");
ModernFix.LOGGER.warn("New: {}", "[" + String.join(", ", loadingDataPackConfig) + "]");
cachedResources.close();
cachedResources = null;
cachedDataPackConfig = null;
}
} else {
ModernFix.LOGGER.warn("Discarding cached server resources, datapack configs have changed");
ModernFix.LOGGER.warn("Old: {}", "[" + String.join(", ", cachedDataPackConfig) + "]");
ModernFix.LOGGER.warn("New: {}", "[" + String.join(", ", loadingDataPackConfig) + "]");
cachedResources.close();
ModernFix.LOGGER.error("Cached server resources were closed somehow, that shouldn't happen");
cachedResources = null;
cachedDataPackConfig = null;
}
}
return ServerResources.loadResources(list, arg, i, executor, executor2);