Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2021-01-07 10:08:33 -05:00
commit 9774095df4

View File

@ -1045,7 +1045,7 @@ public class ServerControl implements ApplicationListener{
}catch(BindException b){ }catch(BindException b){
err("Command input socket already in use. Is another instance of the server running?"); err("Command input socket already in use. Is another instance of the server running?");
}catch(IOException e){ }catch(IOException e){
if(!e.getMessage().equals("Socket closed")){ if(!e.getMessage().equals("Socket closed") && !e.getMessage().equals("Connection reset")){
err("Terminating socket server."); err("Terminating socket server.");
err(e); err(e);
} }