From 3b6a10f11d8754eb3e13c654a985a47481e8d242 Mon Sep 17 00:00:00 2001
From: Adrian Bergqvist <adde0109@gmail.com>
Date: Tue, 29 Nov 2022 17:20:25 +0100
Subject: [PATCH] Small bug fix

---
 build.gradle                                         |  2 +-
 .../java/org/adde0109/ambassador/Ambassador.java     |  2 +-
 .../backend/ForgeHandshakeSessionHandler.java        | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index b762dfd..27540ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'org.adde0109'
-version '1.1.5-alpha'
+version '1.1.5B-alpha'
 
 repositories {
     maven {
diff --git a/src/main/java/org/adde0109/ambassador/Ambassador.java b/src/main/java/org/adde0109/ambassador/Ambassador.java
index d5e98d2..8ef417b 100644
--- a/src/main/java/org/adde0109/ambassador/Ambassador.java
+++ b/src/main/java/org/adde0109/ambassador/Ambassador.java
@@ -25,7 +25,7 @@ import org.slf4j.Logger;
 
 import java.nio.file.Path;
 
-@Plugin(id = "ambassador", name = "Ambassador", version = "1.1.5-alpha", authors = {"adde0109"})
+@Plugin(id = "ambassador", name = "Ambassador", version = "1.1.5B-alpha", authors = {"adde0109"})
 public class Ambassador {
 
   public ProxyServer server;
diff --git a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeHandshakeSessionHandler.java b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeHandshakeSessionHandler.java
index 8009ea4..5692f26 100644
--- a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeHandshakeSessionHandler.java
+++ b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeHandshakeSessionHandler.java
@@ -4,6 +4,7 @@ import com.velocitypowered.proxy.VelocityServer;
 import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
 import com.velocitypowered.proxy.connection.backend.LoginSessionHandler;
 import com.velocitypowered.proxy.connection.backend.VelocityServerConnection;
+import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.packet.Disconnect;
 import com.velocitypowered.proxy.protocol.packet.LoginPluginMessage;
 import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccess;
@@ -33,7 +34,7 @@ public class ForgeHandshakeSessionHandler implements MinecraftSessionHandler {
       if (!(serverConnection.getConnection().getType() instanceof ForgeFMLConnectionType)) {
         if (!(serverConnection.getPlayer().getConnection().getType() instanceof ForgeFMLConnectionType clientType)) {
           final String reason = "This server has mods that require Forge to be installed on the client. Contact your server admin for more details.";
-          original.handle(new Disconnect(reason));
+          original.handle(Disconnect.create(Component.text(reason, NamedTextColor.RED),serverConnection.getPlayer().getProtocolVersion()));
           return true;
         }
         serverConnection.getConnection().setType(clientType);
@@ -53,16 +54,17 @@ public class ForgeHandshakeSessionHandler implements MinecraftSessionHandler {
     return original.handle(packet);
   }
 
-  @Override
-  public void handleUnknown(ByteBuf buf) {
-    original.handleUnknown(buf);
-  }
 
   @Override
   public void disconnected() {
     original.disconnected();
   }
 
+  public void handleGeneric(MinecraftPacket packet) {
+    if (!packet.handle(original))
+      original.handleGeneric(packet);
+  }
+
   public MinecraftSessionHandler getOriginal() {
     return this.original;
   }