Merge branch 'stable' into development
Showing
- src/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java 65 additions, 18 deletionssrc/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java
- src/main/java/emu/grasscutter/game/entity/EntityAvatar.java 2 additions, 2 deletionssrc/main/java/emu/grasscutter/game/entity/EntityAvatar.java
- src/main/java/emu/grasscutter/game/friends/FriendsList.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/game/friends/FriendsList.java
- src/main/java/emu/grasscutter/game/friends/Friendship.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/game/friends/Friendship.java
- src/main/java/emu/grasscutter/game/friends/PlayerProfile.java 5 additions, 4 deletions...main/java/emu/grasscutter/game/friends/PlayerProfile.java
- src/main/java/emu/grasscutter/game/gacha/GachaBanner.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/game/gacha/GachaBanner.java
- src/main/java/emu/grasscutter/game/gacha/GachaManager.java 60 additions, 5 deletionssrc/main/java/emu/grasscutter/game/gacha/GachaManager.java
- src/main/java/emu/grasscutter/game/inventory/Inventory.java 4 additions, 4 deletionssrc/main/java/emu/grasscutter/game/inventory/Inventory.java
- src/main/java/emu/grasscutter/game/managers/ChatManager.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/game/managers/ChatManager.java
- src/main/java/emu/grasscutter/game/managers/InventoryManager.java 14 additions, 22 deletions.../java/emu/grasscutter/game/managers/InventoryManager.java
- src/main/java/emu/grasscutter/game/props/FetterState.java 42 additions, 0 deletionssrc/main/java/emu/grasscutter/game/props/FetterState.java
- src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java 235 additions, 197 deletions.../java/emu/grasscutter/server/dispatch/DispatchServer.java
- src/main/java/emu/grasscutter/server/dispatch/json/ComboTokenReqJson.java 1 addition, 1 deletion...u/grasscutter/server/dispatch/json/ComboTokenReqJson.java
- src/main/java/emu/grasscutter/server/dispatch/json/ComboTokenResJson.java 1 addition, 1 deletion...u/grasscutter/server/dispatch/json/ComboTokenResJson.java
- src/main/java/emu/grasscutter/server/dispatch/json/LoginResultJson.java 2 additions, 2 deletions...emu/grasscutter/server/dispatch/json/LoginResultJson.java
- src/main/java/emu/grasscutter/server/game/GameServer.java 18 additions, 3 deletionssrc/main/java/emu/grasscutter/server/game/GameServer.java
- src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java 1 addition, 1 deletion.../emu/grasscutter/server/game/GameServerPacketHandler.java
- src/main/java/emu/grasscutter/server/game/GameServerStartFinishEvent.java 5 additions, 0 deletions...u/grasscutter/server/game/GameServerStartFinishEvent.java
- src/main/java/emu/grasscutter/server/game/GameServerStopEvent.java 5 additions, 0 deletions...java/emu/grasscutter/server/game/GameServerStopEvent.java
- src/main/java/emu/grasscutter/server/game/GameServerTickEvent.java 5 additions, 0 deletions...java/emu/grasscutter/server/game/GameServerTickEvent.java
Please register or sign in to comment