Merge branch 'stable' into development

This commit is contained in:
Magix
2022-05-06 21:39:30 -04:00
committed by GitHub
2 changed files with 18 additions and 5 deletions

View File

@@ -51,7 +51,7 @@ public final class Grasscutter {
private static PluginManager pluginManager;
public static final Reflections reflector = new Reflections("emu.grasscutter");
static {
// Declare logback configuration.
System.setProperty("logback.configurationFile", "src/main/resources/logback.xml");
@@ -66,7 +66,7 @@ public final class Grasscutter {
Utils.startupCheck();
}
public static void main(String[] args) throws Exception {
public static void main(String[] args) throws Exception {
Crypto.loadKeys(); // Load keys from buffers.
// Parse arguments.
@@ -127,7 +127,7 @@ public final class Grasscutter {
// Open console.
startConsole();
}
}
/**
* Server shutdown event.