Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 09:54:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete code

Browse Source
This commit is contained in:
KingRainbow44
2023-04-24 20:56:20 -04:00
parent 3e6b38c407
commit 52ac9cd75e
2 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,11 +438,6 @@ public final class TeamManager extends BasePlayerDataManager {
this.usingTrialTeam = true; this.usingTrialTeam = true;
} }
/** Displays the trial avatars. Picks the last avatar in the team. */
public void trialAvatarTeamPostUpdate() {
this.trialAvatarTeamPostUpdate(this.getActiveTeam().size() - 1);
}
/** /**
* Displays the trial avatars. * Displays the trial avatars.
* *
@@ -1035,7 +1030,7 @@ public final class TeamManager extends BasePlayerDataManager {
this.addTrialAvatar( this.addTrialAvatar(
trialAvatarId, trialAvatarId,
questId, questId,
questId == 0 questId != 0
? GrantReason.GRANT_REASON_BY_QUEST ? GrantReason.GRANT_REASON_BY_QUEST
: GrantReason.GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY); : GrantReason.GRANT_REASON_BY_TRIAL_AVATAR_ACTIVITY);
@@ -1073,11 +1068,11 @@ public final class TeamManager extends BasePlayerDataManager {
public void removeTrialAvatar(List<Integer> trialAvatarIds) { public void removeTrialAvatar(List<Integer> trialAvatarIds) {
if (!this.isUsingTrialTeam()) throw new RuntimeException("Player is not using a trial team."); if (!this.isUsingTrialTeam()) throw new RuntimeException("Player is not using a trial team.");
this.removeTrialAvatarTeam(trialAvatarIds);
this.getPlayer() this.getPlayer()
.sendPacket( .sendPacket(
new PacketAvatarDelNotify( new PacketAvatarDelNotify(
trialAvatarIds.stream().map(this::getTrialAvatarGuid).toList())); trialAvatarIds.stream().map(this::getTrialAvatarGuid).toList()));
this.removeTrialAvatarTeam(trialAvatarIds);
// Update the team. // Update the team.
if (trialAvatarIds.size() == 1) this.getPlayer().sendPacket(new PacketAvatarTeamUpdateNotify()); if (trialAvatarIds.size() == 1) this.getPlayer().sendPacket(new PacketAvatarTeamUpdateNotify());

93
src/main/java/emu/grasscutter/server/packet/send/PacketSceneTeamUpdateNotify.java
View File

@@ -1,47 +1,46 @@
package emu.grasscutter.server.packet.send; package emu.grasscutter.server.packet.send;
import emu.grasscutter.game.entity.EntityAvatar; import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.player.Player; import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.packet.BasePacket; import emu.grasscutter.net.packet.PacketOpcodes;
import emu.grasscutter.net.packet.PacketOpcodes; import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo; import emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar;
import emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar; import emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify;
import emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify;
public class PacketSceneTeamUpdateNotify extends BasePacket {
public class PacketSceneTeamUpdateNotify extends BasePacket {
public PacketSceneTeamUpdateNotify(Player player) {
public PacketSceneTeamUpdateNotify(Player player) { super(PacketOpcodes.SceneTeamUpdateNotify);
super(PacketOpcodes.SceneTeamUpdateNotify);
var proto = SceneTeamUpdateNotify.newBuilder()
SceneTeamUpdateNotify.Builder proto = .setIsInMp(player.getWorld().isMultiplayer());
SceneTeamUpdateNotify.newBuilder().setIsInMp(player.getWorld().isMultiplayer());
for (var p : player.getWorld().getPlayers()) {
for (Player p : player.getWorld().getPlayers()) { for (var entityAvatar : p.getTeamManager().getActiveTeam()) {
for (EntityAvatar entityAvatar : p.getTeamManager().getActiveTeam()) { var avatarProto =
SceneTeamAvatar.Builder avatarProto = SceneTeamAvatar.newBuilder()
SceneTeamAvatar.newBuilder() .setPlayerUid(p.getUid())
.setPlayerUid(p.getUid()) .setAvatarGuid(entityAvatar.getAvatar().getGuid())
.setAvatarGuid(entityAvatar.getAvatar().getGuid()) .setSceneId(p.getSceneId())
.setSceneId(p.getSceneId()) .setEntityId(entityAvatar.getId())
.setEntityId(entityAvatar.getId()) .setSceneEntityInfo(entityAvatar.toProto())
.setSceneEntityInfo(entityAvatar.toProto()) .setWeaponGuid(entityAvatar.getAvatar().getWeapon().getGuid())
.setWeaponGuid(entityAvatar.getAvatar().getWeapon().getGuid()) .setWeaponEntityId(entityAvatar.getWeaponEntityId())
.setWeaponEntityId(entityAvatar.getWeaponEntityId()) .setIsPlayerCurAvatar(p.getTeamManager().getCurrentAvatarEntity() == entityAvatar)
.setIsPlayerCurAvatar(p.getTeamManager().getCurrentAvatarEntity() == entityAvatar) .setIsOnScene(p.getTeamManager().getCurrentAvatarEntity() == entityAvatar)
.setIsOnScene(p.getTeamManager().getCurrentAvatarEntity() == entityAvatar) .setAvatarAbilityInfo(AbilitySyncStateInfo.newBuilder())
.setAvatarAbilityInfo(AbilitySyncStateInfo.newBuilder()) .setWeaponAbilityInfo(AbilitySyncStateInfo.newBuilder())
.setWeaponAbilityInfo(AbilitySyncStateInfo.newBuilder()) .setAbilityControlBlock(entityAvatar.getAbilityControlBlock());
.setAbilityControlBlock(entityAvatar.getAbilityControlBlock());
if (player.getWorld().isMultiplayer()) {
if (player.getWorld().isMultiplayer()) { avatarProto.setAvatarInfo(entityAvatar.getAvatar().toProto());
avatarProto.setAvatarInfo(entityAvatar.getAvatar().toProto()); avatarProto.setSceneAvatarInfo(entityAvatar.getSceneAvatarInfo()); // why mihoyo...
avatarProto.setSceneAvatarInfo(entityAvatar.getSceneAvatarInfo()); // why mihoyo... }
}
proto.addSceneTeamAvatarList(avatarProto);
proto.addSceneTeamAvatarList(avatarProto); }
} }
}
this.setData(proto);
this.setData(proto); }
} }
}