From 8cc6df6fc2e73ddfdb257f8435cb1b760eec09bd Mon Sep 17 00:00:00 2001 From: AlexDev_ Date: Fri, 19 Jan 2024 12:33:24 +0100 Subject: [PATCH] Updated packet class --- build.gradle | 1 - .../velocitab/packet/PacketEventManager.java | 4 ++-- .../velocitab/packet/PlayerChannelHandler.java | 11 ++++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index c55fc06..7f02265 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,6 @@ repositories { maven { url = 'https://repo.william278.net/velocity/' } maven { url = 'https://jitpack.io/' } maven { url = 'https://repo.minebench.de/' } - maven { url = 'https://maven.elytrium.net/repo/' } maven { url = 'https://mvn.exceptionflug.de/repository/exceptionflug-public/' } } diff --git a/src/main/java/net/william278/velocitab/packet/PacketEventManager.java b/src/main/java/net/william278/velocitab/packet/PacketEventManager.java index 4616214..3856cfa 100644 --- a/src/main/java/net/william278/velocitab/packet/PacketEventManager.java +++ b/src/main/java/net/william278/velocitab/packet/PacketEventManager.java @@ -27,7 +27,7 @@ import com.velocitypowered.api.event.connection.PostLoginEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.proxy.connection.client.ConnectedPlayer; import com.velocitypowered.proxy.network.Connections; -import com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfo; +import com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfoPacket; import com.velocitypowered.proxy.protocol.packet.chat.ComponentHolder; import io.netty.channel.Channel; import lombok.Getter; @@ -92,7 +92,7 @@ public class PacketEventManager { } } - protected void handleEntry(@NotNull UpsertPlayerInfo packet, @NotNull Player player) { + protected void handleEntry(@NotNull UpsertPlayerInfoPacket packet, @NotNull Player player) { final List toUpdate = packet.getEntries().stream() .filter(entry -> entry.getProfile() != null) .filter(entry -> !entry.getProfile().getName().startsWith(CITIZENS_PREFIX)) diff --git a/src/main/java/net/william278/velocitab/packet/PlayerChannelHandler.java b/src/main/java/net/william278/velocitab/packet/PlayerChannelHandler.java index e42ee38..a542377 100644 --- a/src/main/java/net/william278/velocitab/packet/PlayerChannelHandler.java +++ b/src/main/java/net/william278/velocitab/packet/PlayerChannelHandler.java @@ -20,7 +20,7 @@ package net.william278.velocitab.packet; import com.velocitypowered.api.proxy.Player; -import com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfo; +import com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfoPacket; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; @@ -30,6 +30,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; + @RequiredArgsConstructor public class PlayerChannelHandler extends ChannelDuplexHandler { @@ -38,17 +39,17 @@ public class PlayerChannelHandler extends ChannelDuplexHandler { @Override public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { - if (!(msg instanceof final UpsertPlayerInfo minecraftPacket)) { + if (!(msg instanceof final UpsertPlayerInfoPacket minecraftPacket)) { super.write(ctx, msg, promise); return; } - if (plugin.getSettings().isRemoveSpectatorEffect() && minecraftPacket.containsAction(UpsertPlayerInfo.Action.UPDATE_GAME_MODE)) { + if (plugin.getSettings().isRemoveSpectatorEffect() && minecraftPacket.containsAction(UpsertPlayerInfoPacket.Action.UPDATE_GAME_MODE)) { forceGameMode(minecraftPacket.getEntries()); } - if (!minecraftPacket.containsAction(UpsertPlayerInfo.Action.ADD_PLAYER) && !minecraftPacket.containsAction(UpsertPlayerInfo.Action.UPDATE_LISTED)) { + if (!minecraftPacket.containsAction(UpsertPlayerInfoPacket.Action.ADD_PLAYER) && !minecraftPacket.containsAction(UpsertPlayerInfoPacket.Action.UPDATE_LISTED)) { super.write(ctx, msg, promise); return; } @@ -62,7 +63,7 @@ public class PlayerChannelHandler extends ChannelDuplexHandler { super.write(ctx, msg, promise); } - private void forceGameMode(@NotNull List entries) { + private void forceGameMode(@NotNull List entries) { entries.stream() .filter(entry -> entry.getProfileId() != null && entry.getGameMode() == 3 && !entry.getProfileId().equals(player.getUniqueId())) .forEach(entry -> entry.setGameMode(0));