Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-25 13:13:06 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into development

Browse Source
This commit is contained in:
Magix 2022-05-06 21:39:30 -04:00 committed by GitHub
commit e29c2dc122
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
proxy_config.py
View File

@ -1,4 +1,17 @@
import os
# This can also be replaced with another IP address.
USE_SSL = True
REMOTE_HOST = "127.0.0.1"
REMOTE_PORT = 443
REMOTE_HOST = "localhost"
REMOTE_PORT = 443
if os.getenv('MITM_REMOTE_HOST') != None:
REMOTE_HOST = os.getenv('MITM_REMOTE_HOST')
if os.getenv('MITM_REMOTE_PORT') != None:
REMOTE_PORT = int(os.getenv('MITM_REMOTE_PORT'))
if os.getenv('MITM_USE_SSL') != None:
USE_SSL = bool(os.getenv('MITM_USE_SSL'))
print('MITM Remote Host: ' + REMOTE_HOST)
print('MITM Remote Port: ' + str(REMOTE_PORT))
print('MITM Use SSL ' + str(USE_SSL))

6
src/main/java/emu/grasscutter/Grasscutter.java
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.