From 1a5558a5f08d01d4086bab31fb7788e42efa5d4f Mon Sep 17 00:00:00 2001
From: q13x <84165981+WorldEditAxe@users.noreply.github.com>
Date: Sat, 8 Jul 2023 18:41:50 -0700
Subject: [PATCH] disallow connecting to Hypixel to avoid being false banned

---
 README.md                        |  4 +++-
 src/plugins/EagProxyAAS/utils.ts | 24 +++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 61ff420..3b5098e 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ As of right now, there only exists one plugin: EagProxyAAS (read below for more
 
 ### EagProxyAAS
 
-EagProxyAAS aims to allow any Eaglercraft client to connect to a normal 1.8.9 Minecraft server (includes Hypixel), provided that players own a legitimate Minecraft Java copy.
+EagProxyAAS aims to allow any Eaglercraft client to connect to a normal 1.8.9 Minecraft server, provided that players own a legitimate Minecraft Java copy.
 
 _Demo server: `wss://eaglerproxy.q13x.com/` (not being hosted w/ Replit due to data transfer limits)_
 
@@ -38,6 +38,8 @@ Remove all the folders in `src/plugins`.
 
 **IMPORTANT:** Although the vanilla Eaglercraft client is a safe, modified copy of Minecraft AOT-compiled to JavaScript, I cannot guarantee that you **will not get flagged by all anticheats.** While gameplay and testing has shown to be relatively stable and free of anticheat flags, more testing is needed to derive a conclusion on whether or not using EaglerProxy with EagProxyAAS is safe.
 
+**ADVISORY FOR HYPIXEL PLAYERS:** This software falls under Hypixel's "disallowed modifications" category, as the proxy intercepts and changes how your client communicates to Hypixel's servers. **HYPIXEL WILL NOT UNBAN YOU IF YOU ARE FALSELY BANNED!** Modifying the plugin to remove this Hypixel check is not recommended. You are responsible for any action(s) that are taken against your Minecraft account!
+
 EaglerProxy and EagProxyAAS:
 
 - is compatible with EaglercraftX and uses its handshake system,
diff --git a/src/plugins/EagProxyAAS/utils.ts b/src/plugins/EagProxyAAS/utils.ts
index 585f2d6..2e530c3 100644
--- a/src/plugins/EagProxyAAS/utils.ts
+++ b/src/plugins/EagProxyAAS/utils.ts
@@ -277,6 +277,12 @@ export async function onConnect(client: ClientState) {
     );
     await new Promise((res) => setTimeout(res, 2000));
 
+    sendMessageWarning(
+      client.gameClient,
+      `ADVISORY FOR HYPIXEL PLAYERS: THIS PROXY FALLS UNDER HYPIXEL'S "DISALLOWED MODIFICATIONS" MOD CATEGORY. JOINING THE SERVER WILL RESULT IN AN IRREPEALABLE PUNISHMENT BEING APPLIED TO YOUR ACCOUNT. YOU HAVE BEEN WARNED - PLAY AT YOUR OWN RISK!`
+    );
+    await new Promise((res) => setTimeout(res, 2000));
+
     sendMessageWarning(
       client.gameClient,
       `WARNING: It is highly suggested that you turn down settings, as gameplay tends to be very laggy and unplayable on low powered devices.`
@@ -453,14 +459,26 @@ export async function onConnect(client: ClientState) {
           if (port != null && !config.allowCustomPorts) {
             sendCustomMessage(
               client.gameClient,
-              "You are not allowed to use custom server ports! /join <ip>",
+              "You are not allowed to use custom server ports! /join <ip>" +
+                (config.allowCustomPorts ? " [port]" : ""),
               "red"
             );
             host = null;
             port = null;
           } else {
-            port = port ?? 25565;
-            break;
+            if (
+              host.match(/^(?:\*\.)?((?!hypixel\.net$)[^.]+\.)*hypixel\.net$/)
+            ) {
+              sendCustomMessage(
+                client.gameClient,
+                "Disallowed server, refusing to connect! Hypixel has been known to falsely flag Eaglercraft clients, and thus we do not allow connecting to their server. /join <ip>" +
+                  (config.allowCustomPorts ? " [port]" : ""),
+                "red"
+              );
+            } else {
+              port = port ?? 25565;
+              break;
+            }
           }
         }
       }