Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-03-25 00:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable' into unstable

Browse Source
This commit is contained in:
KingRainbow44
2023-05-31 22:29:09 -04:00
parent 3e2607af4c b1b8abc627
commit 8840e2b574
4 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/emu/grasscutter/game/avatar/Avatar.java
View File

@@ -1,5 +1,7 @@
package emu.grasscutter.game.avatar;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import dev.morphia.annotations.*;
import emu.grasscutter.GameConstants;
import emu.grasscutter.data.GameData;
@@ -30,14 +32,11 @@ import emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.TrialAvatarInfo;
import emu.grasscutter.server.packet.send.*;
import emu.grasscutter.utils.helpers.ProtoHelper;
import it.unimi.dsi.fastutil.ints.*;
import lombok.*;
import org.bson.types.ObjectId;
import javax.annotation.*;
import java.util.*;
import java.util.stream.Stream;
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import javax.annotation.*;
import lombok.*;
import org.bson.types.ObjectId;
@Entity(value = "avatars", useDiscriminator = false)
public class Avatar {
@@ -230,8 +229,7 @@ public class Avatar {
/**
* @return The avatar's equipped weapon.
*/
@Nullable
public GameItem getWeapon() {
@Nullable public GameItem getWeapon() {
return this.getEquipBySlot(EquipType.EQUIP_WEAPON);
}

5
src/main/java/emu/grasscutter/game/inventory/Inventory.java
View File

@@ -1,5 +1,7 @@
package emu.grasscutter.game.inventory;
import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.common.ItemParamData;
@@ -15,11 +17,8 @@ import emu.grasscutter.server.packet.send.*;
import emu.grasscutter.utils.Utils;
import it.unimi.dsi.fastutil.ints.*;
import it.unimi.dsi.fastutil.longs.*;
import java.util.*;
import static emu.grasscutter.config.Configuration.INVENTORY_LIMITS;
public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
private final Long2ObjectMap<GameItem> store;
private final Int2ObjectMap<InventoryTab> inventoryTypes;

1
src/main/java/emu/grasscutter/game/player/BasePlayerManager.java
View File

@@ -4,6 +4,7 @@ import lombok.*;
public abstract class BasePlayerManager {
protected final transient Player player;
@Getter
@Setter(AccessLevel.PROTECTED)
protected boolean loaded = false;