Fix traders in 1.13 and 1.13.1

JesseAye · Oct 23, 2018 · b3eca2d · b3eca2d
1 parent ef0a484
commit b3eca2d
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/protocolsupport/protocol/packet/middleimpl/clientbound/play/v_13/CustomPayload.java b/src/protocolsupport/protocol/packet/middleimpl/clientbound/play/v_13/CustomPayload.java
@@ -4,7 +4,10 @@
 import protocolsupport.protocol.packet.ClientBoundPacket;
 import protocolsupport.protocol.packet.middle.clientbound.play.MiddleCustomPayload;
 import protocolsupport.protocol.packet.middleimpl.ClientBoundPacketData;
+import protocolsupport.protocol.serializer.MerchantDataSerializer;
 import protocolsupport.protocol.serializer.StringSerializer;
+import protocolsupport.protocol.typeremapper.legacy.LegacyCustomPayloadChannelName;
+import protocolsupport.protocol.utils.ProtocolVersionsHelper;
 import protocolsupport.utils.recyclable.RecyclableCollection;
 import protocolsupport.utils.recyclable.RecyclableSingletonList;
 
@@ -18,7 +21,20 @@ public CustomPayload(ConnectionImpl connection) {
 	public RecyclableCollection<ClientBoundPacketData> toData() {
 		ClientBoundPacketData serializer = ClientBoundPacketData.create(ClientBoundPacket.PLAY_CUSTOM_PAYLOAD_ID);
 		StringSerializer.writeString(serializer, connection.getVersion(), tag);
-		serializer.writeBytes(data);
+		switch (tag) {
+			case (LegacyCustomPayloadChannelName.MODERN_TRADER_LIST): {
+				String locale = cache.getAttributesCache().getLocale();
+				MerchantDataSerializer.writeMerchantData(
+					serializer, connection.getVersion(), locale,
+					MerchantDataSerializer.readMerchantData(data, ProtocolVersionsHelper.LATEST_PC, locale)
+				);
+				break;
+			}
+			default: {
+				serializer.writeBytes(data);
+				break;
+			}
+		}
 		return RecyclableSingletonList.create(serializer);
 	}