Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-22 20:04:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix teleporting errors

Browse Source
This commit is contained in:
KingRainbow44
2023-05-10 20:54:25 -04:00
parent 510e6bfa78
commit 07e038343d
5 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ import dev.morphia.annotations.Transient;
import emu.grasscutter.GameConstants;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.binout.config.fields.ConfigAbilityData;
import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.entity.EntityAvatar;
@@ -980,7 +979,7 @@ public final class TeamManager extends BasePlayerDataManager {
// any
}
for (ConfigAbilityData abilities : config.getAvatarAbilities()) {
for (var abilities : config.getAvatarAbilities()) {
avatarData.getAbilities().add(Utils.abilityHash(abilities.getAbilityName()));
}
}
@@ -1123,8 +1122,7 @@ public final class TeamManager extends BasePlayerDataManager {
*/
public void removeTrialAvatar(List<Integer> trialAvatarIds) {
// Check if the player is using a trial team.
if (!this.isUsingTrialTeam())
throw new IllegalStateException("Player is not using trial team.");
if (!this.isUsingTrialTeam()) return;
this.getPlayer()
.sendPacket(