2018-06-21 04:41:48 +02:00
|
|
|
From 13717faeafe2c5c4fe644eb9c4e6b041b4b324b1 Mon Sep 17 00:00:00 2001
|
2018-05-28 22:53:01 +02:00
|
|
|
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
|
2018-06-21 04:41:48 +02:00
|
|
|
index bba7a0e7..d5b3bd3d 100644
|
2018-05-28 22:53:01 +02:00
|
|
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
|
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
2018-06-21 04:41:48 +02:00
|
|
|
@@ -276,8 +276,6 @@ public class BungeeCord extends ProxyServer
|
2018-05-28 22:53:01 +02:00
|
|
|
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 d3f0b2d8..242535d0 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
|
|
|
|
|
@@ -64,7 +64,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()
|
|
|
|
|
--
|
2018-06-21 04:41:48 +02:00
|
|
|
2.17.1
|
2018-05-28 22:53:01 +02:00
|
|
|
|
