mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-14 22:35:38 +01:00
d6688e05e6
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: 511017ab #3396: Update Netty version c3e8cfac #3374, #3389: Improve log handling of normal java.util Logger usage by forwarding the LogRecords directly to the BungeeLogger instead of the fallback err stream. bf2b3c68 #3384: Update documentation of ProxyPingEvent 68e74a8c #3378: Remove KickStringWriter from the pipeline after handshake arrives 5b4a5404 #3361: Cache MessageFormats for translations 88da5c05 #3353: Update GitHub actions
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From 270491b5947c02fdb02fa2ef25a5741f1e9465cb 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 22f5243f..ef4e5edf 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.38.1
|
|
|