Use readCharSequence instead of toString to inc reader index

My bad. Fixes #2525
EngineHub · May 21, 2024 · 910d5cc · 910d5cc
1 parent 6818272
commit 910d5cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/...dedit-fabric/src/main/java/com/sk89q/worldedit/fabric/net/handler/WECUIPacketHandler.java b/...dedit-fabric/src/main/java/com/sk89q/worldedit/fabric/net/handler/WECUIPacketHandler.java
@@ -25,6 +25,8 @@
 import com.sk89q.worldedit.fabric.FabricWorldEdit;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
 
@@ -46,20 +48,12 @@ public Type<? extends CustomPacketPayload> type() {
  }
 
  public static void init() {
- PayloadTypeRegistry.playC2S().register(
- CuiPacket.TYPE,
- CustomPacketPayload.codec(
- (packet, buffer) -> buffer.writeCharSequence(packet.text(), StandardCharsets.UTF_8),
- buffer -> new CuiPacket(buffer.toString(StandardCharsets.UTF_8))
- )
- );
- PayloadTypeRegistry.playS2C().register(
- CuiPacket.TYPE,
- CustomPacketPayload.codec(
- (packet, buffer) -> buffer.writeCharSequence(packet.text(), StandardCharsets.UTF_8),
- buffer -> new CuiPacket(buffer.toString(StandardCharsets.UTF_8))
- )
+ StreamCodec<RegistryFriendlyByteBuf, CuiPacket> codec = CustomPacketPayload.codec(
+ (packet, buffer) -> buffer.writeCharSequence(packet.text(), StandardCharsets.UTF_8),
+ buffer -> new CuiPacket(buffer.readCharSequence(buffer.readableBytes(), StandardCharsets.UTF_8).toString())
  );
+ PayloadTypeRegistry.playC2S().register(CuiPacket.TYPE, codec);
+ PayloadTypeRegistry.playS2C().register(CuiPacket.TYPE, codec);
  ServerPlayNetworking.registerGlobalReceiver(CuiPacket.TYPE, (payload, context) -> {
  LocalSession session = FabricWorldEdit.inst.getSession(context.player());
  FabricPlayer actor = FabricAdapter.adaptPlayer(context.player());

diff --git a/...t-neoforge/src/main/java/com/sk89q/worldedit/neoforge/net/handler/WECUIPacketHandler.java b/...t-neoforge/src/main/java/com/sk89q/worldedit/neoforge/net/handler/WECUIPacketHandler.java
@@ -55,7 +55,7 @@ public static void register(RegisterPayloadHandlersEvent event) {
  CuiPacket.TYPE,
  CustomPacketPayload.codec(
  (packet, buffer) -> buffer.writeCharSequence(packet.text(), StandardCharsets.UTF_8),
- buffer -> new CuiPacket(buffer.toString(StandardCharsets.UTF_8))
+ buffer -> new CuiPacket(buffer.readCharSequence(buffer.readableBytes(), StandardCharsets.UTF_8).toString())
  ),
  (payload, context) -> {
  if (!(context.player() instanceof ServerPlayer player)) {