GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

Remove Geyser -> Bungee Floodgate data after use

Browse Source
This commit is contained in:
Tim203
2021-09-24 20:26:09 +02:00
parent cc3e5f999f
commit 95a51480f0
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java
View File

@@ -121,6 +121,8 @@ public class BungeeProxyDataHandler extends ChannelInboundHandlerAdapter {
channelWrapper.setRemoteAddress(newIp); channelWrapper.setRemoteAddress(newIp);
} }
packet.setHost(handshakeData.getHostname());
if (handshakeData.getDisconnectReason() != null) { if (handshakeData.getDisconnectReason() != null) {
ctx.channel().attr(kickMessageAttribute).set(handshakeData.getDisconnectReason()); ctx.channel().attr(kickMessageAttribute).set(handshakeData.getDisconnectReason());
return; return;

3
bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeServerDataHandler.java
View File

@@ -67,8 +67,7 @@ public class BungeeServerDataHandler extends ChannelOutboundHandlerAdapter {
private final AttributeKey<FloodgatePlayer> playerAttribute; private final AttributeKey<FloodgatePlayer> playerAttribute;
@Override @Override
public void write(ChannelHandlerContext ctx, Object packet, ChannelPromise promise) public void write(ChannelHandlerContext ctx, Object packet, ChannelPromise promise) {
throws Exception {
if (packet instanceof Handshake) { if (packet instanceof Handshake) {
// get the Proxy <-> Player channel from the Proxy <-> Server channel // get the Proxy <-> Player channel from the Proxy <-> Server channel
HandlerBoss handlerBoss = ctx.pipeline().get(HandlerBoss.class); HandlerBoss handlerBoss = ctx.pipeline().get(HandlerBoss.class);

4
velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java
View File

@@ -119,6 +119,8 @@ public final class VelocityProxyDataHandler extends ChannelInboundHandlerAdapter
setValue(connection, REMOTE_ADDRESS, newIp); setValue(connection, REMOTE_ADDRESS, newIp);
} }
setValue(packet, HANDSHAKE_SERVER_ADDRESS, handshakeData.getHostname());
if (handshakeData.getDisconnectReason() != null) { if (handshakeData.getDisconnectReason() != null) {
ctx.channel().attr(kickMessageAttribute).set(handshakeData.getDisconnectReason()); ctx.channel().attr(kickMessageAttribute).set(handshakeData.getDisconnectReason());
return; return;
@@ -149,8 +151,6 @@ public final class VelocityProxyDataHandler extends ChannelInboundHandlerAdapter
FloodgatePlayer player = result.getFloodgatePlayer(); FloodgatePlayer player = result.getFloodgatePlayer();
setValue(packet, HANDSHAKE_SERVER_ADDRESS, handshakeData.getHostname());
logger.info("Floodgate player who is logged in as {} {} joined", logger.info("Floodgate player who is logged in as {} {} joined",
player.getCorrectUsername(), player.getCorrectUniqueId()); player.getCorrectUsername(), player.getCorrectUniqueId());
}).handle((v, error) -> { }).handle((v, error) -> {