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

Fix: Reading of custom payloads (#128)

Browse Source
This commit is contained in:
chris
2024-07-23 20:05:28 +02:00
committed by GitHub
parent b219b96819
commit 5c760a5c1e
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/geysermc/floodgate/pluginmessage/payloads/FormPayload.java
View File

@@ -1,5 +1,6 @@
package org.geysermc.floodgate.pluginmessage.payloads;
import io.netty.buffer.ByteBufUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -11,15 +12,16 @@ public record FormPayload(byte[] data) implements CustomPacketPayload {
public static final CustomPacketPayload.Type<FormPayload> TYPE = new Type<>(ResourceLocation.parse("floodgate:form"));
private FormPayload(FriendlyByteBuf friendlyByteBuf) {
this(friendlyByteBuf.readByteArray());
this(ByteBufUtil.getBytes(friendlyByteBuf));
friendlyByteBuf.readerIndex(friendlyByteBuf.readerIndex() + this.data.length);
}
private void write(FriendlyByteBuf friendlyByteBuf) {
friendlyByteBuf.writeByteArray(this.data);
friendlyByteBuf.writeBytes(this.data);
}
@Override
public CustomPacketPayload.@NonNull Type<FormPayload> type() {
return TYPE;
}
}
}

8
src/main/java/org/geysermc/floodgate/pluginmessage/payloads/PacketPayload.java
View File

@@ -1,5 +1,6 @@
package org.geysermc.floodgate.pluginmessage.payloads;
import io.netty.buffer.ByteBufUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -11,15 +12,16 @@ public record PacketPayload(byte[] data) implements CustomPacketPayload {
public static final CustomPacketPayload.Type<PacketPayload> TYPE = new Type<>(ResourceLocation.parse("floodgate:packet"));
private PacketPayload(FriendlyByteBuf friendlyByteBuf) {
this(friendlyByteBuf.readByteArray());
this(ByteBufUtil.getBytes(friendlyByteBuf));
friendlyByteBuf.readerIndex(friendlyByteBuf.readerIndex() + this.data.length);
}
private void write(FriendlyByteBuf friendlyByteBuf) {
friendlyByteBuf.writeByteArray(this.data);
friendlyByteBuf.writeBytes(this.data);
}
@Override
public CustomPacketPayload.@NonNull Type<PacketPayload> type() {
return TYPE;
}
}
}

8
src/main/java/org/geysermc/floodgate/pluginmessage/payloads/SkinPayload.java
View File

@@ -1,5 +1,6 @@
package org.geysermc.floodgate.pluginmessage.payloads;
import io.netty.buffer.ByteBufUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -11,15 +12,16 @@ public record SkinPayload(byte[] data) implements CustomPacketPayload {
public static final CustomPacketPayload.Type<SkinPayload> TYPE = new Type<>(ResourceLocation.parse("floodgate:skin"));
private SkinPayload(FriendlyByteBuf friendlyByteBuf) {
this(friendlyByteBuf.readByteArray());
this(ByteBufUtil.getBytes(friendlyByteBuf));
friendlyByteBuf.readerIndex(friendlyByteBuf.readerIndex() + this.data.length);
}
private void write(FriendlyByteBuf friendlyByteBuf) {
friendlyByteBuf.writeByteArray(this.data);
friendlyByteBuf.writeBytes(this.data);
}
@Override
public CustomPacketPayload.@NonNull Type<SkinPayload> type() {
return TYPE;
}
}
}

8
src/main/java/org/geysermc/floodgate/pluginmessage/payloads/TransferPayload.java
View File

@@ -1,5 +1,6 @@
package org.geysermc.floodgate.pluginmessage.payloads;
import io.netty.buffer.ByteBufUtil;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -11,15 +12,16 @@ public record TransferPayload(byte[] data) implements CustomPacketPayload {
public static final CustomPacketPayload.Type<TransferPayload> TYPE = new Type<>(ResourceLocation.parse("floodgate:transfer"));
private TransferPayload(FriendlyByteBuf friendlyByteBuf) {
this(friendlyByteBuf.readByteArray());
this(ByteBufUtil.getBytes(friendlyByteBuf));
friendlyByteBuf.readerIndex(friendlyByteBuf.readerIndex() + this.data.length);
}
private void write(FriendlyByteBuf friendlyByteBuf) {
friendlyByteBuf.writeByteArray(this.data);
friendlyByteBuf.writeBytes(this.data);
}
@Override
public CustomPacketPayload.@NonNull Type<TransferPayload> type() {
return TYPE;
}
}
}