mirror of
https://github.com/jwdeveloper/TikTokLiveJava.git
synced 2026-02-27 08:49:40 -05:00
Make TikTokLinkMicBattleEvent.is1v1 and is2v2 dynamic based upon team instance
Moved Team1v1 and Team2v2 totalPoints to Team for universal access
This commit is contained in:
@@ -43,8 +43,6 @@ public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
|
||||
true if battle is finished otherwise false
|
||||
*/
|
||||
private final boolean finished;
|
||||
@Getter(AccessLevel.NONE)
|
||||
private final boolean oneVsOne;
|
||||
private final List<Team> teams;
|
||||
|
||||
public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
|
||||
@@ -55,7 +53,6 @@ public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
|
||||
if (msg.getHostTeamCount() == 2) { // 1v1 battle
|
||||
teams.add(new Team1v1(msg.getHostTeam(0), msg));
|
||||
teams.add(new Team1v1(msg.getHostTeam(1), msg));
|
||||
oneVsOne = true;
|
||||
} else { // 2v2 battle
|
||||
if (isFinished()) {
|
||||
teams.add(new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 1).findFirst().orElse(null), msg));
|
||||
@@ -64,7 +61,6 @@ public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
|
||||
teams.add(new Team2v2(msg.getHostTeam(0), msg.getHostTeam(1), msg));
|
||||
teams.add(new Team2v2(msg.getHostTeam(2), msg.getHostTeam(3), msg));
|
||||
}
|
||||
oneVsOne = false;
|
||||
}
|
||||
|
||||
// Info:
|
||||
@@ -74,10 +70,14 @@ public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
|
||||
}
|
||||
|
||||
public boolean is1v1() {
|
||||
return oneVsOne;
|
||||
return teams.get(0) instanceof Team1v1;
|
||||
}
|
||||
|
||||
public boolean is2v2() {
|
||||
return !oneVsOne;
|
||||
return teams.get(0) instanceof Team2v2;
|
||||
}
|
||||
|
||||
public boolean isTie() {
|
||||
return isFinished() && teams.get(0).getTotalPoints() == teams.get(1).getTotalPoints();
|
||||
}
|
||||
}
|
||||
@@ -22,7 +22,12 @@
|
||||
*/
|
||||
package io.github.jwdeveloper.tiktok.data.models.battles;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
public abstract class Team {
|
||||
/** Value >= 0 when finished otherwise -1 */
|
||||
@Getter protected int totalPoints;
|
||||
|
||||
/**
|
||||
* Provides a check for verifying if this team represents a 1v1 Team.
|
||||
* @return true if this team is of type {@link Team1v1}, false otherwise.
|
||||
|
||||
@@ -29,10 +29,7 @@ import lombok.Getter;
|
||||
import java.util.*;
|
||||
|
||||
@Getter
|
||||
public class Team1v1 extends Team
|
||||
{
|
||||
/** Value >= 0 when finished otherwise -1 */
|
||||
private final int totalPoints;
|
||||
public class Team1v1 extends Team {
|
||||
private final int winStreak;
|
||||
private final User host;
|
||||
private final List<Viewer> viewers;
|
||||
|
||||
@@ -30,9 +30,6 @@ import java.util.*;
|
||||
|
||||
@Getter
|
||||
public class Team2v2 extends Team {
|
||||
/** Value >= 0 when finished otherwise -1 */
|
||||
private final int totalPoints;
|
||||
|
||||
private final List<User> hosts;
|
||||
private final List<Viewer> viewers;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user