Upstream/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2024-11-25 12:25:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tried to fix potential race condition

Browse Source
This commit is contained in:
RaphiMC 2023-01-04 21:17:55 +01:00
parent f0e5821145
commit 70c5ff4da3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/raphimc/viaproxy/ViaProxy.java
View File

@ -13,6 +13,7 @@ import net.lenni0451.classtransform.utils.loader.InjectionClassLoader;
import net.lenni0451.reflect.ClassLoaders; import net.lenni0451.reflect.ClassLoaders;
import net.raphimc.netminecraft.constants.MCPipeline; import net.raphimc.netminecraft.constants.MCPipeline;
import net.raphimc.netminecraft.netty.connection.NetServer; import net.raphimc.netminecraft.netty.connection.NetServer;
import net.raphimc.vialegacy.util.VersionEnum;
import net.raphimc.viaproxy.cli.ConsoleHandler; import net.raphimc.viaproxy.cli.ConsoleHandler;
import net.raphimc.viaproxy.cli.options.Options; import net.raphimc.viaproxy.cli.options.Options;
import net.raphimc.viaproxy.plugins.PluginManager; import net.raphimc.viaproxy.plugins.PluginManager;
@ -46,6 +47,7 @@ public class ViaProxy {
Logger.setup(); Logger.setup();
ConsoleHandler.hookConsole(); ConsoleHandler.hookConsole();
Logger.LOGGER.info("Initializing ViaProxy..."); Logger.LOGGER.info("Initializing ViaProxy...");
VersionEnum.init();
setNettyParameters(); setNettyParameters();
MCPipeline.useOptimizedPipeline(); MCPipeline.useOptimizedPipeline();
c2pChannels = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE); c2pChannels = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE);

2
src/main/java/net/raphimc/viaproxy/cli/options/Options.java
View File

@ -28,8 +28,6 @@ public class Options {
public static boolean BETACRAFT_AUTH; public static boolean BETACRAFT_AUTH;
public static void parse(final String[] args) throws IOException { public static void parse(final String[] args) throws IOException {
VersionEnum.init(); // We need to init the version list already here
final OptionParser parser = new OptionParser(); final OptionParser parser = new OptionParser();
final OptionSpec<Void> help = parser.acceptsAll(asList("help", "h", "?"), "Get a list of all arguments").forHelp(); final OptionSpec<Void> help = parser.acceptsAll(asList("help", "h", "?"), "Get a list of all arguments").forHelp();