From 30275d8895351798e04f27cad5e7ee8b01bad245 Mon Sep 17 00:00:00 2001
From: Adrian Bergqvist <adde0109@gmail.com>
Date: Wed, 4 Oct 2023 14:00:03 +0200
Subject: [PATCH] Fixed BungeeGuard support

---
 .../adde0109/ambassador/velocity/backend/FMLMarkerAdder.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java b/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java
index d9f9f0b..939cb68 100644
--- a/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java
+++ b/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java
@@ -29,8 +29,11 @@ public class FMLMarkerAdder extends MessageToMessageEncoder<Handshake> {
   protected void encode(ChannelHandlerContext ctx, Handshake msg, List<Object> out) {
     MinecraftConnection connection = (MinecraftConnection) ctx.pipeline().get(Connections.HANDLER);
     VelocityServerConnection serverConnection = (VelocityServerConnection) connection.getAssociation();
+    PlayerInfoForwarding forwardingMode = server.getConfiguration().getPlayerInfoForwardingMode();
 
-    if (serverConnection.getPlayer().getConnection().getType() instanceof ForgeFMLConnectionType FMLType && server.getConfiguration().getPlayerInfoForwardingMode() != PlayerInfoForwarding.LEGACY) {
+    if (serverConnection.getPlayer().getConnection().getType() instanceof ForgeFMLConnectionType FMLType
+            && forwardingMode != PlayerInfoForwarding.LEGACY
+            && forwardingMode != PlayerInfoForwarding.BUNGEEGUARD) {
       msg.setServerAddress(msg.getServerAddress() + (FMLType == ForgeConstants.ForgeFML3 ? ForgeConstants.FML3Marker : ForgeConstants.FML2Marker));
     }
     out.add(msg);