From 2436d813e62ebff05e0985893f9ad3074c550900 Mon Sep 17 00:00:00 2001 From: Daniel Ratcliffe Date: Thu, 4 May 2017 22:15:26 +0100 Subject: [PATCH] Treat a maximumFilesOpen values of 0 as unlimited --- src/main/java/dan200/computercraft/ComputerCraft.java | 2 +- .../java/dan200/computercraft/core/filesystem/FileSystem.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/dan200/computercraft/ComputerCraft.java b/src/main/java/dan200/computercraft/ComputerCraft.java index e3ff343ff..710094ecd 100644 --- a/src/main/java/dan200/computercraft/ComputerCraft.java +++ b/src/main/java/dan200/computercraft/ComputerCraft.java @@ -263,7 +263,7 @@ public void preInit( FMLPreInitializationEvent event ) Config.turtlesNeedFuel.setComment( "Set whether Turtles require fuel to move" ); Config.maximumFilesOpen = Config.config.get(Configuration.CATEGORY_GENERAL, "maximumFilesOpen", maximumFilesOpen); - Config.maximumFilesOpen.setComment( "How many files a computer can have open at the same time" ); + Config.maximumFilesOpen.setComment( "Set how many files a computer can have open at the same time. Set to 0 for unlimited." ); Config.turtleFuelLimit = Config.config.get( Configuration.CATEGORY_GENERAL, "turtleFuelLimit", turtleFuelLimit ); Config.turtleFuelLimit.setComment( "The fuel limit for Turtles" ); diff --git a/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java b/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java index 281840dd8..0ba626dc9 100644 --- a/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java +++ b/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java @@ -655,7 +655,8 @@ private synchronized T openFile(T file, Closeable handl { synchronized( m_openFiles ) { - if( m_openFiles.size() >= ComputerCraft.maximumFilesOpen ) + if( ComputerCraft.maximumFilesOpen > 0 && + m_openFiles.size() >= ComputerCraft.maximumFilesOpen ) { if( handle != null ) {