Skip to content

Commit a1fcee8

Browse files
Fix backport
1 parent e9c5e8e commit a1fcee8

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/main/java/xyz/eclipseisoffline/capecommand/mixin/ServerCommonNetworkHandlerMixin.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.util.List;
1212

1313
import io.netty.channel.ChannelFutureListener;
14+
import net.minecraft.network.PacketCallbacks;
1415
import net.minecraft.network.listener.ServerCommonPacketListener;
1516
import net.minecraft.network.packet.Packet;
1617
import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
@@ -29,8 +30,8 @@
2930
@Mixin(ServerCommonNetworkHandler.class)
3031
public abstract class ServerCommonNetworkHandlerMixin implements ServerCommonPacketListener {
3132

32-
@WrapOperation(method = "sendPacket", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerCommonNetworkHandler;send(Lnet/minecraft/network/packet/Packet;Lio/netty/channel/ChannelFutureListener;)V"))
33-
public void modifyPlayerListPacket(ServerCommonNetworkHandler instance, Packet<?> packet, @Nullable ChannelFutureListener channelFutureListener, Operation<Void> original) {
33+
@WrapOperation(method = "sendPacket", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerCommonNetworkHandler;send(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketCallbacks;)V"))
34+
public void modifyPlayerListPacket(ServerCommonNetworkHandler instance, Packet<?> packet, PacketCallbacks callbacks, Operation<Void> original) {
3435
if (instance instanceof ServerPlayNetworkHandler playNetworkHandler
3536
&& packet instanceof PlayerListS2CPacket playerListS2CPacket) {
3637
ServerPlayerEntity player = playNetworkHandler.player;
@@ -53,7 +54,7 @@ public void modifyPlayerListPacket(ServerCommonNetworkHandler instance, Packet<?
5354
((PlayerListS2CPacketEntriesUpdater) playerListS2CPacket).capeCommand$setEntries(entries);
5455
}
5556
}
56-
original.call(instance, packet, channelFutureListener);
57+
original.call(instance, packet, callbacks);
5758
}
5859

5960
@Unique

0 commit comments

Comments
 (0)