From 6ae43560bcfc36ede34ea6d0ce81f176d65d2e6a Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Mon, 25 Jun 2018 17:45:37 +0200
Subject: [PATCH] Disable JLine event expansion

Fixes PaperMC/Paper#1171 for Waterfall
---
 ...for-logging-and-TerminalConsoleAppender-f.patch | 14 +++++++-------
 .../0044-Add-console-command-completion.patch      | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/BungeeCord-Patches/0040-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0040-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
index 7d1fd93..0577238 100644
--- a/BungeeCord-Patches/0040-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0040-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@@ -1,4 +1,4 @@
-From bf6eabd5788f7eb3323671a14145b160d80fc8ce Mon Sep 17 00:00:00 2001
+From 74f56e5352407993754cacb27f81948908e5fba3 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@@ -249,7 +249,7 @@ index 00000000..d4a81199
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index c3cd07bf..b11f8a86 100644
+index 2a1b0d82..87ad1500 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,6 +56,7 @@
@@ -261,7 +261,7 @@ index c3cd07bf..b11f8a86 100644
          <module>protocol</module>
          <module>proxy</module>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index dd8eab30..61886884 100644
+index 1c22043b..e34e3b54 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -70,7 +70,7 @@
@@ -297,7 +297,7 @@ index 446dfe2f..c3cb5aaa 100644
  }
 diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/console/WaterfallConsole.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/console/WaterfallConsole.java
 new file mode 100644
-index 00000000..a8a94749
+index 00000000..6cfe283a
 --- /dev/null
 +++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/console/WaterfallConsole.java
 @@ -0,0 +1,93 @@
@@ -355,7 +355,7 @@ index 00000000..a8a94749
 +                .appName(ProxyServer.getInstance().getName())
 +                .terminal(terminal)
 +                .build();
-+
++        reader.setOpt(LineReader.Option.DISABLE_EVENT_EXPANSION);
 +        reader.unsetOpt(LineReader.Option.INSERT_TAB);
 +
 +        TerminalConsoleAppender.setReader(reader);
@@ -395,7 +395,7 @@ index 00000000..a8a94749
 +
 +}
 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 064a7672..953f9085 100644
+index 788e6687..bba7a0e7 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -45,7 +45,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -506,5 +506,5 @@ index 10366c88..8c5cc949 100644
          }
  
 -- 
-2.16.1
+2.18.0
 
diff --git a/BungeeCord-Patches/0044-Add-console-command-completion.patch b/BungeeCord-Patches/0044-Add-console-command-completion.patch
index 7773bca..f35934a 100644
--- a/BungeeCord-Patches/0044-Add-console-command-completion.patch
+++ b/BungeeCord-Patches/0044-Add-console-command-completion.patch
@@ -1,4 +1,4 @@
-From a4da18e359af4cdfda067dfbc741bf84d0e0dd76 Mon Sep 17 00:00:00 2001
+From 4f89985a92b0dc63f3a7467b77c421b69d52aff8 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Tue, 26 Sep 2017 18:59:37 +0200
 Subject: [PATCH] Add console command completion
@@ -7,7 +7,7 @@ Register command completer for JLine to complete command names and
 command arguments (if supported).
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-index 520ee315..302981d0 100644
+index 54a65155..3e96b126 100644
 --- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
 +++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
 @@ -181,6 +181,41 @@ public class PluginManager
@@ -90,7 +90,7 @@ index 00000000..bfcb6e9f
 +
 +}
 diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/console/WaterfallConsole.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/console/WaterfallConsole.java
-index a8a94749..ea52c674 100644
+index 6cfe283a..31967d7d 100644
 --- a/proxy/src/main/java/io/github/waterfallmc/waterfall/console/WaterfallConsole.java
 +++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/console/WaterfallConsole.java
 @@ -51,6 +51,7 @@ public final class WaterfallConsole {
@@ -99,8 +99,8 @@ index a8a94749..ea52c674 100644
                  .terminal(terminal)
 +                .completer(new ConsoleCommandCompleter(bungee))
                  .build();
- 
+         reader.setOpt(LineReader.Option.DISABLE_EVENT_EXPANSION);
          reader.unsetOpt(LineReader.Option.INSERT_TAB);
 -- 
-2.14.1
+2.18.0