Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-02-07 02:26:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into api

Browse Source 
# Conflicts:
#	src/main/java/emu/grasscutter/Grasscutter.java
This commit is contained in:
KingRainbow44
2022-04-29 19:31:33 -04:00
parent d359e5111a 92b1ba7a18
commit 4db1724d06
74 changed files with 2524 additions and 219 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

@@ -15,7 +15,7 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.def.AvatarSkillDepotData;
import emu.grasscutter.game.avatar.Avatar;
import emu.grasscutter.game.entity.EntityAvatar;
import emu.grasscutter.game.entity.EntityGadget;
import emu.grasscutter.game.entity.EntityBaseGadget;
import emu.grasscutter.game.props.ElementType;
import emu.grasscutter.game.props.EnterReason;
import emu.grasscutter.game.props.FightProperty;
@@ -54,7 +54,7 @@ public class TeamManager {
@Transient private TeamInfo mpTeam;
@Transient private int entityId;
@Transient private final List<EntityAvatar> avatars;
@Transient private final Set<EntityGadget> gadgets;
@Transient private final Set<EntityBaseGadget> gadgets;
@Transient private final IntSet teamResonances;
@Transient private final IntSet teamResonancesConfig;
@@ -141,7 +141,7 @@ public class TeamManager {
this.entityId = entityId;
}
public Set<EntityGadget> getGadgets() {
public Set<EntityBaseGadget> getGadgets() {
return gadgets;
}