From a8c853f1ec4deaa4116c25171fe4205936773d36 Mon Sep 17 00:00:00 2001
From: Christopher Felegy <foxbot@protonmail.com>
Date: Wed, 5 Jun 2019 17:11:06 -0400
Subject: [PATCH] Revert "Merge remote-tracking branch 'quahu/dev' into dev"

This reverts commit 8fb0d5dc13613e1539aff09899b465e21308d64c, reversing
changes made to 3e65e03b8583937057091d2ecb22c07162c2e4ca.
---
 src/Discord.Net.Commands/CommandParser.cs | 31 +++++------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/src/Discord.Net.Commands/CommandParser.cs b/src/Discord.Net.Commands/CommandParser.cs
index fc44c0a42..96747ae96 100644
--- a/src/Discord.Net.Commands/CommandParser.cs
+++ b/src/Discord.Net.Commands/CommandParser.cs
@@ -53,13 +53,6 @@ namespace Discord.Commands
                 else
                     c = '\0';
 
-                //If we're processing a remainder parameter, ignore all other logic
-                if (curParam != null && curParam.IsRemainder && curPos != endPos)
-                {
-                    argBuilder.Append(c);
-                    continue;
-                }
-
                 //If this character is escaped, skip it
                 if (isEscaping)
                 {
@@ -86,6 +79,13 @@ namespace Discord.Commands
                     continue;
                 }
 
+                //If we're processing an remainder parameter, ignore all other logic
+                if (curParam != null && curParam.IsRemainder && curPos != endPos)
+                {
+                    argBuilder.Append(c);
+                    continue;
+                }
+
                 //If we're not currently processing one, are we starting the next argument yet?
                 if (curPart == ParserPart.None)
                 {
@@ -114,23 +114,6 @@ namespace Discord.Commands
                     }
                 }
 
-                //If this character is escaped, skip it
-                if (isEscaping)
-                {
-                    if (curPos != endPos)
-                    {
-                        argBuilder.Append(c);
-                        isEscaping = false;
-                        continue;
-                    }
-                }
-                //Are we escaping the next character?
-                if (c == '\\' && (curParam == null || !curParam.IsRemainder))
-                {
-                    isEscaping = true;
-                    continue;
-                }
-
                 //Has this parameter ended yet?
                 string argString = null;
                 if (curPart == ParserPart.Parameter)