forked from PaperMC/Waterfall
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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: a7dbbc2f #3544: Remove redundant super call in handle(FinishConfiguration) 68b2df2b #3514: Add separator property to SelectorComponent
- Loading branch information
1 parent
ce48007
commit adf2ad0
Showing
2 changed files
with
4 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 09ffc62269020ad3f6155d99bed12aefdcdad7f6 Mon Sep 17 00:00:00 2001 | ||
From e8ea9698ec9af3d3ccc6be444b8a604aae29041a Mon Sep 17 00:00:00 2001 | ||
From: Janmm14 <[email protected]> | ||
Date: Sat, 12 Dec 2015 23:43:30 +0100 | ||
Subject: [PATCH] Improve server list ping logging | ||
|
@@ -57,10 +57,10 @@ index 14a34f99..7e2d0c63 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 771ebb3e..1e27872c 100644 | ||
index 4a561406..14fac032 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 | ||
@@ -385,6 +385,6 @@ public class UpstreamBridge extends PacketHandler | ||
@@ -383,6 +383,6 @@ public class UpstreamBridge extends PacketHandler | ||
@Override | ||
public String toString() | ||
{ | ||
|