From 95a51480f0ab1dcafb79796e383dac13b9592d91 Mon Sep 17 00:00:00 2001 From: Tim203 Date: Fri, 24 Sep 2021 20:26:09 +0200 Subject: [PATCH] Remove Geyser -> Bungee Floodgate data after use --- .../geysermc/floodgate/addon/data/BungeeProxyDataHandler.java | 2 ++ .../floodgate/addon/data/BungeeServerDataHandler.java | 3 +-- .../floodgate/addon/data/VelocityProxyDataHandler.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java index f81500cd..65472c5a 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java +++ b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java @@ -121,6 +121,8 @@ public class BungeeProxyDataHandler extends ChannelInboundHandlerAdapter { channelWrapper.setRemoteAddress(newIp); } + packet.setHost(handshakeData.getHostname()); + if (handshakeData.getDisconnectReason() != null) { ctx.channel().attr(kickMessageAttribute).set(handshakeData.getDisconnectReason()); return; diff --git a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeServerDataHandler.java b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeServerDataHandler.java index 83ebb1ee..c178dc84 100644 --- a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeServerDataHandler.java +++ b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeServerDataHandler.java @@ -67,8 +67,7 @@ public class BungeeServerDataHandler extends ChannelOutboundHandlerAdapter { private final AttributeKey playerAttribute; @Override - public void write(ChannelHandlerContext ctx, Object packet, ChannelPromise promise) - throws Exception { + public void write(ChannelHandlerContext ctx, Object packet, ChannelPromise promise) { if (packet instanceof Handshake) { // get the Proxy <-> Player channel from the Proxy <-> Server channel HandlerBoss handlerBoss = ctx.pipeline().get(HandlerBoss.class); diff --git a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java index d48b827e..1b34eea7 100644 --- a/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java +++ b/velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java @@ -119,6 +119,8 @@ public final class VelocityProxyDataHandler extends ChannelInboundHandlerAdapter setValue(connection, REMOTE_ADDRESS, newIp); } + setValue(packet, HANDSHAKE_SERVER_ADDRESS, handshakeData.getHostname()); + if (handshakeData.getDisconnectReason() != null) { ctx.channel().attr(kickMessageAttribute).set(handshakeData.getDisconnectReason()); return; @@ -149,8 +151,6 @@ public final class VelocityProxyDataHandler extends ChannelInboundHandlerAdapter FloodgatePlayer player = result.getFloodgatePlayer(); - setValue(packet, HANDSHAKE_SERVER_ADDRESS, handshakeData.getHostname()); - logger.info("Floodgate player who is logged in as {} {} joined", player.getCorrectUsername(), player.getCorrectUniqueId()); }).handle((v, error) -> {