From 21b20d5dc38b2f005689c74f13c9ce508eb92246 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Sat, 29 Dec 2018 10:13:38 -0500
Subject: [PATCH] Obfuscate exceptions from user connection.

---
 .../connection/client/ClientPlaySessionHandler.java   |  8 ++------
 .../proxy/connection/client/ConnectedPlayer.java      |  1 -
 .../velocitypowered/proxy/util/ThrowableUtils.java    | 11 -----------
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 proxy/src/main/java/com/velocitypowered/proxy/util/ThrowableUtils.java

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
index ad3aa128b..5c1958fdc 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
@@ -21,7 +21,6 @@ import com.velocitypowered.proxy.protocol.packet.TabCompleteRequest;
 import com.velocitypowered.proxy.protocol.packet.TabCompleteResponse;
 import com.velocitypowered.proxy.protocol.packet.TitlePacket;
 import com.velocitypowered.proxy.protocol.util.PluginMessageUtil;
-import com.velocitypowered.proxy.util.ThrowableUtils;
 import io.netty.buffer.ByteBuf;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -246,11 +245,8 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
 
   @Override
   public void exception(Throwable throwable) {
-    player.disconnect(TextComponent.builder()
-        .content("An exception occurred in your connection: ")
-        .color(TextColor.RED)
-        .append(TextComponent.of(ThrowableUtils.briefDescription(throwable), TextColor.WHITE))
-        .build());
+    player.disconnect(TextComponent.of("Your connection has encountered an error. Try again later.",
+        TextColor.RED));
   }
 
   @Override
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 d6bcb58f7..2f03384b2 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
@@ -41,7 +41,6 @@ import com.velocitypowered.proxy.protocol.packet.PluginMessage;
 import com.velocitypowered.proxy.protocol.packet.TitlePacket;
 import com.velocitypowered.proxy.server.VelocityRegisteredServer;
 import com.velocitypowered.proxy.tablist.VelocityTabList;
-import com.velocitypowered.proxy.util.ThrowableUtils;
 import java.net.InetSocketAddress;
 import java.util.Collections;
 import java.util.List;
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/util/ThrowableUtils.java b/proxy/src/main/java/com/velocitypowered/proxy/util/ThrowableUtils.java
deleted file mode 100644
index b2c8e0100..000000000
--- a/proxy/src/main/java/com/velocitypowered/proxy/util/ThrowableUtils.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.velocitypowered.proxy.util;
-
-public class ThrowableUtils {
-  private ThrowableUtils() {
-    throw new AssertionError();
-  }
-
-  public static String briefDescription(Throwable throwable) {
-    return throwable.getClass().getSimpleName() + ": " + throwable.getMessage();
-  }
-}