Merge branch 'dev' into 'dev'

Allow arcturus to run as sevice in linux

See merge request morningstar/Arcturus-Community!452
This commit is contained in:
ArpyAge 2021-12-20 20:26:15 +00:00
commit 0d5a01902c
2 changed files with 20 additions and 13 deletions

View File

@ -1,4 +1,7 @@
INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('wired.place.under', '0'); INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('wired.place.under', '0');
INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('wired.custom.enabled', '0'); INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('wired.custom.enabled', '0');
INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('commands.error.cmd_stalk.forgot_username', 'Specify the username of the Habbo you want to follow!'); INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('commands.error.cmd_stalk.forgot_username', 'Specify the username of the Habbo you want to follow!');
-- Enable or Disable TTY in console (Default is enabled)
INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('console.mode', '1');

View File

@ -175,26 +175,30 @@ public final class Emulator {
Runtime.getRuntime().availableProcessors() * 2); Runtime.getRuntime().availableProcessors() * 2);
} }
Emulator.getThreading().run(() -> { Emulator.getThreading().run(() -> {
}, 1500); }, 1500);
BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); // Check if console mode is true or false, default is true
if (Emulator.getConfig().getBoolean("console.mode", true)) {
while (!isShuttingDown && isReady) { BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
try {
String line = reader.readLine();
if (line != null) { while (!isShuttingDown && isReady) {
ConsoleCommand.handle(line); try {
} String line = reader.readLine();
System.out.println("Waiting for command: ");
} catch (Exception e) { if (line != null) {
if (!(e instanceof IOException && e.getMessage().equals("Bad file descriptor"))) { ConsoleCommand.handle(line);
LOGGER.error("Error while reading command", e); }
System.out.println("Waiting for command: ");
} catch (Exception e) {
if (!(e instanceof IOException && e.getMessage().equals("Bad file descriptor"))) {
LOGGER.error("Error while reading command", e);
}
} }
} }
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }