From bb6fadd7176bac4da7b43128fd7bcd7f482346d3 Mon Sep 17 00:00:00 2001 From: zontreck Date: Fri, 24 May 2024 18:09:51 -0700 Subject: [PATCH] Remove a thread blocking piece of code. --- lib/statemachine.dart | 12 +----------- lib/structs/settingsEntry.dart | 5 ----- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/lib/statemachine.dart b/lib/statemachine.dart index 5d21073..db98979 100644 --- a/lib/statemachine.dart +++ b/lib/statemachine.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'dart:io'; -import 'package:libac_dart/nbt/Stream.dart'; import 'package:libac_dart/packets/packets.dart'; import 'package:libac_dart/utils/IOTools.dart'; import 'package:servermanager/game.dart'; @@ -80,17 +79,7 @@ class StateMachine { DeadProcKillswitch = Completer(); } - static void onStdOutData(List stdOutData) { - StringBuilder builder = StringBuilder(); - for (int i in stdOutData) { - builder.append(String.fromCharCode(i)); - } - - print(builder.toString()); - } - static Future monitorProcess() async { - PROC!.stdout.listen(onStdOutData); try { int code = await PROC!.exitCode; DeadProcKillswitch.complete(); @@ -115,6 +104,7 @@ class StateMachine { return; // Nothing to do here } else if (currentState == States.FullStop) { Settings settings = Settings(); + print("Sending shutdown command to server"); await settings.sendRconCommand("shutdown"); changeState(States.Inactive); diff --git a/lib/structs/settingsEntry.dart b/lib/structs/settingsEntry.dart index 273e61e..270ec83 100644 --- a/lib/structs/settingsEntry.dart +++ b/lib/structs/settingsEntry.dart @@ -23,10 +23,6 @@ class SettingsEntry { static SettingsEntry deserialize(CompoundTag tag) { SettingsEntry st = SettingsEntry(); - if (tag.containsKey(Credentials.TAG_NAME)) { - st.steam_creds = - Credentials.deserialize(tag.get(Credentials.TAG_NAME) as CompoundTag); - } st.timer = AutomaticRestartInfo.deserialize( tag.get(AutomaticRestartInfo.TAG_NAME) as CompoundTag); st.serverSettings = ServerSettings.deserialize( @@ -48,7 +44,6 @@ class SettingsEntry { CompoundTag serialize() { CompoundTag tag = CompoundTag(); - if (steam_creds != null) tag.put(Credentials.TAG_NAME, steam_creds!.save()); tag.put(AutomaticRestartInfo.TAG_NAME, timer.serialize()); tag.put(ServerSettings.TAG_NAME, serverSettings.serialize()); NbtUtils.writeBoolean(tag, "pterodactyl", pterodactylMode);