Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-15 08:25:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

TeamManager avatar add refactor.

Browse Source
This commit is contained in:
ProxyismGH
2022-05-26 18:38:52 -07:00
committed by Melledy
parent 6a9018e310
commit 880d177034
5 changed files with 134 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/emu/grasscutter/game/player/Player.java
View File

@@ -809,7 +809,7 @@ public class Player {
this.hasSentAvatarDataNotify = hasSentAvatarDataNotify;
}
public void addAvatar(Avatar avatar) {
public void addAvatar(Avatar avatar, boolean addToCurrentTeam) {
boolean result = getAvatars().addAvatar(avatar);
if (result) {
@@ -820,14 +820,22 @@ public class Player {
if (hasSentAvatarDataNotify()) {
// Recalc stats
avatar.recalcStats();
// Packet
sendPacket(new PacketAvatarAddNotify(avatar, false));
// Packet, show notice on left if the avatar will be added to the team
sendPacket(new PacketAvatarAddNotify(avatar, addToCurrentTeam && this.getTeamManager().canAddAvatarToCurrentTeam()));
if (addToCurrentTeam) {
// If space in team, add
this.getTeamManager().addAvatarToCurrentTeam(avatar);
}
}
} else {
// Failed adding avatar
}
}
public void addAvatar(Avatar avatar) {
addAvatar(avatar, true);
}
public void addFlycloak(int flycloakId) {
this.getFlyCloakList().add(flycloakId);
this.sendPacket(new PacketAvatarGainFlycloakNotify(flycloakId));