2018-12-21 16:24:26 +01:00
|
|
|
From 799eed4305aa7a672cf3cede6ff43bccfb78b17f 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-11-04 21:27:05 +01:00
|
|
|
index d246adb7..c1c04995 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-11-04 21:27:05 +01:00
|
|
|
@@ -275,8 +275,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 );
|
2018-07-09 11:12:55 +02:00
|
|
|
-
|
2018-05-28 22:53:01 +02:00
|
|
|
- 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
|
2018-12-21 16:24:26 +01:00
|
|
|
index ba7a1e61..1d3a1113 100644
|
2018-05-28 22:53:01 +02:00
|
|
|
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
|
|
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
|
2018-09-04 04:12:52 +02:00
|
|
|
@@ -65,7 +65,7 @@ public abstract class Configuration implements ProxyConfig
|
2018-05-28 22:53:01 +02:00
|
|
|
private Favicon favicon;
|
|
|
|
private int compressionThreshold = 256;
|
|
|
|
private boolean preventProxyConnections;
|
|
|
|
- private boolean forgeSupport;
|
|
|
|
+ private boolean forgeSupport = true; // Waterfall: default to enabled
|
2018-12-21 16:24:26 +01:00
|
|
|
private boolean injectCommands;
|
2018-05-28 22:53:01 +02:00
|
|
|
|
|
|
|
@Synchronized("serversLock") // Waterfall
|
|
|
|
--
|
2018-12-21 16:24:26 +01:00
|
|
|
2.20.1
|
2018-05-28 22:53:01 +02:00
|
|
|
|