FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-08 21:14:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions5

Fix custom packet inside of bundled packet not being processed ()

Browse source
This commit is contained in:
Technici4n 2023-03-15 10:20:48 +01:00 • committed by GitHub
parent 315602f6c2
commit ca5f59aa6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 15 deletions
fabric-networking-api-v1/src
client/java/net/fabricmc/fabric/impl/networking/client
ClientPlayNetworkAddon.java
main/java/net/fabricmc/fabric/impl/networking/server
ServerPlayNetworkAddon.java
testmod/java/net/fabricmc/fabric/test/networking/play
NetworkingPlayPacketTest.java

5
fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/impl/networking/client/ClientPlayNetworkAddon.java
View file

@ -84,11 +84,6 @@ public final class ClientPlayNetworkAddon extends AbstractChanneledNetworkAddon<
* @return true if the packet has been handled
*/
public boolean handle(CustomPayloadS2CPacket packet) {
// Do not handle the packet on game thread
if (this.client.isOnThread()) {
return false;
}
PacketByteBuf buf = packet.getData();
try {

5
fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerPlayNetworkAddon.java
View file

@ -76,11 +76,6 @@ public final class ServerPlayNetworkAddon extends AbstractChanneledNetworkAddon<
* @return true if the packet has been handled
*/
public boolean handle(CustomPayloadC2SPacket packet) {
// Do not handle the packet on game thread
if (this.server.isOnThread()) {
return false;
}
CustomPayloadC2SPacketAccessor access = (CustomPayloadC2SPacketAccessor) packet;
return this.handle(access.getChannel(), access.getData());
}

26
fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/play/NetworkingPlayPacketTest.java
View file

@ -20,11 +20,14 @@ import static com.mojang.brigadier.arguments.StringArgumentType.string;
import static net.minecraft.server.command.CommandManager.argument;
import static net.minecraft.server.command.CommandManager.literal;
import java.util.List;
import com.mojang.brigadier.Command;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.StringArgumentType;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.packet.s2c.play.BundleS2CPacket;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
@ -49,11 +52,24 @@ public final class NetworkingPlayPacketTest implements ModInitializer {
public static void registerCommand(CommandDispatcher<ServerCommandSource> dispatcher) {
NetworkingTestmods.LOGGER.info("Registering test command");
dispatcher.register(literal("networktestcommand").then(argument("stuff", string()).executes(ctx -> {
String stuff = StringArgumentType.getString(ctx, "stuff");
sendToTestChannel(ctx.getSource().getPlayer(), stuff);
return Command.SINGLE_SUCCESS;
})));
dispatcher.register(literal("networktestcommand")
.then(argument("stuff", string()).executes(ctx -> {
String stuff = StringArgumentType.getString(ctx, "stuff");
sendToTestChannel(ctx.getSource().getPlayer(), stuff);
return Command.SINGLE_SUCCESS;
}))
.then(literal("bundled").executes(ctx -> {
PacketByteBuf buf1 = PacketByteBufs.create();
buf1.writeText(Text.literal("bundled #1"));
PacketByteBuf buf2 = PacketByteBufs.create();
buf2.writeText(Text.literal("bundled #2"));
BundleS2CPacket packet = new BundleS2CPacket(List.of(
ServerPlayNetworking.createS2CPacket(TEST_CHANNEL, buf1),
ServerPlayNetworking.createS2CPacket(TEST_CHANNEL, buf2)));
ctx.getSource().getPlayer().networkHandler.sendPacket(packet);
return Command.SINGLE_SUCCESS;
})));
}
@Override