Skip to content
This repository was archived by the owner on Feb 19, 2019. It is now read-only.

Commit cbc8cb6

Browse files
committed
Fix bad injection type in MixinNettyPacketEncoder
1 parent 5bd3388 commit cbc8cb6

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/main/java/clientapi/event/defaults/game/network/PacketEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ public static final class Encode extends PacketEvent {
8787

8888
private final EnumConnectionState state;
8989

90-
public Encode(Packet<?> packet, EnumConnectionState state) {
90+
public Encode(Packet<?> packet) {
9191
super(packet);
92-
this.state = state;
92+
this.state = EnumConnectionState.getFromPacket(packet);
9393
}
9494

9595
public final EnumConnectionState getDirection() {

src/main/java/clientapi/load/mixin/MixinNettyPacketEncoder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.spongepowered.asm.mixin.Mixin;
2727
import org.spongepowered.asm.mixin.injection.At;
2828
import org.spongepowered.asm.mixin.injection.Inject;
29-
import org.spongepowered.asm.mixin.injection.ModifyArg;
29+
import org.spongepowered.asm.mixin.injection.ModifyVariable;
3030
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
3131

3232
/**
@@ -38,9 +38,9 @@ public class MixinNettyPacketEncoder {
3838

3939
private PacketEvent event;
4040

41-
@ModifyArg(method = "encode", at = @At(value = "INVOKE", target = "Lio/netty/util/Attribute;get()Ljava/lang/Object;", remap = false))
42-
private Packet<?> mutatePacket(ChannelHandlerContext ctx, Packet<?> msg, ByteBuf out, CallbackInfo ci, EnumConnectionState state) {
43-
event = new PacketEvent.Encode(msg, state);
41+
@ModifyVariable(method = "encode", at = @At("HEAD"), index = 1, remap = false)
42+
private Packet<?> mutatePacket(Packet<?> msg) {
43+
event = new PacketEvent.Encode(msg);
4444
ClientAPI.EVENT_BUS.post(event);
4545
return event.getPacket();
4646
}

0 commit comments

Comments
 (0)