Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 11:26:07 +00:00
Code Issues Projects Releases Wiki Activity

Check active team size, rather than using a 4 constant

Browse Source
This commit is contained in:
KingRainbow44 2023-04-29 02:10:14 -04:00
parent 5fcfea2b11
commit df1b65b8a8
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/emu/grasscutter/game/player/TeamManager.java
View File

@ -513,6 +513,8 @@ public final class TeamManager extends BasePlayerDataManager {
* @param trialAvatarIds The avatar IDs to remove. * @param trialAvatarIds The avatar IDs to remove.
*/ */
public void removeTrialAvatarTeam(List<Integer> trialAvatarIds) { public void removeTrialAvatarTeam(List<Integer> trialAvatarIds) {
var isTeam = trialAvatarIds.size() == this.getActiveTeam().size();
var player = this.getPlayer(); var player = this.getPlayer();
var scene = player.getScene(); var scene = player.getScene();
@ -524,7 +526,7 @@ public final class TeamManager extends BasePlayerDataManager {
this.getActiveTeam().forEach(avatarEntity -> scene this.getActiveTeam().forEach(avatarEntity -> scene
.removeEntity(avatarEntity, VisionTypeOuterClass.VisionType.VISION_TYPE_REMOVE)); .removeEntity(avatarEntity, VisionTypeOuterClass.VisionType.VISION_TYPE_REMOVE));
if (trialAvatarIds.size() == 4) { if (isTeam) {
this.getActiveTeam().clear(); this.getActiveTeam().clear();
this.getTrialAvatars().clear(); this.getTrialAvatars().clear();
} else { } else {
@ -536,7 +538,7 @@ public final class TeamManager extends BasePlayerDataManager {
} }
// Re-add the avatars to the team. // Re-add the avatars to the team.
if (trialAvatarIds.size() == 4) { if (isTeam) {
// Restores all avatars from the player's avatar storage. // Restores all avatars from the player's avatar storage.
this.getCurrentTeamInfo().getAvatars().forEach(avatarId -> this.getCurrentTeamInfo().getAvatars().forEach(avatarId ->
this.getActiveTeam().add(new EntityAvatar( this.getActiveTeam().add(new EntityAvatar(