f00727c57e
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: MiniDigger | Martin <admin@minidigger.dev> Co-authored-by: Nassim Jahnke <nassim@njahnke.dev> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com> Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
--- a/net/minecraft/network/codec/ByteBufCodecs.java
|
|
+++ b/net/minecraft/network/codec/ByteBufCodecs.java
|
|
@@ -389,6 +_,48 @@
|
|
};
|
|
}
|
|
|
|
+ // Paper start - Track codec depth
|
|
+ static <B extends FriendlyByteBuf, V> StreamCodec<B, V> trackDepth(final StreamCodec<B, V> codec) {
|
|
+ return new StreamCodec<>() {
|
|
+ @Override
|
|
+ public V decode(B buffer) {
|
|
+ buffer.trackCodecDepth = true;
|
|
+ try {
|
|
+ return codec.decode(buffer);
|
|
+ } finally {
|
|
+ buffer.trackCodecDepth = false;
|
|
+ buffer.codecDepth = 0;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void encode(B buffer, V value) {
|
|
+ codec.encode(buffer, value);
|
|
+ }
|
|
+ };
|
|
+ }
|
|
+
|
|
+ static <B extends FriendlyByteBuf, V> StreamCodec<B, V> increaseDepth(final StreamCodec<B, V> codec) {
|
|
+ return new StreamCodec<>() {
|
|
+ @Override
|
|
+ public V decode(B buffer) {
|
|
+ if (!buffer.trackCodecDepth) {
|
|
+ return codec.decode(buffer);
|
|
+ }
|
|
+ if (++buffer.codecDepth > 64) {
|
|
+ throw new DecoderException("Too deep");
|
|
+ }
|
|
+ return codec.decode(buffer);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void encode(B buffer, V value) {
|
|
+ codec.encode(buffer, value);
|
|
+ }
|
|
+ };
|
|
+ }
|
|
+ // Paper end - Track codec depth
|
|
+
|
|
static <B extends ByteBuf, V> StreamCodec<B, Optional<V>> optional(final StreamCodec<B, V> codec) {
|
|
return new StreamCodec<B, Optional<V>>() {
|
|
@Override
|