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

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions
2023-05-18 06:59:08 +00:00
parent c80e0f0572
commit 87ffbdd0f1
5 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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;
@@ -20,14 +22,11 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
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;
@@ -455,14 +454,10 @@ public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
* @return True if the item was removed, false otherwise.
*/
public synchronized boolean removeItemById(int itemId, int count) {
var item = this.getItems().values().stream()
.filter(i -> i.getItemId() == itemId)
.findFirst();
var item = this.getItems().values().stream().filter(i -> i.getItemId() == itemId).findFirst();
// Check if the item is in the player's inventory.
return item.filter(
gameItem -> this.removeItem(gameItem, count)
).isPresent();
return item.filter(gameItem -> this.removeItem(gameItem, count)).isPresent();
}
public synchronized boolean removeItem(GameItem item) {