From 70e43c515f5e44cec1fb46decde59f6668f1859b Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 30 Nov 2023 17:58:16 -0600 Subject: [PATCH] fix? --- src/main/java/one/oth3r/sit/PacketBuilder.java | 7 +++---- src/main/java/one/oth3r/sit/Sit.java | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/one/oth3r/sit/PacketBuilder.java b/src/main/java/one/oth3r/sit/PacketBuilder.java index ac4bb96..538609d 100644 --- a/src/main/java/one/oth3r/sit/PacketBuilder.java +++ b/src/main/java/one/oth3r/sit/PacketBuilder.java @@ -1,6 +1,5 @@ package one.oth3r.sit; -import io.netty.buffer.ByteBuf; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.minecraft.network.PacketByteBuf; @@ -13,10 +12,10 @@ public class PacketBuilder { public static final String SETTINGS = "settings_v1.0"; private final String message; private PacketByteBuf packetByteBuf = PacketByteBufs.create(); - public PacketBuilder(ByteBuf buf) { + public PacketBuilder(PacketByteBuf buf) { // Read any data sent in the packet - packetByteBuf.writeBytes(buf); - message = packetByteBuf.toString(StandardCharsets.UTF_8); + message = buf.toString(StandardCharsets.UTF_8); + packetByteBuf = buf; } public PacketBuilder(String message) { this.message = message; diff --git a/src/main/java/one/oth3r/sit/Sit.java b/src/main/java/one/oth3r/sit/Sit.java index cf985eb..d621a73 100644 --- a/src/main/java/one/oth3r/sit/Sit.java +++ b/src/main/java/one/oth3r/sit/Sit.java @@ -41,9 +41,8 @@ public class Sit implements ModInitializer { //PACKETS ServerPlayNetworking.registerGlobalReceiver(PacketBuilder.getIdentifier(), (server, player, handler, buf, responseSender) -> { - ByteBuf byteBuf = buf.copy(); + PacketBuilder packet = new PacketBuilder(buf); server.execute(() -> { - PacketBuilder packet = new PacketBuilder(byteBuf); Type hashMapToken = new TypeToken>() {}.getType(); Gson gson = new GsonBuilder().disableHtmlEscaping().create(); playerSettings.put(player,gson.fromJson(packet.getMessage(),hashMapToken));