Merge remote-tracking branch 'origin/develop-1.5.0' into develop-1.5.0-live-user-data-fix

# Conflicts:
#	Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java
This commit is contained in:
kohlerpop1
2024-02-29 20:38:53 -05:00
4 changed files with 48 additions and 15 deletions

View File

@@ -132,6 +132,7 @@ public class TikTokLiveClientBuilder implements LiveClientBuilder {
eventHandler);
return new TikTokLiveClient(
messageHandler,
giftsManager,
tiktokRoomInfo,
liveHttpClient,