mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-24 19:25:16 +01:00
Merge upstream (Closes #282)
This commit is contained in:
parent
6125c28a94
commit
5955ede0cb
@ -1 +1 @@
|
||||
Subproject commit 1bb826109c57c7cd804b27bd5ba134f9edbcddda
|
||||
Subproject commit ba0739798a0b6f184eca4def52750e8633623487
|
@ -1,4 +1,4 @@
|
||||
From 272dccac1fcd101f7becdca0c0fadc475bf3179b Mon Sep 17 00:00:00 2001
|
||||
From ed0c6a80f6c16fa5ff25a0ab1bc0812b74995af9 Mon Sep 17 00:00:00 2001
|
||||
From: Techcable <Techcable@outlook.com>
|
||||
Date: Mon, 14 Mar 2016 15:40:44 -0700
|
||||
Subject: [PATCH] Optimize uuid conversions
|
||||
@ -258,10 +258,10 @@ index 27b51849..8bf17f9c 100644
|
||||
}
|
||||
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index e5d361e3..d1e9d556 100644
|
||||
index a6bd3720..0e8041f8 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -618,7 +618,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
@@ -625,7 +625,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
@Override
|
||||
public String getUUID()
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 4e397d65f36bf4aa15751def599df42e199d5288 Mon Sep 17 00:00:00 2001
|
||||
From 42de5a32c4a4f71e135bfc973a2474b1e2581aed Mon Sep 17 00:00:00 2001
|
||||
From: Techcable <Techcable@outlook.com>
|
||||
Date: Thu, 28 Jan 2016 15:13:29 -0700
|
||||
Subject: [PATCH] Allow removing servers or changing addresses on reload
|
||||
@ -10,7 +10,7 @@ Kicks players on failure to move.
|
||||
Original Issue: https://github.com/WaterfallMC/Waterfall-Old/issues/17
|
||||
|
||||
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 6c722e8b..3a73a870 100644
|
||||
index 1c585e60..bdb012c3 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
|
||||
@@ -11,12 +11,15 @@ import java.util.UUID;
|
||||
@ -29,7 +29,7 @@ index 6c722e8b..3a73a870 100644
|
||||
import net.md_5.bungee.util.CaseInsensitiveMap;
|
||||
import net.md_5.bungee.util.CaseInsensitiveSet;
|
||||
|
||||
@@ -101,18 +104,31 @@ public abstract class Configuration implements ProxyConfig
|
||||
@@ -103,18 +106,31 @@ public abstract class Configuration implements ProxyConfig
|
||||
servers = new CaseInsensitiveMap<>( newServers );
|
||||
} else
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3016f993123866d4713b124ed8ed261192ef7188 Mon Sep 17 00:00:00 2001
|
||||
From 9053bea57b15c9f581d3e89cf4b877ae0e30e585 Mon Sep 17 00:00:00 2001
|
||||
From: Janmm14 <computerjanimaus@yahoo.de>
|
||||
Date: Sat, 12 Dec 2015 23:43:30 +0100
|
||||
Subject: [PATCH] Optional server list ping logging.
|
||||
@ -72,7 +72,7 @@ index 44821171..47904de1 100644
|
||||
}
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
||||
index a130f581..34ca5554 100644
|
||||
index 30f8a7df..ce8da75d 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
||||
@@ -529,6 +529,6 @@ public class DownstreamBridge extends PacketHandler
|
||||
@ -84,14 +84,17 @@ index a130f581..34ca5554 100644
|
||||
}
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index d1e9d556..59053de2 100644
|
||||
index 0e8041f8..52811180 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -293,19 +293,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
@@ -293,16 +293,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
}
|
||||
|
||||
this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
|
||||
- bungee.getLogger().log( Level.INFO, "{0} has connected", this );
|
||||
- if ( bungee.getConfig().isLogPings() )
|
||||
- {
|
||||
- bungee.getLogger().log( Level.INFO, "{0} has connected", this );
|
||||
- }
|
||||
|
||||
bungee.getPluginManager().callEvent( new PlayerHandshakeEvent( InitialHandler.this, handshake ) );
|
||||
|
||||
@ -104,14 +107,7 @@ index d1e9d556..59053de2 100644
|
||||
// Ping
|
||||
thisState = State.STATUS;
|
||||
ch.setProtocol( Protocol.STATUS );
|
||||
break;
|
||||
case 2:
|
||||
// Login
|
||||
+ bungee.getLogger().log( Level.INFO, "{0} has connected", this );
|
||||
thisState = State.USERNAME;
|
||||
ch.setProtocol( Protocol.LOGIN );
|
||||
|
||||
@@ -624,7 +627,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
@@ -631,7 +630,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
@Override
|
||||
public String toString()
|
||||
{
|
||||
@ -121,7 +117,7 @@ index d1e9d556..59053de2 100644
|
||||
|
||||
@Override
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
index af1c7deb..81f09a80 100644
|
||||
index f08f464a..20b3975a 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
@@ -246,6 +246,6 @@ public class UpstreamBridge extends PacketHandler
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 589d0a85ce8de898b23f906bcceff3bb2ee05ed2 Mon Sep 17 00:00:00 2001
|
||||
From 8f2841d0dd8cd7e61031cdab88cd49fc3e84408a Mon Sep 17 00:00:00 2001
|
||||
From: Troy Frew <fuzzy_bot@arenaga.me>
|
||||
Date: Wed, 29 Jun 2016 04:29:25 +0200
|
||||
Subject: [PATCH] Add dynamic server addition/removal api.
|
||||
@ -181,7 +181,7 @@ index 2d967df3..628b5b48 100644
|
||||
|
||||
@Override
|
||||
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 3a73a870..d3f0b2d8 100644
|
||||
index bdb012c3..cbbd8d34 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
|
||||
@@ -1,6 +1,7 @@
|
||||
@ -208,7 +208,7 @@ index 3a73a870..d3f0b2d8 100644
|
||||
/**
|
||||
* Set of all servers.
|
||||
*/
|
||||
@@ -63,6 +66,7 @@ public abstract class Configuration implements ProxyConfig
|
||||
@@ -64,6 +67,7 @@ public abstract class Configuration implements ProxyConfig
|
||||
private boolean preventProxyConnections;
|
||||
private boolean forgeSupport;
|
||||
|
||||
@ -216,7 +216,7 @@ index 3a73a870..d3f0b2d8 100644
|
||||
public void load()
|
||||
{
|
||||
ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter();
|
||||
@@ -104,7 +108,7 @@ public abstract class Configuration implements ProxyConfig
|
||||
@@ -106,7 +110,7 @@ public abstract class Configuration implements ProxyConfig
|
||||
servers = new CaseInsensitiveMap<>( newServers );
|
||||
} else
|
||||
{
|
||||
@ -225,7 +225,7 @@ index 3a73a870..d3f0b2d8 100644
|
||||
this.servers = new CaseInsensitiveMap<>(newServers);
|
||||
|
||||
for ( ServerInfo oldServer : oldServers.values() )
|
||||
@@ -162,4 +166,71 @@ public abstract class Configuration implements ProxyConfig
|
||||
@@ -164,4 +168,71 @@ public abstract class Configuration implements ProxyConfig
|
||||
{
|
||||
return favicon;
|
||||
}
|
||||
|
@ -1,11 +1,11 @@
|
||||
From 5b753c311625da73afc78534c0c3da77dc489fe4 Mon Sep 17 00:00:00 2001
|
||||
From 702d71d9703ab3075982346a7aff2e083e9149dd Mon Sep 17 00:00:00 2001
|
||||
From: Techcable <Techcable@techcable.net>
|
||||
Date: Mon, 6 Jun 2016 13:36:10 -0600
|
||||
Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state
|
||||
|
||||
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index 933a8388..65e57062 100644
|
||||
index 6a570025..d35391ff 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -278,7 +278,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
@ -17,7 +17,7 @@ index 933a8388..65e57062 100644
|
||||
// with Bungee's IP forwarding, so we detect it, and remove it from the host string, for now.
|
||||
// We know FML appends \00FML\00. However, we need to also consider that other systems might
|
||||
// add their own data to the end of the string. So, we just take everything from the \0 character
|
||||
@@ -565,7 +565,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
@@ -568,7 +568,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
@Override
|
||||
public void disconnect(final BaseComponent... reason)
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d6788eb339161825d9cc132a551b17f68290f924 Mon Sep 17 00:00:00 2001
|
||||
From 0b0560615a94434dda6518f47a44afd187583bdd Mon Sep 17 00:00:00 2001
|
||||
From: phenomax <phenomax@revayd.net>
|
||||
Date: Thu, 10 Aug 2017 18:41:17 +0200
|
||||
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
|
||||
@ -52,10 +52,10 @@ similarity index 100%
|
||||
rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
|
||||
rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index 65e57062..2347654c 100644
|
||||
index d35391ff..52d97ec6 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -547,7 +547,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
@@ -550,7 +550,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
};
|
||||
|
||||
// fire login event
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2d00fa974c95d7e2cffaebfe40f937b41883f5c7 Mon Sep 17 00:00:00 2001
|
||||
From 284e166e11ab0cea910311f98042c8a32c3f6705 Mon Sep 17 00:00:00 2001
|
||||
From: Gabriele C <sgdc3.mail@gmail.com>
|
||||
Date: Thu, 8 Feb 2018 19:10:52 +0100
|
||||
Subject: [PATCH] Optionally log InitialHandler connections
|
||||
@ -59,20 +59,18 @@ index 5c92768a..090c550b 100644
|
||||
public String getGameVersion() {
|
||||
return gameVersion;
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index 2347654c..c6e109c5 100644
|
||||
index 52d97ec6..cdd1c919 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -312,7 +312,9 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
@@ -312,7 +312,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
break;
|
||||
case 2:
|
||||
// Login
|
||||
- bungee.getLogger().log( Level.INFO, "{0} has connected", this );
|
||||
+ if (BungeeCord.getInstance().getConfig().isLogInitialHandlerConnections()) {
|
||||
+ bungee.getLogger().log( Level.INFO, "{0} has connected", this );
|
||||
+ }
|
||||
thisState = State.USERNAME;
|
||||
ch.setProtocol( Protocol.LOGIN );
|
||||
|
||||
- if ( !bungee.getConfig().isLogPings() )
|
||||
+ if (BungeeCord.getInstance().getConfig().isLogInitialHandlerConnections() ) // Waterfall
|
||||
{
|
||||
bungee.getLogger().log( Level.INFO, "{0} has connected", this );
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
From 4de31ce7ef10e050ab3b1ed0e18b4cd4730ff21a Mon Sep 17 00:00:00 2001
|
||||
From b46ce4d1692e3eea856eaf163afe783ccc777311 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 47d4c585..1b486867 100644
|
||||
index ada8325a..90e7d4f1 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
@@ -276,8 +276,6 @@ public class BungeeCord extends ProxyServer
|
||||
@ -18,10 +18,10 @@ index 47d4c585..1b486867 100644
|
||||
|
||||
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
|
||||
index cbbd8d34..2599b579 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
|
||||
@@ -65,7 +65,7 @@ public abstract class Configuration implements ProxyConfig
|
||||
private Favicon favicon;
|
||||
private int compressionThreshold = 256;
|
||||
private boolean preventProxyConnections;
|
||||
|
Loading…
Reference in New Issue
Block a user