Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-05 23:48:06 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord)

Browse Source 
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:
9c95d4ba #3226: Add console command name tab completion
6cbd7404 Fix checkstyle paren pad settings
ad8a8ef5 Increase per-listener event bus warning time
e6766a1e Update README date
This commit is contained in:
Shane Freeder 2022-01-02 02:12:53 +00:00
parent a078e046a1
commit 539846d9ab
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit b4ccdaa51c5e3ce8fbfb68536dc3a044fe0a1cff
Subproject commit 9c95d4ba43ba84d10e8bb7d7c92d7e6c5f161ed2

27
BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 779447f42a5b9620558026700f0f2c868c76ca1c Mon Sep 17 00:00:00 2001
From 0351cf0fcc7bcbad009800208fda7a8f1f34135c Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -442,14 +442,17 @@ index c2512dd5..0db3d76a 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandCompleter.java b/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandCompleter.java
deleted file mode 100644
index bd52d880..00000000
index 3e5ca394..00000000
--- a/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandCompleter.java
+++ /dev/null
@@ -1,25 +0,0 @@
@@ -1,38 +0,0 @@
-package net.md_5.bungee.command;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.stream.Collectors;
-import jline.console.completer.Completer;
-import lombok.RequiredArgsConstructor;
-import net.md_5.bungee.api.ProxyServer;
@ -463,11 +466,21 @@ index bd52d880..00000000
- @Override
- public int complete(String buffer, int cursor, List<CharSequence> candidates)
- {
- List<String> suggestions = new ArrayList<>();
- proxy.getPluginManager().dispatchCommand( proxy.getConsole(), buffer, suggestions );
- candidates.addAll( suggestions );
-
- int lastSpace = buffer.lastIndexOf( ' ' );
- if ( lastSpace == -1 )
- {
- String lowerCase = buffer.toLowerCase( Locale.ROOT );
- candidates.addAll( proxy.getPluginManager().getCommands().stream()
- .map( Map.Entry::getKey )
- .filter( (name) -> name.toLowerCase( Locale.ROOT ).startsWith( lowerCase ) )
- .collect( Collectors.toList() ) );
- } else
- {
- List<String> suggestions = new ArrayList<>();
- proxy.getPluginManager().dispatchCommand( proxy.getConsole(), buffer, suggestions );
- candidates.addAll( suggestions );
- }
-
- return ( lastSpace == -1 ) ? cursor - buffer.length() : cursor - ( buffer.length() - lastSpace - 1 );
- }
-}