mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-06-27 06:55:02 +02:00
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 1a807731 #3567: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 772ad995 #3566: Bump actions/setup-java from 3 to 4 2431c40a #3562: Bump io.netty:netty-bom from 4.1.100.Final to 4.1.101.Final 8144ae8d #3555: Bump com.mysql:mysql-connector-j from 8.1.0 to 8.2.0 0757c39a Attempt upgrade of resolver libraries
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From ab57199fa438d9abf524c233e569350ec2cfc6e3 Mon Sep 17 00:00:00 2001
|
|
From: Jamie Mansfield <dev@jamierocks.uk>
|
|
Date: Mon, 28 May 2018 21:43:55 +0100
|
|
Subject: [PATCH] Forge is a first class citizen
|
|
|
|
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
index d60bdeb0..0646684f 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
@@ -290,8 +290,6 @@ public class BungeeCord extends ProxyServer
|
|
registerChannel( ForgeConstants.FML_TAG );
|
|
registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
|
|
registerChannel( ForgeConstants.FORGE_REGISTER );
|
|
-
|
|
- getLogger().warning( "MinecraftForge support is currently unmaintained and may have unresolved issues. Please use at your own risk." );
|
|
}
|
|
|
|
isRunning = true;
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
|
|
index 7094fe0b..8911bee8 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
|
|
@@ -73,7 +73,7 @@ public abstract class Configuration implements ProxyConfig
|
|
private Favicon favicon;
|
|
private int compressionThreshold = 256;
|
|
private boolean preventProxyConnections;
|
|
- private boolean forgeSupport;
|
|
+ private boolean forgeSupport = true; // Waterfall: default to enabled
|
|
|
|
@Synchronized("serversLock") // Waterfall
|
|
public void load()
|
|
--
|
|
2.43.0
|
|
|