mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-04-03 06:22:28 +02:00
Merge unstable into development (#2173)
* Remove more scene synchronized
* Fix worktop options not appearing
* Format code [skip actions]
* Fix delay with server tasks
* Format code [skip actions]
* Fully fix fairy clock (#2146)
* Fix scene transition
* fully fix fairy clock
* Re-add call to `Player#updatePlayerGameTime`
* Format code [skip actions]
* Initialize the script loader in `ResourceLoader#loadAll`
* Fix region removal checking
* Format code [skip actions]
* Use Lombok's `EqualsAndHashCode` for comparing scene regions
* Format code [skip actions]
* Move 'invalid gather object' to `trace`
* Add more information to the 'unknown condition handler' message
* Move invalid ability action to trace
* Make `KcpTunnel` public
* Validate the NPC being talked to
* Format code [skip actions]
* NPCs are not spawned server side; change logic to handle it
* Format code [skip actions]
* unload scene when there are no players (#2147)
* unload scene when there are no players
* Update src/main/java/emu/grasscutter/game/world/Scene.java
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
---------
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Check if a command should be copied or HTTP should be used
* Lint Code [skip actions]
* Fix character names rendering incorrectly
* Add basic troubleshooting command
* Implement handbook teleporting
also a few formatting changes and sort data by logical sense
* Fix listener `ConcurrentModificationException` issue
* Add color change to `Join the Community!`
* Lint Code [skip actions]
* Make clickable buttons appear clickable
* Remove 'Mechanicus' entities from the list of entities
* Format code [skip actions]
* Fix going back returning a blank screen
* Implement entity spawning
* Add setting level to entity card
* Add support for 'plain text' mode
* Make descriptions of objects scrollable
* Lint Code [skip actions]
* Format code [skip actions]
* Change the way existing hooks work
* Format code [skip actions]
* Upgrade Javalin to 5.5.0 & Fix project warnings
* Upgrade logging libraries
* Fix gacha mappings static file issue
* Add temporary backwards compatability for `ServerHelper`
* Format code [skip actions]
* Remove artifact signatures from VCS
* Fix forge queue data protocol definition
* Run `spotlessApply`
* Format code [skip actions]
* Download data required for building artifacts
* Add call for Facebook logins
* Add the wiki page as a submodule
* Format code [skip actions]
* Update translation (#2150)
* Update translation
* Update translation
* Separate the dispatch and game servers (pt. 1)
gacha is still broken, handbook still needs to be done
* Format code [skip actions]
* Separate the dispatch and game servers (pt. 2)
this commit fixes the gacha page
* Add description for '/troubleshoot'
* Set default avatar talent level to 10
* Separate the dispatch and game servers (pt. 3)
implement handbook across servers!
* Format code [skip actions]
* Update GitHub Actions to use 'download-file' over 'wget'
* Gm handbook lmao (#2149)
* Fix font issue
* Fix avatars
* Fix text overflow in commands
* Fix virtualized lists and items page 😭😭
* magix why 💀
* use hover style in all minicards
* button
* remove console.log
* lint
* Add icons
* magix asked
* Fix overflow padding issue
* Fix achievement text overflow
* remove icons from repo
* Change command icon
* Add the wiki page as a submodule
* total magix moment
* fix text overflow in commands
* Fix discord button
* Make text scale on Minicard
* import icons and font from another source
* Add hover effects to siebar buttons
* move font and readme to submodule repo
* Make data folder a submodule
* import icons and font from data submodule
* Update README.md
* total magix moment
* magix moment v2
* submodule change
* Import `.webp` files
* Resize `HomeButton`
* Fix 'Copy Command' reappearing after changing pages
---------
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
* Lint Code [skip actions]
* Download data for the build, not for the lint
* format imports
this is really just to see if build handbook works kek
* Implement proper handbook authentication (pt. 1)
* Implement proper handbook authentication (pt. 2)
* Format code [skip actions]
* Add quest data dumping for the handbook
* Change colors to fit _something suitable_
* Format code [skip actions]
* Fix force pushing to branches after linting
* Fix logic of `SetPlayerPropReq`
* Move more group loading to `trace`
* Add handbook IP authentication in hybrid mode
* Fix player level up not displaying on the client properly
* Format code [skip actions]
* Fix game time locking
* Format code [skip actions]
* Update player properties
* Format code [skip actions]
* Move `warn`s for groups to `debug`
* Fix player pausing
* Move more logs to `trace`
* Use `removeItemById` for deleting items via quests
* Clean up logger more
* Pause in-game time when the world is paused
* Format code [skip actions]
* More player property documentation
* Multi-threaded resource loading
* Format code [skip actions]
* Add quest widgets
* Add quests page (basic impl.)
* Add/fix colors
also fix tailwind
* Remove banned packets
client modifications already perform the job of blocking malicious packets from being executed, no point in having this if self-windy is wanted
* Re-add `BeginCameraSceneLookNotify`
* Fix being unable to attack (#2157)
* Add `PlayerOpenChestEvent`
* Add methods to get players from the server
* Add static methods to register an event handler
* Add `PlayerEnterDungeonEvent`
* Remove legacy documentation from `PlayerMoveEvent`
* Add `PlayerChatEvent`
* Add defaults to `Position`
* Clean up `.utils`
* Revert `Multi-threaded resource loading`
* Fix changing target UID when talking to the server
* Lint Code [skip actions]
* Format code [skip actions]
* fix NPC talk triggering main quest in 46101 (#2158)
Make it so that only talks where the param matches the talkId are checked.
* Format code [skip actions]
* Partially fix Chasing Shadows (#2159)
* Partially fix Chasing Shadows
* Go ahead and move it before the return before Magix tells me to.
* Format code [skip actions]
* Bring back period lol (#2160)
* Disable SNI for the HTTPS server
* Add `EntityCreationEvent`
* Add initial startup message
this is so the server appears like its preparing to start
* Format code [skip actions]
* Enable debug mode for plugin loggers if enabled for the primary logger
* Add documentation about `WorldAreaConfigData`
* Make more fields in excels accessible
* Remove deprecated fields from `GetShopRsp`
* Run `spotlessApply` on definitions
* Add `PlayerEnterAreaEvent`
* Optimize event calls
* Fix event invokes
* Format code [skip actions]
* Remove manual autofinish for main quests. (#2162)
* Add world areas to the textmap cache
* Format code [skip actions]
* Don't overdefine variables in extended classes (#2163)
* Add dumper for world areas
* Format code [skip actions]
* instantiate personalLineList (#2165)
* Fix protocol definitions
thank you Nazrin! (+ hiro for raw definitions)
* Fix the background color leaking from the character widget
* Change HTML spacing to 2 spaces
* Implement hiding widgets
* Change scrollbar to a vibrant color
* Add _some_ scaling to the home buttons and its text
* Build the handbook with Gradle
* Fix the 'finer details' with the handbook UI
* Lint Code [skip actions]
* Fix target destination for the Gradle-built handbook
* Implement fetching a player across servers & Add a chainable JsonObject
useful for plugins! might be used in grasscutter eventually
* Fix GitHub actions
* Fix event calling & canceling
* Run `spotlessApply`
* Rename fields (might be wrong)
* Add/update all/more protocol definitions
* Add/update all/more protocol definitions
* Remove outdated packet
* Fix protocol definitions
* Format code [skip actions]
* Implement some lua variables for less console spam (#2172)
* Implement some lua variables for less console spam
* Add GetHostQuestState
This fixes some chapter 3 stuff.
* Format code [skip actions]
* Fix merge import
* Format code [skip actions]
* Fully fix fairy clock for real this time (#2167)
* Fully fix fairy clock For real this time
* Make it so relogging keeps the time lock state.
* Refactor out questLockTime
* Per Hartie, the client packet needs to be changed too
* Update src/main/java/emu/grasscutter/game/world/World.java
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java
* Remove all code not needed to get clock working
---------
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Implement a proper ability system (#2166)
* Apply fix `21dec2fe`
* Apply fix `89d01d5f`
* Apply fix `d900f154`
this one was already implemented; updated to use call from previous commit
* Ability changing commit
TODO: change info to debug
* Remove use of deprecated methods/fields
* Temp commit v2
(Adding LoseHP and some fixes)
* Oopsie
* Probably fix monster battle
* Fix issue with reflecting into fields
* Fix some things
* Fix ability names for 3.6 resources
* Improve logging
---------
Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
* Format code [skip actions]
* Add system for sending messages between servers
* Format some code
* Remove protocol definitions from Spotless
* Default debug to false; enable with `-debug`
* Implement completely useless global value copying
* HACK: Return the avatar which holds the weapon when the weapon is referred to by ID
* Add properties to `AbilityModifier`
* Change the way HTML is served after authentication
* Use thread executors to speed up the database loading process
* Format code [skip actions]
* Add system for setting handbook address and port
* Lint Code [skip actions]
* Format code [skip actions]
* Fix game-related data not saving
* Format code [skip actions]
* Fix handbook server details
* Lint Code [skip actions]
* Format code [skip actions]
* Use the headers provided by a context to get the IP address
should acknowledge #1975
* Format code [skip actions]
* Move more logs to `trace`
* Format code [skip actions]
* more trace
* Fix something and implement weapon entities
* Format code [skip actions]
* Fix `EntityWeapon`
* Remove deprecated API & Fix resource checking
* Fix unnecessary warning for first-time setup
* Implement handbook request limiting
* Format code [skip actions]
* Fix new avatar weapons being null
* Format code [skip actions]
* Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met
* Load activity config on server startup
* Require plugins to specify an API version and match with the server
* Add default open state ignore list
* Format code [skip actions]
* Quick fix for questing, needs more investigation
This would make the questing work again
* Remove existing hack for 35303
* Fix ignored open states from being set
* Format code [skip actions]
* fix the stupidest bug ive ever seen
* Optimize player kicking on server close
* Format code [skip actions]
* Re-add hack to fix 35303
* Update GitHub actions
* Format code [skip actions]
* Potentially fix issues with regions
* Download additional handbook data
* Revert "Potentially fix issues with regions"
This reverts commit 84e3823695.
---------
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: scooterboo <lewasite@yahoo.com>
Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com>
Co-authored-by: Scald <104459145+Arikatsu@users.noreply.github.com>
Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
This commit is contained in:
Magix
@@ -10,13 +10,12 @@ import emu.grasscutter.server.game.GameServer;
|
||||
import emu.grasscutter.server.packet.send.PacketServerAnnounceNotify;
|
||||
import emu.grasscutter.server.packet.send.PacketServerAnnounceRevokeNotify;
|
||||
import emu.grasscutter.utils.Utils;
|
||||
import java.util.*;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.Data;
|
||||
import lombok.Getter;
|
||||
import lombok.experimental.FieldDefaults;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
@Getter
|
||||
public class AnnouncementSystem extends BaseGameSystem {
|
||||
private final Map<Integer, AnnounceConfigItem> announceConfigItemMap;
|
||||
@@ -29,7 +28,8 @@ public class AnnouncementSystem extends BaseGameSystem {
|
||||
|
||||
private int loadConfig() {
|
||||
try {
|
||||
List<AnnounceConfigItem> announceConfigItems = DataLoader.loadList("Announcement.json", AnnounceConfigItem.class);
|
||||
List<AnnounceConfigItem> announceConfigItems =
|
||||
DataLoader.loadList("Announcement.json", AnnounceConfigItem.class);
|
||||
|
||||
announceConfigItemMap.clear();
|
||||
announceConfigItems.forEach(i -> announceConfigItemMap.put(i.getTemplateId(), i));
|
||||
@@ -42,9 +42,9 @@ public class AnnouncementSystem extends BaseGameSystem {
|
||||
|
||||
public List<Player> getOnlinePlayers() {
|
||||
return getServer().getWorlds().stream()
|
||||
.map(World::getPlayers)
|
||||
.flatMap(Collection::stream)
|
||||
.toList();
|
||||
.map(World::getPlayers)
|
||||
.flatMap(Collection::stream)
|
||||
.toList();
|
||||
}
|
||||
|
||||
public void broadcast(List<AnnounceConfigItem> tpl) {
|
||||
@@ -52,10 +52,11 @@ public class AnnouncementSystem extends BaseGameSystem {
|
||||
return;
|
||||
}
|
||||
|
||||
var list = tpl.stream()
|
||||
.map(AnnounceConfigItem::toProto)
|
||||
.map(AnnounceDataOuterClass.AnnounceData.Builder::build)
|
||||
.toList();
|
||||
var list =
|
||||
tpl.stream()
|
||||
.map(AnnounceConfigItem::toProto)
|
||||
.map(AnnounceDataOuterClass.AnnounceData.Builder::build)
|
||||
.toList();
|
||||
|
||||
getOnlinePlayers().forEach(i -> i.sendPacket(new PacketServerAnnounceNotify(list)));
|
||||
}
|
||||
@@ -68,9 +69,14 @@ public class AnnouncementSystem extends BaseGameSystem {
|
||||
getOnlinePlayers().forEach(i -> i.sendPacket(new PacketServerAnnounceRevokeNotify(tplId)));
|
||||
}
|
||||
|
||||
public enum AnnounceType {
|
||||
CENTER,
|
||||
COUNTDOWN
|
||||
}
|
||||
|
||||
@Data
|
||||
@FieldDefaults(level = AccessLevel.PRIVATE)
|
||||
public class AnnounceConfigItem{
|
||||
public class AnnounceConfigItem {
|
||||
int templateId;
|
||||
AnnounceType type;
|
||||
int frequency;
|
||||
@@ -83,26 +89,19 @@ public class AnnouncementSystem extends BaseGameSystem {
|
||||
public AnnounceDataOuterClass.AnnounceData.Builder toProto() {
|
||||
var proto = AnnounceDataOuterClass.AnnounceData.newBuilder();
|
||||
|
||||
proto.setConfigId(templateId)
|
||||
// I found the time here is useless
|
||||
.setBeginTime(Utils.getCurrentSeconds() + 1)
|
||||
.setEndTime(Utils.getCurrentSeconds() + 10);
|
||||
proto
|
||||
.setConfigId(templateId)
|
||||
// I found the time here is useless
|
||||
.setBeginTime(Utils.getCurrentSeconds() + 1)
|
||||
.setEndTime(Utils.getCurrentSeconds() + 10);
|
||||
|
||||
if (type == AnnounceType.CENTER) {
|
||||
proto.setCenterSystemText(content)
|
||||
.setCenterSystemFrequency(frequency)
|
||||
;
|
||||
}else {
|
||||
proto.setCountDownText(content)
|
||||
.setCountDownFrequency(frequency)
|
||||
;
|
||||
proto.setCenterSystemText(content).setCenterSystemFrequency(frequency);
|
||||
} else {
|
||||
proto.setCountDownText(content).setCountDownFrequency(frequency);
|
||||
}
|
||||
|
||||
return proto;
|
||||
}
|
||||
}
|
||||
|
||||
public enum AnnounceType{
|
||||
CENTER, COUNTDOWN
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,33 +1,23 @@
|
||||
package emu.grasscutter.game.systems;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.common.ItemParamData;
|
||||
import emu.grasscutter.data.excels.AvatarPromoteData;
|
||||
import emu.grasscutter.data.excels.AvatarSkillDepotData;
|
||||
import emu.grasscutter.data.excels.ItemData;
|
||||
import emu.grasscutter.data.excels.WeaponPromoteData;
|
||||
import emu.grasscutter.data.excels.avatar.AvatarPromoteData;
|
||||
import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
|
||||
import emu.grasscutter.data.excels.weapon.WeaponPromoteData;
|
||||
import emu.grasscutter.game.avatar.Avatar;
|
||||
import emu.grasscutter.game.inventory.GameItem;
|
||||
import emu.grasscutter.game.inventory.ItemType;
|
||||
import emu.grasscutter.game.inventory.MaterialType;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.props.FightProperty;
|
||||
import emu.grasscutter.game.props.ItemUseOp;
|
||||
import emu.grasscutter.game.props.ItemUseAction.ItemUseAddExp;
|
||||
import emu.grasscutter.game.props.ItemUseAction.ItemUseAddReliquaryExp;
|
||||
import emu.grasscutter.game.props.ItemUseAction.ItemUseAddWeaponExp;
|
||||
import emu.grasscutter.game.props.ItemUseAction.UseItemParams;
|
||||
import emu.grasscutter.game.props.ItemUseOp;
|
||||
import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
|
||||
import emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo;
|
||||
import emu.grasscutter.server.event.player.PlayerUseFoodEvent;
|
||||
@@ -35,31 +25,32 @@ import emu.grasscutter.server.game.BaseGameSystem;
|
||||
import emu.grasscutter.server.game.GameServer;
|
||||
import emu.grasscutter.server.packet.send.*;
|
||||
import emu.grasscutter.utils.Utils;
|
||||
import it.unimi.dsi.fastutil.ints.Int2FloatArrayMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2IntArrayMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2IntMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2IntRBTreeMap;
|
||||
import it.unimi.dsi.fastutil.ints.*;
|
||||
import java.util.*;
|
||||
import java.util.stream.Stream;
|
||||
import lombok.val;
|
||||
|
||||
public class InventorySystem extends BaseGameSystem {
|
||||
private static final Int2IntMap weaponRefundMaterials = new Int2IntArrayMap();
|
||||
|
||||
{
|
||||
// Use a sorted map, use exp as key to sort by exp
|
||||
// We want to have weaponRefundMaterials as (id, exp) in descending exp order
|
||||
var temp = new Int2IntRBTreeMap(Collections.reverseOrder());
|
||||
GameData.getItemDataMap().forEach((id, data) -> {
|
||||
if (data == null) return;
|
||||
if (data.getMaterialType() != MaterialType.MATERIAL_WEAPON_EXP_STONE) return;
|
||||
var actions = data.getItemUseActions();
|
||||
if (actions == null) return;
|
||||
for (var action : actions) {
|
||||
if (action.getItemUseOp() == ItemUseOp.ITEM_USE_ADD_WEAPON_EXP) {
|
||||
temp.putIfAbsent((int) ((ItemUseAddWeaponExp) action).getExp(), (int) id);
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
GameData.getItemDataMap()
|
||||
.forEach(
|
||||
(id, data) -> {
|
||||
if (data == null) return;
|
||||
if (data.getMaterialType() != MaterialType.MATERIAL_WEAPON_EXP_STONE) return;
|
||||
var actions = data.getItemUseActions();
|
||||
if (actions == null) return;
|
||||
for (var action : actions) {
|
||||
if (action.getItemUseOp() == ItemUseOp.ITEM_USE_ADD_WEAPON_EXP) {
|
||||
temp.putIfAbsent(((ItemUseAddWeaponExp) action).getExp(), (int) id);
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
temp.forEach((exp, id) -> weaponRefundMaterials.putIfAbsent((int) id, (int) exp));
|
||||
}
|
||||
|
||||
@@ -67,6 +58,53 @@ public class InventorySystem extends BaseGameSystem {
|
||||
super(server);
|
||||
}
|
||||
|
||||
public static synchronized int checkPlayerAvatarConstellationLevel(Player player, int id) {
|
||||
// Try to accept itemId OR avatarId
|
||||
int avatarId = 0;
|
||||
if (GameData.getAvatarDataMap().containsKey(id)) {
|
||||
avatarId = id;
|
||||
} else {
|
||||
avatarId =
|
||||
Optional.ofNullable(GameData.getItemDataMap().get(id))
|
||||
.map(itemData -> itemData.getItemUseActions())
|
||||
.flatMap(
|
||||
actions ->
|
||||
actions.stream()
|
||||
.filter(action -> action.getItemUseOp() == ItemUseOp.ITEM_USE_GAIN_AVATAR)
|
||||
.map(
|
||||
action ->
|
||||
((emu.grasscutter.game.props.ItemUseAction.ItemUseGainAvatar)
|
||||
action)
|
||||
.getI())
|
||||
.findFirst())
|
||||
.orElse(0);
|
||||
}
|
||||
|
||||
if (avatarId == 0) return -2; // Not an Avatar
|
||||
|
||||
Avatar avatar = player.getAvatars().getAvatarById(avatarId);
|
||||
if (avatar == null) return -1; // Doesn't have
|
||||
|
||||
// Constellation
|
||||
int constLevel = avatar.getCoreProudSkillLevel();
|
||||
val avatarData = avatar.getSkillDepot();
|
||||
if (avatarData == null) {
|
||||
Grasscutter.getLogger()
|
||||
.error(
|
||||
"Attempted to check constellation level for UID"
|
||||
+ player.getUid()
|
||||
+ "'s avatar "
|
||||
+ avatarId
|
||||
+ " but avatar has no skillDepot!");
|
||||
return 0;
|
||||
}
|
||||
int constItemId = avatarData.getTalentCostItemId();
|
||||
GameItem constItem =
|
||||
player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(constItemId);
|
||||
constLevel += Optional.ofNullable(constItem).map(GameItem::getCount).orElse(0);
|
||||
return constLevel;
|
||||
}
|
||||
|
||||
public void lockEquip(Player player, long targetEquipGuid, boolean isLocked) {
|
||||
GameItem equip = player.getInventory().getItemByGuid(targetEquipGuid);
|
||||
|
||||
@@ -81,7 +119,8 @@ public class InventorySystem extends BaseGameSystem {
|
||||
player.sendPacket(new PacketSetEquipLockStateRsp(equip));
|
||||
}
|
||||
|
||||
public void upgradeRelic(Player player, long targetGuid, List<Long> foodRelicList, List<ItemParam> list) {
|
||||
public void upgradeRelic(
|
||||
Player player, long targetGuid, List<Long> foodRelicList, List<ItemParam> list) {
|
||||
GameItem relic = player.getInventory().getItemByGuid(targetGuid);
|
||||
|
||||
if (relic == null || relic.getItemType() != ItemType.ITEM_RELIQUARY) {
|
||||
@@ -110,7 +149,10 @@ public class InventorySystem extends BaseGameSystem {
|
||||
}
|
||||
List<ItemParamData> payList = new ArrayList<ItemParamData>();
|
||||
for (ItemParam itemParam : list) {
|
||||
int amount = itemParam.getCount(); // Previously this capped to inventory amount, but rejecting the payment makes more sense for an invalid order
|
||||
int amount =
|
||||
itemParam
|
||||
.getCount(); // Previously this capped to inventory amount, but rejecting the payment
|
||||
// makes more sense for an invalid order
|
||||
int gain = 0;
|
||||
var data = GameData.getItemDataMap().get(itemParam.getItemId());
|
||||
if (data != null) {
|
||||
@@ -174,7 +216,8 @@ public class InventorySystem extends BaseGameSystem {
|
||||
exp = 0;
|
||||
level += 1;
|
||||
// On relic levelup
|
||||
if (relic.getItemData().getAddPropLevelSet() != null && relic.getItemData().getAddPropLevelSet().contains(level)) {
|
||||
if (relic.getItemData().getAddPropLevelSet() != null
|
||||
&& relic.getItemData().getAddPropLevelSet().contains(level)) {
|
||||
upgrades += 1;
|
||||
}
|
||||
// Set req exp
|
||||
@@ -192,7 +235,10 @@ public class InventorySystem extends BaseGameSystem {
|
||||
|
||||
// Avatar
|
||||
if (oldLevel != level) {
|
||||
Avatar avatar = relic.getEquipCharacter() > 0 ? player.getAvatars().getAvatarById(relic.getEquipCharacter()) : null;
|
||||
Avatar avatar =
|
||||
relic.getEquipCharacter() > 0
|
||||
? player.getAvatars().getAvatarById(relic.getEquipCharacter())
|
||||
: null;
|
||||
if (avatar != null) {
|
||||
avatar.recalcStats();
|
||||
}
|
||||
@@ -203,7 +249,11 @@ public class InventorySystem extends BaseGameSystem {
|
||||
player.sendPacket(new PacketReliquaryUpgradeRsp(relic, rate, oldLevel, oldAppendPropIdList));
|
||||
}
|
||||
|
||||
public List<ItemParam> calcWeaponUpgradeReturnItems(Player player, long targetGuid, List<Long> foodWeaponGuidList, List<ItemParam> itemParamList) {
|
||||
public List<ItemParam> calcWeaponUpgradeReturnItems(
|
||||
Player player,
|
||||
long targetGuid,
|
||||
List<Long> foodWeaponGuidList,
|
||||
List<ItemParam> itemParamList) {
|
||||
GameItem weapon = player.getInventory().getItemByGuid(targetGuid);
|
||||
|
||||
// Sanity checks
|
||||
@@ -211,30 +261,38 @@ public class InventorySystem extends BaseGameSystem {
|
||||
return null;
|
||||
}
|
||||
|
||||
WeaponPromoteData promoteData = GameData.getWeaponPromoteData(weapon.getItemData().getWeaponPromoteId(), weapon.getPromoteLevel());
|
||||
WeaponPromoteData promoteData =
|
||||
GameData.getWeaponPromoteData(
|
||||
weapon.getItemData().getWeaponPromoteId(), weapon.getPromoteLevel());
|
||||
if (promoteData == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// Get exp gain
|
||||
int expGain = foodWeaponGuidList.stream()
|
||||
.map(player.getInventory()::getItemByGuid)
|
||||
.filter(Objects::nonNull)
|
||||
.mapToInt(food -> food.getItemData().getWeaponBaseExp() + ((food.getTotalExp() * 4) / 5))
|
||||
.sum();
|
||||
int expGain =
|
||||
foodWeaponGuidList.stream()
|
||||
.map(player.getInventory()::getItemByGuid)
|
||||
.filter(Objects::nonNull)
|
||||
.mapToInt(
|
||||
food -> food.getItemData().getWeaponBaseExp() + ((food.getTotalExp() * 4) / 5))
|
||||
.sum();
|
||||
// Stream::ofNullable version
|
||||
expGain += itemParamList.stream()
|
||||
.mapToInt(param -> {
|
||||
int exp = Stream.ofNullable(GameData.getItemDataMap().get(param.getItemId()))
|
||||
.map(ItemData::getItemUseActions)
|
||||
.filter(Objects::nonNull)
|
||||
.flatMap(Collection::stream)
|
||||
.filter(action -> action.getItemUseOp() == ItemUseOp.ITEM_USE_ADD_WEAPON_EXP)
|
||||
.mapToInt(action -> ((ItemUseAddWeaponExp) action).getExp())
|
||||
.sum();
|
||||
return exp * param.getCount();
|
||||
})
|
||||
.sum();
|
||||
expGain +=
|
||||
itemParamList.stream()
|
||||
.mapToInt(
|
||||
param -> {
|
||||
int exp =
|
||||
Stream.ofNullable(GameData.getItemDataMap().get(param.getItemId()))
|
||||
.map(ItemData::getItemUseActions)
|
||||
.filter(Objects::nonNull)
|
||||
.flatMap(Collection::stream)
|
||||
.filter(
|
||||
action -> action.getItemUseOp() == ItemUseOp.ITEM_USE_ADD_WEAPON_EXP)
|
||||
.mapToInt(action -> ((ItemUseAddWeaponExp) action).getExp())
|
||||
.sum();
|
||||
return exp * param.getCount();
|
||||
})
|
||||
.sum();
|
||||
// Optional::ofNullable version
|
||||
// expGain += itemParamList.stream()
|
||||
// .mapToInt(param -> {
|
||||
@@ -242,7 +300,8 @@ public class InventorySystem extends BaseGameSystem {
|
||||
// .map(ItemData::getItemUseActions)
|
||||
// .map(actions -> {
|
||||
// return actions.stream()
|
||||
// .filter(action -> action.getItemUseOp() == ItemUseOp.ITEM_USE_ADD_WEAPON_EXP)
|
||||
// .filter(action -> action.getItemUseOp() ==
|
||||
// ItemUseOp.ITEM_USE_ADD_WEAPON_EXP)
|
||||
// .mapToInt(action -> ((ItemUseAddWeaponExp) action).getExp())
|
||||
// .sum();
|
||||
// })
|
||||
@@ -275,8 +334,11 @@ public class InventorySystem extends BaseGameSystem {
|
||||
return getLeftoverOres(expGain);
|
||||
}
|
||||
|
||||
|
||||
public void upgradeWeapon(Player player, long targetGuid, List<Long> foodWeaponGuidList, List<ItemParam> itemParamList) {
|
||||
public void upgradeWeapon(
|
||||
Player player,
|
||||
long targetGuid,
|
||||
List<Long> foodWeaponGuidList,
|
||||
List<ItemParam> itemParamList) {
|
||||
GameItem weapon = player.getInventory().getItemByGuid(targetGuid);
|
||||
|
||||
// Sanity checks
|
||||
@@ -284,7 +346,9 @@ public class InventorySystem extends BaseGameSystem {
|
||||
return;
|
||||
}
|
||||
|
||||
WeaponPromoteData promoteData = GameData.getWeaponPromoteData(weapon.getItemData().getWeaponPromoteId(), weapon.getPromoteLevel());
|
||||
WeaponPromoteData promoteData =
|
||||
GameData.getWeaponPromoteData(
|
||||
weapon.getItemData().getWeaponPromoteId(), weapon.getPromoteLevel());
|
||||
if (promoteData == null) {
|
||||
return;
|
||||
}
|
||||
@@ -299,13 +363,15 @@ public class InventorySystem extends BaseGameSystem {
|
||||
}
|
||||
expGain += food.getItemData().getWeaponBaseExp();
|
||||
if (food.getTotalExp() > 0) {
|
||||
expGainFree += (food.getTotalExp() * 4) / 5; // No tax :D
|
||||
expGainFree += (food.getTotalExp() * 4) / 5; // No tax :D
|
||||
}
|
||||
foodWeapons.add(food);
|
||||
}
|
||||
List<ItemParamData> payList = new ArrayList<ItemParamData>();
|
||||
for (ItemParam param : itemParamList) {
|
||||
int amount = param.getCount(); // Previously this capped to inventory amount, but rejecting the payment makes more sense for an invalid order
|
||||
int amount =
|
||||
param.getCount(); // Previously this capped to inventory amount, but rejecting the payment
|
||||
// makes more sense for an invalid order
|
||||
|
||||
var data = GameData.getItemDataMap().get(param.getItemId());
|
||||
if (data != null) {
|
||||
@@ -370,7 +436,10 @@ public class InventorySystem extends BaseGameSystem {
|
||||
|
||||
// Avatar
|
||||
if (oldLevel != level) {
|
||||
Avatar avatar = weapon.getEquipCharacter() > 0 ? player.getAvatars().getAvatarById(weapon.getEquipCharacter()) : null;
|
||||
Avatar avatar =
|
||||
weapon.getEquipCharacter() > 0
|
||||
? player.getAvatars().getAvatarById(weapon.getEquipCharacter())
|
||||
: null;
|
||||
if (avatar != null) {
|
||||
avatar.recalcStats();
|
||||
}
|
||||
@@ -410,12 +479,15 @@ public class InventorySystem extends BaseGameSystem {
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemData().getAwakenMaterial() != feed.getItemId()) {
|
||||
if (weapon.getItemType() != ItemType.ITEM_WEAPON
|
||||
|| weapon.getItemData().getAwakenMaterial() != feed.getItemId()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (weapon.getRefinement() >= 4 || weapon.getAffixes() == null || weapon.getAffixes().size() == 0) {
|
||||
if (weapon.getRefinement() >= 4
|
||||
|| weapon.getAffixes() == null
|
||||
|| weapon.getAffixes().size() == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -445,7 +517,10 @@ public class InventorySystem extends BaseGameSystem {
|
||||
weapon.save();
|
||||
|
||||
// Avatar
|
||||
Avatar avatar = weapon.getEquipCharacter() > 0 ? player.getAvatars().getAvatarById(weapon.getEquipCharacter()) : null;
|
||||
Avatar avatar =
|
||||
weapon.getEquipCharacter() > 0
|
||||
? player.getAvatars().getAvatarById(weapon.getEquipCharacter())
|
||||
: null;
|
||||
if (avatar != null) {
|
||||
avatar.recalcStats();
|
||||
}
|
||||
@@ -463,8 +538,11 @@ public class InventorySystem extends BaseGameSystem {
|
||||
}
|
||||
|
||||
int nextPromoteLevel = weapon.getPromoteLevel() + 1;
|
||||
WeaponPromoteData currentPromoteData = GameData.getWeaponPromoteData(weapon.getItemData().getWeaponPromoteId(), weapon.getPromoteLevel());
|
||||
WeaponPromoteData nextPromoteData = GameData.getWeaponPromoteData(weapon.getItemData().getWeaponPromoteId(), nextPromoteLevel);
|
||||
WeaponPromoteData currentPromoteData =
|
||||
GameData.getWeaponPromoteData(
|
||||
weapon.getItemData().getWeaponPromoteId(), weapon.getPromoteLevel());
|
||||
WeaponPromoteData nextPromoteData =
|
||||
GameData.getWeaponPromoteData(weapon.getItemData().getWeaponPromoteId(), nextPromoteLevel);
|
||||
if (currentPromoteData == null || nextPromoteData == null) {
|
||||
return;
|
||||
}
|
||||
@@ -475,10 +553,10 @@ public class InventorySystem extends BaseGameSystem {
|
||||
}
|
||||
|
||||
// Pay materials and mora if possible
|
||||
ItemParamData[] costs = nextPromoteData.getCostItems(); // Can this be null?
|
||||
ItemParamData[] costs = nextPromoteData.getCostItems(); // Can this be null?
|
||||
if (nextPromoteData.getCoinCost() > 0) {
|
||||
costs = Arrays.copyOf(costs, costs.length + 1);
|
||||
costs[costs.length-1] = new ItemParamData(202, nextPromoteData.getCoinCost());
|
||||
costs[costs.length - 1] = new ItemParamData(202, nextPromoteData.getCoinCost());
|
||||
}
|
||||
if (!player.getInventory().payItems(costs)) {
|
||||
return;
|
||||
@@ -489,7 +567,10 @@ public class InventorySystem extends BaseGameSystem {
|
||||
weapon.save();
|
||||
|
||||
// Avatar
|
||||
Avatar avatar = weapon.getEquipCharacter() > 0 ? player.getAvatars().getAvatarById(weapon.getEquipCharacter()) : null;
|
||||
Avatar avatar =
|
||||
weapon.getEquipCharacter() > 0
|
||||
? player.getAvatars().getAvatarById(weapon.getEquipCharacter())
|
||||
: null;
|
||||
if (avatar != null) {
|
||||
avatar.recalcStats();
|
||||
}
|
||||
@@ -508,8 +589,12 @@ public class InventorySystem extends BaseGameSystem {
|
||||
}
|
||||
|
||||
int nextPromoteLevel = avatar.getPromoteLevel() + 1;
|
||||
AvatarPromoteData currentPromoteData = GameData.getAvatarPromoteData(avatar.getAvatarData().getAvatarPromoteId(), avatar.getPromoteLevel());
|
||||
AvatarPromoteData nextPromoteData = GameData.getAvatarPromoteData(avatar.getAvatarData().getAvatarPromoteId(), nextPromoteLevel);
|
||||
AvatarPromoteData currentPromoteData =
|
||||
GameData.getAvatarPromoteData(
|
||||
avatar.getAvatarData().getAvatarPromoteId(), avatar.getPromoteLevel());
|
||||
AvatarPromoteData nextPromoteData =
|
||||
GameData.getAvatarPromoteData(
|
||||
avatar.getAvatarData().getAvatarPromoteId(), nextPromoteLevel);
|
||||
if (currentPromoteData == null || nextPromoteData == null) {
|
||||
return;
|
||||
}
|
||||
@@ -520,10 +605,10 @@ public class InventorySystem extends BaseGameSystem {
|
||||
}
|
||||
|
||||
// Pay materials and mora if possible
|
||||
ItemParamData[] costs = nextPromoteData.getCostItems(); // Can this be null?
|
||||
ItemParamData[] costs = nextPromoteData.getCostItems(); // Can this be null?
|
||||
if (nextPromoteData.getCoinCost() > 0) {
|
||||
costs = Arrays.copyOf(costs, costs.length + 1);
|
||||
costs[costs.length-1] = new ItemParamData(202, nextPromoteData.getCoinCost());
|
||||
costs[costs.length - 1] = new ItemParamData(202, nextPromoteData.getCoinCost());
|
||||
}
|
||||
if (!player.getInventory().payItems(costs)) {
|
||||
return;
|
||||
@@ -534,17 +619,21 @@ public class InventorySystem extends BaseGameSystem {
|
||||
|
||||
// Update proud skills
|
||||
Optional.ofNullable(GameData.getAvatarSkillDepotDataMap().get(avatar.getSkillDepotId()))
|
||||
.map(AvatarSkillDepotData::getInherentProudSkillOpens)
|
||||
.ifPresent(d -> d.stream()
|
||||
.filter(openData -> openData.getProudSkillGroupId() > 0)
|
||||
.filter(openData -> openData.getNeedAvatarPromoteLevel() == avatar.getPromoteLevel())
|
||||
.mapToInt(openData -> (openData.getProudSkillGroupId() * 100) + 1)
|
||||
.filter(GameData.getProudSkillDataMap()::containsKey)
|
||||
.forEach(proudSkillId -> {
|
||||
avatar.getProudSkillList().add(proudSkillId);
|
||||
player.sendPacket(new PacketProudSkillChangeNotify(avatar));
|
||||
})
|
||||
);
|
||||
.map(AvatarSkillDepotData::getInherentProudSkillOpens)
|
||||
.ifPresent(
|
||||
d ->
|
||||
d.stream()
|
||||
.filter(openData -> openData.getProudSkillGroupId() > 0)
|
||||
.filter(
|
||||
openData ->
|
||||
openData.getNeedAvatarPromoteLevel() == avatar.getPromoteLevel())
|
||||
.mapToInt(openData -> (openData.getProudSkillGroupId() * 100) + 1)
|
||||
.filter(GameData.getProudSkillDataMap()::containsKey)
|
||||
.forEach(
|
||||
proudSkillId -> {
|
||||
avatar.getProudSkillList().add(proudSkillId);
|
||||
player.sendPacket(new PacketProudSkillChangeNotify(avatar));
|
||||
}));
|
||||
|
||||
// Packets
|
||||
player.sendPacket(new PacketAvatarPropNotify(avatar));
|
||||
@@ -563,7 +652,9 @@ public class InventorySystem extends BaseGameSystem {
|
||||
return;
|
||||
}
|
||||
|
||||
AvatarPromoteData promoteData = GameData.getAvatarPromoteData(avatar.getAvatarData().getAvatarPromoteId(), avatar.getPromoteLevel());
|
||||
AvatarPromoteData promoteData =
|
||||
GameData.getAvatarPromoteData(
|
||||
avatar.getAvatarData().getAvatarPromoteId(), avatar.getPromoteLevel());
|
||||
if (promoteData == null) {
|
||||
return;
|
||||
}
|
||||
@@ -590,7 +681,8 @@ public class InventorySystem extends BaseGameSystem {
|
||||
|
||||
// Payment check
|
||||
int moraCost = expGain / 5;
|
||||
ItemParamData[] costItems = new ItemParamData[] {new ItemParamData(itemId, count), new ItemParamData(202, moraCost)};
|
||||
ItemParamData[] costItems =
|
||||
new ItemParamData[] {new ItemParamData(itemId, count), new ItemParamData(202, moraCost)};
|
||||
if (!player.getInventory().payItems(costItems)) {
|
||||
return;
|
||||
}
|
||||
@@ -600,7 +692,9 @@ public class InventorySystem extends BaseGameSystem {
|
||||
}
|
||||
|
||||
public void upgradeAvatar(Player player, Avatar avatar, int expGain) {
|
||||
AvatarPromoteData promoteData = GameData.getAvatarPromoteData(avatar.getAvatarData().getAvatarPromoteId(), avatar.getPromoteLevel());
|
||||
AvatarPromoteData promoteData =
|
||||
GameData.getAvatarPromoteData(
|
||||
avatar.getAvatarData().getAvatarPromoteId(), avatar.getPromoteLevel());
|
||||
if (promoteData == null) {
|
||||
return;
|
||||
}
|
||||
@@ -608,7 +702,8 @@ public class InventorySystem extends BaseGameSystem {
|
||||
upgradeAvatar(player, avatar, promoteData, expGain);
|
||||
}
|
||||
|
||||
public void upgradeAvatar(Player player, Avatar avatar, AvatarPromoteData promoteData, int expGain) {
|
||||
public void upgradeAvatar(
|
||||
Player player, Avatar avatar, AvatarPromoteData promoteData, int expGain) {
|
||||
int maxLevel = promoteData.getUnlockMaxLevel();
|
||||
int level = avatar.getLevel();
|
||||
int oldLevel = level;
|
||||
@@ -718,7 +813,8 @@ public class InventorySystem extends BaseGameSystem {
|
||||
val data = item.getItemData();
|
||||
if (data.getDestroyReturnMaterial().length > 0) {
|
||||
for (int i = 0; i < data.getDestroyReturnMaterial().length; i++) {
|
||||
returnMaterialMap.addTo(data.getDestroyReturnMaterial()[i], data.getDestroyReturnMaterialCount()[i]);
|
||||
returnMaterialMap.addTo(
|
||||
data.getDestroyReturnMaterial()[i], data.getDestroyReturnMaterialCount()[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -733,7 +829,13 @@ public class InventorySystem extends BaseGameSystem {
|
||||
}
|
||||
|
||||
// Uses an item from the player's inventory.
|
||||
public synchronized GameItem useItem(Player player, long targetGuid, long itemGuid, int count, int optionId, boolean isEnterMpDungeonTeam) {
|
||||
public synchronized GameItem useItem(
|
||||
Player player,
|
||||
long targetGuid,
|
||||
long itemGuid,
|
||||
int count,
|
||||
int optionId,
|
||||
boolean isEnterMpDungeonTeam) {
|
||||
Grasscutter.getLogger().debug("Attempting to use item from inventory");
|
||||
Avatar target = player.getAvatars().getAvatarByGuid(targetGuid);
|
||||
GameItem item = player.getInventory().getItemByGuid(itemGuid);
|
||||
@@ -742,13 +844,14 @@ public class InventorySystem extends BaseGameSystem {
|
||||
ItemData itemData = item.getItemData();
|
||||
if (itemData == null) return null;
|
||||
|
||||
var params = new UseItemParams(player, itemData.getUseTarget(), target, count, optionId, isEnterMpDungeonTeam);
|
||||
var params =
|
||||
new UseItemParams(
|
||||
player, itemData.getUseTarget(), target, count, optionId, isEnterMpDungeonTeam);
|
||||
params.usedItemId = item.getItemId();
|
||||
if (useItemDirect(itemData, params)) {
|
||||
player.getInventory().removeItem(item, count);
|
||||
var actions = itemData.getItemUseActions();
|
||||
if (actions != null)
|
||||
actions.forEach(use -> use.postUseItem(params));
|
||||
if (actions != null) actions.forEach(use -> use.postUseItem(params));
|
||||
Grasscutter.getLogger().debug("Item use succeeded!");
|
||||
return item;
|
||||
} else {
|
||||
@@ -781,57 +884,32 @@ public class InventorySystem extends BaseGameSystem {
|
||||
int[] satiationParams = itemData.getSatiationParams();
|
||||
if (satiationParams != null && satiationParams.length > 0 && target.isPresent()) {
|
||||
// Invoke and call player use food event.
|
||||
var event = new PlayerUseFoodEvent(params.player, itemData, params.targetAvatar.getAsEntity()); event.call();
|
||||
var event =
|
||||
new PlayerUseFoodEvent(params.player, itemData, params.targetAvatar.getAsEntity());
|
||||
event.call();
|
||||
if (event.isCanceled()) return false;
|
||||
|
||||
float satiationIncrease = satiationParams[0] + ((float)satiationParams[1])/params.targetAvatar.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
|
||||
if (!params.player.getSatiationManager().addSatiation(params.targetAvatar, satiationIncrease, itemData.getId())) { // Make sure avatar can eat
|
||||
float satiationIncrease =
|
||||
satiationParams[0]
|
||||
+ ((float) satiationParams[1])
|
||||
/ params.targetAvatar.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
|
||||
if (!params
|
||||
.player
|
||||
.getSatiationManager()
|
||||
.addSatiation(
|
||||
params.targetAvatar,
|
||||
satiationIncrease,
|
||||
itemData.getId())) { // Make sure avatar can eat
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Use
|
||||
var actions = itemData.getItemUseActions();
|
||||
Grasscutter.getLogger().debug("Using - actions - {}", actions);
|
||||
if (actions == null) return true; // Maybe returning false would be more appropriate?
|
||||
Grasscutter.getLogger().trace("Using - actions - {}", actions);
|
||||
if (actions == null) return true; // Maybe returning false would be more appropriate?
|
||||
return actions.stream()
|
||||
.map(use -> use.useItem(params))
|
||||
.reduce(false, (a,b) -> a || b); // Don't short-circuit!!!
|
||||
}
|
||||
|
||||
public static synchronized int checkPlayerAvatarConstellationLevel(Player player, int id) {
|
||||
// Try to accept itemId OR avatarId
|
||||
int avatarId = 0;
|
||||
if (GameData.getAvatarDataMap().containsKey(id)) {
|
||||
avatarId = id;
|
||||
} else {
|
||||
avatarId = Optional.ofNullable(GameData.getItemDataMap().get(id))
|
||||
.map(itemData -> itemData.getItemUseActions())
|
||||
.flatMap(actions ->
|
||||
actions.stream()
|
||||
.filter(action -> action.getItemUseOp() == ItemUseOp.ITEM_USE_GAIN_AVATAR)
|
||||
.map(action -> ((emu.grasscutter.game.props.ItemUseAction.ItemUseGainAvatar) action).getI())
|
||||
.findFirst())
|
||||
.orElse(0);
|
||||
}
|
||||
|
||||
if (avatarId == 0)
|
||||
return -2; // Not an Avatar
|
||||
|
||||
Avatar avatar = player.getAvatars().getAvatarById(avatarId);
|
||||
if (avatar == null)
|
||||
return -1; // Doesn't have
|
||||
|
||||
// Constellation
|
||||
int constLevel = avatar.getCoreProudSkillLevel();
|
||||
val avatarData = avatar.getSkillDepot();
|
||||
if (avatarData == null) {
|
||||
Grasscutter.getLogger().error("Attempted to check constellation level for UID"+player.getUid()+"'s avatar "+avatarId+" but avatar has no skillDepot!");
|
||||
return 0;
|
||||
}
|
||||
int constItemId = avatarData.getTalentCostItemId();
|
||||
GameItem constItem = player.getInventory().getInventoryTab(ItemType.ITEM_MATERIAL).getItemById(constItemId);
|
||||
constLevel += Optional.ofNullable(constItem).map(GameItem::getCount).orElse(0);
|
||||
return constLevel;
|
||||
.reduce(false, (a, b) -> a || b); // Don't short-circuit!!!
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package emu.grasscutter.game.systems;
|
||||
|
||||
import emu.grasscutter.game.CoopRequest;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.player.Player.SceneLoadState;
|
||||
import emu.grasscutter.game.props.EnterReason;
|
||||
import emu.grasscutter.game.world.World;
|
||||
import emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.player.Player.SceneLoadState;
|
||||
import emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass;
|
||||
import emu.grasscutter.server.game.BaseGameSystem;
|
||||
import emu.grasscutter.server.game.GameServer;
|
||||
|
||||
Reference in New Issue
Block a user