Skip to content

Commit 46ac5dc

Browse files
KowagirlCodeCrafter47
authored andcommitted
fix(velocity): cancel modified packets
1 parent 36f94e7 commit 46ac5dc

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

velocity/src/main/java/codecrafter47/bungeetablistplus/protocol/PacketListener.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,29 +51,24 @@ protected void decode(ChannelHandlerContext ctx, MinecraftPacket packet, List<Ob
5151
if (packet != null) {
5252

5353
PacketListenerResult result = PacketListenerResult.PASS;
54-
boolean handled = false;
5554

5655
if (packet instanceof Team) {
5756
result = handler.onTeamPacket((Team) packet);
58-
if (result == PacketListenerResult.MODIFIED) {
59-
sendPacket(player, packet);
60-
}
6157
} else if (packet instanceof LegacyPlayerListItemPacket) {
6258
result = handler.onPlayerListPacket((LegacyPlayerListItemPacket) packet);
63-
handled = true;
6459
} else if (packet instanceof HeaderAndFooterPacket) {
6560
result = handler.onPlayerListHeaderFooterPacket((HeaderAndFooterPacket) packet);
66-
handled = true;
6761
} else if (packet instanceof UpsertPlayerInfoPacket) {
6862
result = handler.onPlayerListUpdatePacket((UpsertPlayerInfoPacket) packet);
69-
handled = true;
7063
} else if (packet instanceof RemovePlayerInfoPacket) {
7164
result = handler.onPlayerListRemovePacket((RemovePlayerInfoPacket) packet);
72-
handled = true;
7365
}
7466

75-
if (handled && result != PacketListenerResult.CANCEL) {
76-
sendPacket(player, packet);
67+
if (result != PacketListenerResult.PASS) {
68+
if (result == PacketListenerResult.MODIFIED) {
69+
sendPacket(player, packet);
70+
}
71+
return;
7772
}
7873
}
7974
}

0 commit comments

Comments
 (0)