use bytebufhelper instead

xGinko · Dec 20, 2024 · e8399a9 · e8399a9
1 parent d021f2c
commit e8399a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/BigMessages.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/BigMessages.java
@@ -4,7 +4,6 @@
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 
 import java.nio.charset.StandardCharsets;
 
@@ -36,23 +35,23 @@ public void onPacketReceive(PacketReceiveEvent event) {
                 || event.getPacketType() == PacketType.Play.Client.CHAT_COMMAND
                 || event.getPacketType() == PacketType.Play.Client.CHAT_COMMAND_UNSIGNED
         ) {
-            if (isStringTooBig(new PacketWrapper<>(event))) {
+            if (isStringTooBig(event)) {
                 event.setCancelled(true);
                 onCancel(log, kick, event.getUser());
             }
         }
     }
 
-    private boolean isStringTooBig(PacketWrapper<?> packetWrapper) {
-        int strBufLen = packetWrapper.readVarInt();
+    private boolean isStringTooBig(PacketReceiveEvent event) {
+        int strBufLen = ByteBufHelper.readVarInt(event.getByteBuf());
 
         // Check if the received encoded string buffer length is zero or longer than maximum allowed
         if (strBufLen < 0 || strBufLen > charLimit * 4) {
             return true;
         }
 
         // The received string length is longer than maximum allowed
-        return ByteBufHelper.toString(packetWrapper.buffer, ByteBufHelper.readerIndex(packetWrapper.buffer), strBufLen, StandardCharsets.UTF_8)
+        return ByteBufHelper.toString(event.getByteBuf(), ByteBufHelper.readerIndex(event.getByteBuf()), strBufLen, StandardCharsets.UTF_8)
                 .length() > charLimit;
     }
 }
diff --git a/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/BigMessages.java b/AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/BigMessages.java
@@ -4,7 +4,6 @@
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
-import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 
 import java.nio.charset.StandardCharsets;
 
@@ -36,23 +35,23 @@ public void onPacketReceive(PacketReceiveEvent event) {
                 || event.getPacketType() == PacketType.Play.Client.CHAT_COMMAND
                 || event.getPacketType() == PacketType.Play.Client.CHAT_COMMAND_UNSIGNED
         ) {
-            if (isStringTooBig(new PacketWrapper<>(event))) {
+            if (isStringTooBig(event)) {
                 event.setCancelled(true);
                 onCancel(log, kick, event.getUser());
             }
         }
     }
 
-    private boolean isStringTooBig(PacketWrapper<?> packetWrapper) {
-        int strBufLen = packetWrapper.readVarInt();
+    private boolean isStringTooBig(PacketReceiveEvent event) {
+        int strBufLen = ByteBufHelper.readVarInt(event.getByteBuf());
 
         // Check if the received encoded string buffer length is zero or longer than maximum allowed
         if (strBufLen < 0 || strBufLen > charLimit * 4) {
             return true;
         }
 
         // The received string length is longer than maximum allowed
-        return ByteBufHelper.toString(packetWrapper.buffer, ByteBufHelper.readerIndex(packetWrapper.buffer), strBufLen, StandardCharsets.UTF_8)
+        return ByteBufHelper.toString(event.getByteBuf(), ByteBufHelper.readerIndex(event.getByteBuf()), strBufLen, StandardCharsets.UTF_8)
                 .length() > charLimit;
     }
 }