From 74ff56cbc9781851b88e1959ea93dda32a156530 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Mon, 25 May 2020 11:49:45 -0400
Subject: [PATCH] Also reset when an exception is thrown.

---
 .../proxy/connection/client/ConnectedPlayer.java                | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
index 19f519591..4c5954cf6 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
@@ -772,6 +772,8 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
               } else if (status.getStatus() == Status.SERVER_DISCONNECTED) {
                 resetInFlightConnection();
               }
+            } else if (throwable != null) {
+              resetInFlightConnection();
             }
           }, connection.eventLoop())
           .thenApply(x -> x);