Skip to content

Commit e2ea5b8

Browse files
committed
Use ProtocolLib if built-in serializer fail
1 parent fef2507 commit e2ea5b8

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/main/java/com/mengcraft/playersql/DataSerializer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.mengcraft.playersql;
22

33
import com.comphenix.protocol.utility.StreamSerializer;
4+
import com.google.common.base.Preconditions;
45
import com.mengcraft.playersql.internal.IPacketDataSerializer;
56
import io.netty.buffer.PooledByteBufAllocator;
67
import io.netty.buffer.Unpooled;
@@ -52,6 +53,9 @@ public static ItemStack deserialize(String input) {
5253
ItemStack output;
5354
try (IPacketDataSerializer serializer = PACKET_DATA_SERIALIZER_FACTORY.create(Unpooled.wrappedBuffer(Base64.getDecoder().decode(input)))) {
5455
output = serializer.readItemStack();
56+
} catch (io.netty.handler.codec.EncoderException e) {// upgrade from below 2.9?
57+
Preconditions.checkState(Bukkit.getPluginManager().isPluginEnabled("ProtocolLib"), "protocollib not found");
58+
output = StreamSerializer.getDefault().deserializeItemStack(input);
5559
}
5660
return output;
5761
}

0 commit comments

Comments
 (0)