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

Fix some behavior of trial avatars

Browse Source 
investigation is required on the exceptions thrown
This commit is contained in:
KingRainbow44 2023-04-29 02:01:00 -04:00
parent d5f75e1889
commit 391903ac0e
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
3 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -514,36 +514,49 @@ public final class TeamManager extends BasePlayerDataManager {
*/
public void removeTrialAvatarTeam(List<Integer> trialAvatarIds) {
var player = this.getPlayer();
var scene = player.getScene();
// Disable the trial team.
this.usingTrialTeam = false;
this.trialAvatarTeam = new TeamInfo();
// Remove the avatars from the team.
trialAvatarIds.forEach(
this.getActiveTeam().forEach(avatarEntity -> scene
.removeEntity(avatarEntity, VisionTypeOuterClass.VisionType.VISION_TYPE_REMOVE));
if (trialAvatarIds.size() == 4) {
this.getActiveTeam().clear();
this.getTrialAvatars().clear();
} else {
trialAvatarIds.forEach(
trialAvatarId -> {
this.getActiveTeam()
.forEach(
x ->
player
.getScene()
.removeEntity(x, VisionTypeOuterClass.VisionType.VISION_TYPE_REMOVE));
this.getActiveTeam().removeIf(x -> x.getAvatar().getTrialAvatarId() == trialAvatarId);
this.getTrialAvatars().values().removeIf(x -> x.getTrialAvatarId() == trialAvatarId);
});
}
// Re-add the avatars to the team.
var index = 0;
for (var avatar : this.getCurrentTeamInfo().getAvatars()) {
if (this.getActiveTeam().stream()
if (trialAvatarIds.size() == 4) {
// Restores all avatars from the player's avatar storage.
this.getCurrentTeamInfo().getAvatars().forEach(avatarId ->
this.getActiveTeam().add(new EntityAvatar(
scene, player.getAvatars().getAvatarById(avatarId)
)));
} else {
var index = 0;
// Restores all avatars from the player's avatar storage.
// If the avatar is already in the team, it will not be added.
for (var avatar : this.getCurrentTeamInfo().getAvatars()) {
if (this.getActiveTeam().stream()
.map(entity -> entity.getAvatar().getAvatarId())
.toList()
.contains(avatar)) return;
.contains(avatar)) continue;
this.getActiveTeam()
this.getActiveTeam()
.add(
index++,
new EntityAvatar(player.getScene(), player.getAvatars().getAvatarById(avatar)));
index++,
new EntityAvatar(scene, player.getAvatars().getAvatarById(avatar)));
}
}
this.unsetTrialAvatarTeam();
@ -1046,7 +1059,7 @@ public final class TeamManager extends BasePlayerDataManager {
this.removeTrialAvatar(
this.getActiveTeam().stream()
.map(EntityAvatar::getAvatar)
.map(Avatar::getAvatarId)
.map(Avatar::getTrialAvatarId)
.toList());
}
@ -1068,11 +1081,11 @@ public final class TeamManager extends BasePlayerDataManager {
public void removeTrialAvatar(List<Integer> trialAvatarIds) {
if (!this.isUsingTrialTeam()) throw new RuntimeException("Player is not using a trial team.");
this.removeTrialAvatarTeam(trialAvatarIds);
this.getPlayer()
.sendPacket(
new PacketAvatarDelNotify(
trialAvatarIds.stream().map(this::getTrialAvatarGuid).toList()));
.sendPacket(
new PacketAvatarDelNotify(
trialAvatarIds.stream().map(this::getTrialAvatarGuid).toList()));
this.removeTrialAvatarTeam(trialAvatarIds);
// Update the team.
if (trialAvatarIds.size() == 1) this.getPlayer().sendPacket(new PacketAvatarTeamUpdateNotify());

4
src/main/java/emu/grasscutter/game/quest/exec/ExecGrantTrialAvatar.java
View File

@ -18,9 +18,9 @@ public class ExecGrantTrialAvatar extends QuestExecHandler {
.addTrialAvatar(Integer.parseInt(paramStr[0]), quest.getMainQuestId());
Grasscutter.getLogger()
.debug("Added trial avatar to team for quest {}", quest.getSubQuestId());
return true;
} catch (RuntimeException ignored) {
} catch (RuntimeException exception) {
exception.printStackTrace();
return false;
}
}

3
src/main/java/emu/grasscutter/game/quest/exec/ExecRemoveTrialAvatar.java
View File

@ -16,7 +16,8 @@ public class ExecRemoveTrialAvatar extends QuestExecHandler {
Grasscutter.getLogger()
.debug("Removed trial avatar from team for quest {}", quest.getSubQuestId());
return true;
} catch (RuntimeException ignored) {
} catch (RuntimeException exception) {
exception.printStackTrace();
return false;
}
}