mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-16 07:15:14 +01:00
fea7ec356d
Upstream has released updates that appears 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: f0908b66 Add optional 1.17 (21w19a) snapshot protocol support 5fa596fe #3084: (Regrettably) add a full SLF4J wrapper
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From be8460146ca653b8887f7010630a4c34852bbc21 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 617a077f..eeb63c43 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
@@ -281,8 +281,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 115f614e..85d2197a 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
|
|
@@ -69,7 +69,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.31.1
|
|
|